Changeset 8394

Timestamp:

May 3, 2011, 9:19:52 AM (13 years ago)

Author:

scheusso

Message:

-fixed a memory leak (thx reto)
-some OrxVerify messages

Location:

code/trunk/src/libraries

Files:

• core/ThreadPool.cc (modified) (3 diffs)
• network/GamestateManager.cc (modified) (3 diffs)
• network/packet/Gamestate.cc (modified) (2 diffs)

code/trunk/src/libraries/core/ThreadPool.cc

@@ -41 +41 @@
     ThreadPool::~ThreadPool()
     {
-        OrxVerify(this->setNrOfThreads(0) == 0, "" );
+        OrxVerify(this->setNrOfThreads(0) == 0, "ERROR: could not join remaining threads in ThreadPool" );
     }
 
@@ -89 +89 @@
             {
                 // If that fails, then there is some code error
-                OrxVerify( (*it)->evaluateExecutor( executor ), "" );
+                OrxVerify( (*it)->evaluateExecutor( executor ), "ERROR: could not evaluate Executor" );
                 return true;
             }
@@ -96 +96 @@
         {
             addThreads( 1 );
-            OrxVerify( this->threadPool_.back()->evaluateExecutor( executor ), "" ); // access the last element
+            OrxVerify( this->threadPool_.back()->evaluateExecutor( executor ), "ERROR: could not evaluate Executor" ); // access the last element
             return true;
         }

code/trunk/src/libraries/network/GamestateManager.cc

@@ -94 +94 @@
     assert(gs);
     std::map<unsigned int, packet::Gamestate*>::iterator it = gamestateQueue.find(clientID);
-    if(it!=gamestateQueue.end()){
+    if(it!=gamestateQueue.end())
+    {
       // delete obsolete gamestate
       delete it->second;
@@ -108 +109 @@
     std::map<unsigned int, packet::Gamestate*>::iterator it;
     // now push only the most recent gamestates we received (ignore obsolete ones)
-    for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++){
-      OrxVerify(processGamestate(it->second), "");
+    for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++)
+    {
+      OrxVerify(processGamestate(it->second), "ERROR: could not process Gamestate");
       sendAck( it->second->getID(), it->second->getPeerID() );
       delete it->second;
@@ -362 +364 @@
     if(gs->isCompressed())
     {
-       OrxVerify(gs->decompressData(), "");
+       OrxVerify(gs->decompressData(), "ERROR: could not decompress Gamestate");
     }
     assert(!gs->isDiffed());

code/trunk/src/libraries/network/packet/Gamestate.cc

@@ -202 +202 @@
     {
 //       COUT(4) << "updating object of classid " << objectheader.getClassID() << endl;
-      OrxVerify(s->updateData(mem, mode), "");
+      OrxVerify(s->updateData(mem, mode), "ERROR: could not update Synchronisable with Gamestate data");
     }
   }
@@ -263 +263 @@
   uint8_t *d1 = data_+GamestateHeader::getSize();
   uint8_t *d2 = gs.data_+GamestateHeader::getSize();
-  GamestateHeader* h1 = new GamestateHeader(data_);
-  GamestateHeader* h2 = new GamestateHeader(gs.data_);
-  assert(h1->getDataSize() == h2->getDataSize());
+  GamestateHeader h1(data_);
+  GamestateHeader h2(gs.data_);
+  assert(h1.getDataSize() == h2.getDataSize());
   assert(!isCompressed());
   assert(!gs.isCompressed());
-  return memcmp(d1, d2, h1->getDataSize())==0;
+  return memcmp(d1, d2, h1.getDataSize())==0;
 }