Changeset 421

Timestamp:

Oct 20, 2012, 1:07:25 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/Threading/Threading

Files:

• ChannelWorker.cpp (modified) (3 diffs)
• ChannelWorker.h (modified) (2 diffs)
• SimHost.cpp (modified) (4 diffs)

experimental/Threading/Threading/ChannelWorker.cpp

@@ -3 +3 @@
 
 
-ChannelWorker::ChannelWorker(int numThreads, OpenThreads::Barrier& syncBarrier)
- : _numThreads(numThreads), _syncBarrier(syncBarrier), _done(false)
+ChannelWorker::ChannelWorker()
+ : _done(false)
 {
         OSG_ALWAYS<<"ChannelWorker instantiated."<<std::endl;
@@ -28 +28 @@
 
         } while (!testCancel() && !_done);      // repeat as long it is canceld or set as Done
-
-
-        //_syncBarrier.block(_numThreads);  // Sync the threads.
-
 }
 
@@ -54 +50 @@
             // 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 ChannelWorker to cancel "<<this<<std::endl;
             OpenThreads::Thread::YieldCurrentThread();
         }

experimental/Threading/Threading/ChannelWorker.h

@@ -3 +3 @@
 #include <osg/Referenced>
 #include <OpenThreads/Thread>
-#include <OpenThreads/Barrier>
 
 
@@ -9 +8 @@
 {
 public:
-        ChannelWorker(int numThreads, OpenThreads::Barrier& syncBarrier) ;
-        ~ChannelWorker();
+        ChannelWorker() ;
+        ~ChannelWorker();       //Destroying the thread object will implicit call cancel(), then the function will block until the thread has finished.
         virtual void run();
         virtual int cancel();
         
-        void setDone(bool done);
-        bool getDone() const { return _done; }
+        void setDone(bool done);        // sinbgals the thread to stop but returns immediately. Use cancel if you want to wait blocking until the thread is canceled.
+        bool getDone() const { return _done; }  
 
 private:
-        int _numThreads;
         bool _done;
-        OpenThreads::Barrier& _syncBarrier;
 };

experimental/Threading/Threading/SimHost.cpp

@@ -25 +25 @@
 SimHost::~SimHost()
 {
-        _channelWorker.clear();
+        //_channelWorker.clear();
 }
 
@@ -37 +37 @@
         for(int i=0; i<numThreads-1; ++i)
         {
-                osg::ref_ptr<ChannelWorker> worker = new ChannelWorker(numThreads, syncBarrier);
+                osg::ref_ptr<ChannelWorker> worker = new ChannelWorker();
                 _channelWorker.push_back(worker);
         }
@@ -58 +58 @@
         {
                 int status;
-                        
-                //thread->addObserver(&observer);
+                
                 //thread->setStackSize(1024*256);
                 status = _channelWorker[i]->start();
@@ -72 +71 @@
     for(int i=0;i<static_cast<int>(_channelWorker.size());++i)
         {
-                _channelWorker[i]->setDone(true);
-                //_channelWorker[i]->cancel();          // Seems to be wrong
+                //_channelWorker[i]->setDone(true);     // non blocking
+                _channelWorker[i]->cancel();    // Blocking
         }
+
+        for(int i=0;i<100000000;i++)
+                OSG_ALWAYS<<"";
 
         //syncBarrier.block(numThreads);  // Block until all threads are ready