Changeset 430 for experimental/Threading

Timestamp:

Oct 25, 2012, 9:49:08 AM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/Threading/Threading

Files:

• IGConnector.cpp (modified) (2 diffs)
• IGConnector.h (modified) (1 diff)
• SimHost.cpp (modified) (5 diffs)
• SimHost.h (modified) (2 diffs)

experimental/Threading/Threading/IGConnector.cpp

@@ -5 +5 @@
 
 
-IGConnector::IGConnector()
+IGConnector::IGConnector(int numberOfchannels, OpenThreads::Barrier& frameBarrier)
+: _numberOfchannels(numberOfchannels), _frameBarrier(frameBarrier)
 {
         OSG_ALWAYS<<"IGConnector instantiated."<<std::endl;
@@ -16 +17 @@
 void IGConnector::operator()(ThreadedWorker* threadObject)
 {
-        OSG_ALWAYS<<"IGConnector running: ID "<<threadObject->getThreadId()<<std::endl;
+        OSG_ALWAYS<<"IGConnector "<<threadObject->getThreadId()<<" : Receiving SOF packet"<<std::endl;
+
+        _frameBarrier.block(_numberOfchannels+1);  // Sync the main and all IG threads.
+
+        OSG_ALWAYS<<"IGConnector "<<threadObject->getThreadId()<<" : Sending SOF answer packet"<<std::endl;
 
         // Place Holder

experimental/Threading/Threading/IGConnector.h

@@ -1 +1 @@
 #pragma once
 #include "ThreadWorkerBase.h"
+#include <OpenThreads/Barrier>
 
 class IGConnector :     public ThreadWorkerBase
 {
 public:
-        IGConnector();
+        IGConnector(int numberOfchannels, OpenThreads::Barrier& frameBarrier);
         ~IGConnector();
 
         void operator() (ThreadedWorker* threadObject);
+
+private:
+        int _numberOfchannels;
+        OpenThreads::Barrier& _frameBarrier;
 };

experimental/Threading/Threading/SimHost.cpp

@@ -3 +3 @@
 
 #include <OpenThreads/Thread>
-#include <OpenThreads/Barrier>
 
 // System includes
@@ -21 +20 @@
 {
         OSG_ALWAYS<<"SimHost instantiated."<<std::endl;
+        numberofChannels = 6;
 }
 
@@ -30 +30 @@
 void SimHost::initialize()
 {
-        int numThreads = 6+1;   // 6 channels and one main thread
+        done = false;
+        int numThreads = numberofChannels+1;    // #channels + one main thread
         OpenThreads::Barrier syncBarrier;
 
         // Create IG Connectors
         OSG_ALWAYS<<"Creating IG Connectors..."<<std::endl;
-        for(int i=0; i<numThreads-1; ++i)
+        for(int i=0; i<numberofChannels; ++i)
         {
                 osg::ref_ptr<ThreadedWorker> threadObject = new ThreadedWorker();
-                osg::ref_ptr<IGConnector> IGCon = new IGConnector();
+                osg::ref_ptr<IGConnector> IGCon = new IGConnector(numberofChannels, _frameBarrier);
                 threadObject->setThreadWorker(IGCon);
                 _threadObjects.push_back(threadObject);
@@ -67 +68 @@
         }
 
-        // Do something in the main thread
-                for(int i=0;i<10000000;i++)     OSG_ALWAYS<<"";
+        // Enter the SimHost main loop
+        while(!done)
+        {
+                // Wait until all Channels have sent an SOF packet
+                _frameBarrier.block(numberofChannels+1);  // Sync the main and all IG threads.
+                OSG_ALWAYS<<"All IGConnectors have recieved a SOF packet: Starting new Frame"<<std::endl;
+        }
         
         // Signal threads to finish
@@ -76 +82 @@
                 _threadObjects[i]->cancel();    // Blocking
         }
-
-        /*for(int i=0;i<100000000;i++)
-                OSG_ALWAYS<<"";*/
-
 }

experimental/Threading/Threading/SimHost.h

@@ -4 +4 @@
 #include <osg/Referenced>
 #include <osg/ref_ptr>
+#include <OpenThreads/Barrier>
 
 #include "ThreadedWorker.h"
@@ -19 +20 @@
 
 private:
+        bool done;
+        int numberofChannels;
+        OpenThreads::Barrier _frameBarrier;
         std::vector<osg::ref_ptr<IGConnector> > _IGConnectors;
         std::vector<osg::ref_ptr<ThreadedWorker> > _threadObjects;