Changeset 423

Timestamp:

Oct 20, 2012, 10:25:19 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/Threading/Threading

Files:

• ChannelWorker.cpp (modified) (3 diffs)
• ChannelWorker.h (modified) (1 diff)

experimental/Threading/Threading/ChannelWorker.cpp

@@ -1 @@
-#include "ChannelWorker.h"
+#include "ThreadedWorker.h"
 #include <osg/Notify>
 
 
-ChannelWorker::ChannelWorker()
+ThreadedWorker::ThreadedWorker()
  : _done(false)
 {
-        OSG_ALWAYS<<"ChannelWorker instantiated."<<std::endl;
+        OSG_ALWAYS<<"ThreadedWorker instantiated."<<std::endl;
 }
 
-ChannelWorker::~ChannelWorker()
+ThreadedWorker::~ThreadedWorker()
 {
         cancel();
 }
 
-void ChannelWorker::run()
+void ThreadedWorker::run()
 {
         OSG_ALWAYS<<"ID "<<getThreadId()<<" running!"<<std::endl;
@@ -31 +31 @@
 }
 
-void ChannelWorker::setDone(bool done)
+void ThreadedWorker::setDone(bool done)
 {
         _done = done;
 }
 
-int ChannelWorker::cancel()
+int ThreadedWorker::cancel()
 {
-    OSG_ALWAYS<<"Cancelling ChannelWorker "<<this<<" isRunning()="<<isRunning()<<std::endl;
+    OSG_ALWAYS<<"Cancelling ThreadedWorker "<<this<<" isRunning()="<<isRunning()<<std::endl;
 
     if( isRunning() )
@@ -51 +51 @@
             // commenting out debug info as it was cashing crash on exit, presumable
             // due to OSG_NOTIFY or std::cout destructing earlier than this destructor.
-            //OSG_ALWAYS<<"   Waiting for ChannelWorker to cancel "<<this<<std::endl;
+            //OSG_ALWAYS<<"   Waiting for ThreadedWorker to cancel "<<this<<std::endl;
             OpenThreads::Thread::YieldCurrentThread();
         }
     }
 
-    OSG_ALWAYS<<"  ChannelWorker::cancel() thread cancelled "<<this<<" isRunning()="<<isRunning()<<std::endl;
+    OSG_ALWAYS<<"  ThreadedWorker::cancel() thread cancelled "<<this<<" isRunning()="<<isRunning()<<std::endl;
 
     return 0;

experimental/Threading/Threading/ChannelWorker.h

@@ -10 +10 @@
  * @date  Okt 2012
  */ 
-class ChannelWorker : public osg::Referenced, public OpenThreads::Thread
+class ThreadedWorker : public osg::Referenced, public OpenThreads::Thread
 {
 public:
-        ChannelWorker() ;
-        ~ChannelWorker();       //Destroying the thread object will implicit call cancel(), then the function will block until the thread has finished.
+        ThreadedWorker() ;
+        ~ThreadedWorker();      //Destroying the thread object will implicit call cancel(), then the function will block until the thread has finished.
         virtual void run();
         virtual int cancel();