Changeset 2175 for code/branches/objecthierarchy2/src/network/packet

Timestamp:

Nov 10, 2008, 10:18:33 PM (16 years ago)

Author:

scheusso

Message:

some small adjustment with packetmap mutex
dedicated server tickrate limit works now:
configuration in orxonox.ini under [GSDedicate] → tickrate_

File:

• code/branches/objecthierarchy2/src/network/packet/Packet.cc (modified) (2 diffs)

code/branches/objecthierarchy2/src/network/packet/Packet.cc

@@ -129 +129 @@
       return false;
     }
-    // Assures we don't create a packet and destroy it right after in another thread
-    // without having a reference in the packetMap_
-    boost::recursive_mutex::scoped_lock lock(Packet::packetMap_mutex);
     // We deliver ENet the data address so that it doesn't memcpy everything again.
     // --> We have to delete data_ ourselves!
@@ -138 +135 @@
     // Add the packet to a global list so we can access it again once enet calls our
     // deletePacket method. We can of course only give a one argument function to the ENet C library.
-    packetMap_[(size_t)(void*)enetPacket_] = this;
+    {
+      // Assures we don't create a packet and destroy it right after in another thread
+      // without having a reference in the packetMap_
+      boost::recursive_mutex::scoped_lock lock(Packet::packetMap_mutex);
+      packetMap_[(size_t)(void*)enetPacket_] = this;
+    }
   }
 #ifndef NDEBUG