Changeset 7772 for code/branches/network5/src/libraries/network/packet

Timestamp:

Dec 17, 2010, 10:41:24 AM (15 years ago)

Author:

scheusso

Message:

network is now multithreaded again
further testing needed

Location:

code/branches/network5/src/libraries/network/packet

Files:

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

code/branches/network5/src/libraries/network/packet/Packet.cc

@@ -35 +35 @@
 #include <enet/enet.h>
 #include <boost/static_assert.hpp>
+#include <boost/thread/mutex.hpp>
 
 #include "util/Debug.h"
@@ -61 +62 @@
 
 std::map<size_t, Packet *> Packet::packetMap_;
+boost::mutex Packet::packetMapMutex_;
 
 Packet::Packet()
@@ -142 +144 @@
       // Assures we don't create a packet and destroy it right after in another thread
       // without having a reference in the packetMap_
+      Packet::packetMapMutex_.lock();
       packetMap_[reinterpret_cast<size_t>(enetPacket_)] = this;
+      Packet::packetMapMutex_.unlock();
     }
   }
@@ -164 +168 @@
 //  ENetPacket *temp = enetPacket_;
 //  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
-  if(!Host::addPacket( enetPacket_, clientID_))
-    enet_packet_destroy(this->enetPacket_); // if we could not add the packet to the enet queue delete it manually
+  if( this->flags_ & PacketFlag::Reliable )
+    Host::addPacket( enetPacket_, clientID_, 0);
+  else
+    Host::addPacket( enetPacket_, clientID_, 0);
   return true;
 }
@@ -228 +234 @@
 void Packet::deletePacket(ENetPacket *enetPacket){
   // Get our Packet from a global map with all Packets created in the send() method of Packet.
+  Packet::packetMapMutex_.lock();
   std::map<size_t, Packet*>::iterator it = packetMap_.find(reinterpret_cast<size_t>(enetPacket));
   assert(it != packetMap_.end());
@@ -234 +241 @@
   delete it->second;
   packetMap_.erase(it);
+  Packet::packetMapMutex_.unlock();
 //   COUT(6) << "PacketMap size: " << packetMap_.size() << std::endl;
 }

code/branches/network5/src/libraries/network/packet/Packet.h

@@ -96 +96 @@
   private:
     static std::map<size_t, Packet *> packetMap_;
+    static boost::mutex               packetMapMutex_;
     ENetPacket *enetPacket_;
 };