Changeset 114

Timestamp:

Jul 31, 2010, 2:19:59 PM (14 years ago)

Author:

Torben Dannhauer

Message:

memory leak in clusterENet fixed

Location:

osgVisual

Files:

• include/cluster/dataIO_clusterENet_implementation.h (modified) (2 diffs)
• src/cluster/dataIO_clusterENet_implementation.cpp (modified) (1 diff)
• src/core/osgVisual.cpp (modified) (1 diff)

osgVisual/include/cluster/dataIO_clusterENet_implementation.h

@@ -85 +85 @@
         
         /**
-         * \brief This function send a packet to the peer with the specified peer ID (number of the peer in the peer vector). This function works bidirectional from SERVER to CLIENT and vice versa.
+         * \brief This function send a packet to the peer with the specified peer ID (number of the peer in the peer vector). This function works bidirectional from SERVER to CLIENT and vice versa. This function takes ownership of the packet and will destroy it after (un-)successful transmission.
          * 
          * @param packet_ : Data packet to broadcast.
@@ -95 +95 @@
 
         /**
-         * \brief This function send a packet to the peer with the specified peerName.
+         * \brief This function send a packet to the peer with the specified peerName. This function works bidirectional from SERVER to CLIENT and vice versa. This function takes ownership of the packet and will destroy it after (un-)successful transmission.
          * 
          * @param channelID_ : ID on which channel the broadcast should be done.

osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp

@@ -145 +145 @@
         {
                 //std::cout << "dataIO_clusterENet_implementation::sendPacket() - ERROR: No connected peer available!" << std::endl;
+                
+                // If we can't send the packet, we have to destroy it to free it's memory (In a case of send ENet takes ownership and frees after sending.).
+                enet_packet_destroy (packet_);
+
                 return;
         }

osgVisual/src/core/osgVisual.cpp

@@ -81 +81 @@
         core->shutdown();
 
-        // Set Pointer to null to destroy the objects before this function ends - otherwise memory leaks wil be detected.
+        // Set Pointer to null to destroy the objects before this function ends
         core = NULL;