Changeset 3208 for code/branches/netp5

Timestamp:

Jun 23, 2009, 12:51:43 AM (15 years ago)

Author:

scheusso

Message:

some cleaning up
i hope that i found some memory leaks

Location:

code/branches/netp5/src/network

Files:

• NetworkFunction.h (modified) (1 diff)
• packet/DeleteObjects.cc (modified) (1 diff)
• packet/FunctionCalls.cc (modified) (1 diff)
• packet/Packet.cc (modified) (3 diffs)

code/branches/netp5/src/network/NetworkFunction.h

@@ -75 +75 @@
     ~NetworkFunctionBase();
     
-    virtual void         setNetworkID(uint32_t id)       { this->networkID_ = id; }
+    virtual void        setNetworkID(uint32_t id)       { this->networkID_ = id; }
     inline uint32_t     getNetworkID() const            { return this->networkID_; }
     inline std::string  getName() const                 { return name_; }

code/branches/netp5/src/network/packet/DeleteObjects.cc

@@ -90 +90 @@
     Synchronisable::deleteObject( *(uint32_t*)(data_+_OBJECTIDS+i*sizeof(uint32_t)) );
   }
+  delete this;
   return true;
 }

code/branches/netp5/src/network/packet/FunctionCalls.cc

@@ -66 +66 @@
 
 bool FunctionCalls::process(){
-  printf("process function calls\n");
   assert(isDataENetAllocated());
   uint8_t* temp = data_+sizeof(uint32_t); //skip packetid

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

@@ -54 +54 @@
 
 std::map<size_t, Packet *> Packet::packetMap_;
-//! Static mutex for any packetMap_ access
 
 Packet::Packet(){
@@ -213 +212 @@
   // Data was created by ENet
   p->bDataENetAllocated_ = true;
+  p->enetPacket_ = packet;
 
   return p;
@@ -230 +230 @@
   delete it->second;
   packetMap_.erase(it);
-  COUT(4) << "PacketMap size: " << packetMap_.size() << std::endl;
+  COUT(6) << "PacketMap size: " << packetMap_.size() << std::endl;
 }