Changeset 1360 for code/trunk/src/network/PacketBuffer.cc

Timestamp:

May 22, 2008, 2:02:06 PM (16 years ago)

Author:

rgrieder

Message:

merged merge branch back to trunk

File:

• code/trunk/src/network/PacketBuffer.cc (modified) (6 diffs)

code/trunk/src/network/PacketBuffer.cc

@@ -41 +41 @@
 namespace network
 {
-  boost::mutex networkPacketBufferMutex;
+   boost::recursive_mutex PacketBuffer::mutex_;
 
   PacketBuffer::PacketBuffer() {
@@ -52 +52 @@
 
   bool PacketBuffer::push(ENetEvent *ev) {
-    boost::mutex::scoped_lock lock(networkPacketBufferMutex);
+    boost::recursive_mutex::scoped_lock lock(mutex_);
     //std::cout << "event size inside packetbuffer " << ev->packet->dataLength << std::endl;
     //   if(closed)
@@ -61 +61 @@
       last=first;
       last->next=NULL;
-      // change this!!!!!!! 
+      // change this!!!!!!!  ---- we are not doing stl so we won't change this
       last->packet = ev->packet;
+      last->address = ev->peer->address;
       //last->address = ev->peer->address;
     } else {
@@ -72 +73 @@
       // save the packet to the new element
       last->packet = ev->packet;
+      last->address = ev->peer->address;
       //last->address = ev->peer->address;
     }
-    // pseudo bugfix: added a return false statement for error handling
-    if ( last->packet == ev->packet ) return true;
-    return false;
+    lock.unlock();
+    return true;
   }
 
@@ -82 +83 @@
   //moving first pointer to next element
   ENetPacket *PacketBuffer::pop() {
-    boost::mutex::scoped_lock lock(networkPacketBufferMutex);
-    //std::cout << "packetbuffer pop" << std::endl;
-    if(first!=NULL /*&& !closed*/){
-      QueueItem *temp = first;
-      // get packet
-      ENetPacket *pck=first->packet;
-      // remove first element
-      first = first->next;
-      delete temp;
-      //std::cout << "pop size of packet " << pck->dataLength << std::endl;
-      return pck;
-    } else{
-      //std::cout << "nothing to return" << std::endl;
-      return NULL;
-    }
+    ENetAddress address;
+    return pop(address);
   }
 
   ENetPacket *PacketBuffer::pop(ENetAddress &address) {
-    boost::mutex::scoped_lock lock(networkPacketBufferMutex);
+    boost::recursive_mutex::scoped_lock lock(mutex_);
     //std::cout << "packetbuffer pop(address)" << std::endl;
     if(first!=NULL /*&& !closed*/){
@@ -110 +98 @@
       first = first->next;
       delete temp;
+      lock.unlock();
       //std::cout << "pop(address) size of packet " << pck->dataLength << std::endl;
       return pck;
     } else{
+      lock.unlock();
       return NULL;
     }