Changeset 3303 for code/branches/netp6

Timestamp:

Jul 18, 2009, 5:28:24 PM (15 years ago)

Author:

scheusso

Message:

reverted some changes, which made the network multithreaded, in order to make a 0.0.3 tag

Location:

code/branches/netp6/src/network

Files:

• GamestateManager.cc (modified) (6 diffs)
• GamestateManager.h (modified) (1 diff)

code/branches/netp6/src/network/GamestateManager.cc

@@ -43 +43 @@
 #include <cassert>
 #include <queue>
-#include <boost/thread/mutex.hpp>
+// #include <boost/thread/mutex.hpp>
 
 #include "util/Debug.h"
@@ -60 +60 @@
   {
     trafficControl_ = new TrafficControl();
-    threadMutex_ = new boost::mutex();
-    threadPool_ = new ThreadPool();
+//     threadMutex_ = new boost::mutex();
+//     threadPool_ = new ThreadPool();
   }
 
@@ -78 +78 @@
     }
     delete this->trafficControl_;
-    delete this->threadMutex_;
-    delete this->threadPool_;
+//     delete this->threadMutex_;
+//     delete this->threadPool_;
   }
 
@@ -158 +158 @@
       
       clientGamestates.push(0);
-//       finishGamestate( cid, clientGamestates.back(), client, reference );
+      finishGamestate( cid, &clientGamestates.back(), client, reference );
       //FunctorMember<GamestateManager>* functor = 
-      ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate) );
-      executor->setObject(this);
-      executor->setDefaultValues( cid, &clientGamestates.back(), client, reference );
+//       ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate) );
+//       executor->setObject(this);
+//       executor->setDefaultValues( cid, &clientGamestates.back(), client, reference );
 //       (*static_cast<Executor*>(executor))();
-      this->threadPool_->passFunction( executor, true );
+//       this->threadPool_->passFunction( executor, true );
 //       (*functor)( cid, &(clientGamestates.back()), client, reference );
       
@@ -170 +170 @@
     }
     
-    threadPool_->synchronise();
+//     threadPool_->synchronise();
     
     while( !clientGamestates.empty() )
@@ -191 +191 @@
 //     packet::Gamestate *gs = new packet::Gamestate();
 //     gs->collectData( id_, 0x1 );
-    this->threadMutex_->lock();
+//     this->threadMutex_->lock();
     gamestateMap_[clientID][gamestate->getID()]=gs;
-    this->threadMutex_->unlock();
+//     this->threadMutex_->unlock();
     
     if(base)

code/branches/netp6/src/network/GamestateManager.h

@@ -90 +90 @@
     TrafficControl *trafficControl_;
     unsigned int id_;
-    boost::mutex* threadMutex_;
-    ThreadPool*   threadPool_;
+//     boost::mutex* threadMutex_;
+    ThreadPool*   /*thread*/Pool_;
   };