From: navarro <navarro@caraja.(none)>
Date: Mon, 12 Mar 2012 10:34:01 +0000 (+0100)
Subject: Fix some memleack for ns3
X-Git-Tag: v3_7~311^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b169568cc9927802b7df23e1185c177837a33712?hp=455b26c4b631dbc5ffbfb64e79a0fb8dc708dde2

Fix some memleack for ns3
---

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index cf02267d36..6e047c783c 100644
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -62,17 +62,11 @@ static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
     );
 }
 
-static void ns3_free_dynar(void * elmts)
-{
-  free(elmts);
-  return;
-}
-
 static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
 {
   XBT_DEBUG("NS3_ADD_LINK '%s'",link->id);
 
-  if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),ns3_free_dynar);
+  if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free);
 
   tmgr_trace_t bw_trace;
   tmgr_trace_t state_trace;
diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index d0f68f24e9..c09122c207 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -41,6 +41,12 @@ static XBT_INLINE void transformSocketPtr (Ptr<Socket> localSocket){
   sprintf(socket_key,"%s",s.c_str());
 }
 
+static void delete_mysocket(void *p)
+{
+  MySocket *sock = (MySocket *)p;
+  delete(sock);
+}
+
 /*
  * This function create a flow from src to dst
  *
@@ -61,7 +67,7 @@ void NS3Sim::create_flow_NS3(
 		uint32_t totalBytes,
 		void * action)
 {
-	if(!dict_socket) dict_socket = xbt_dict_new_homogeneous(free);
+	if(!dict_socket) dict_socket = xbt_dict_new_homogeneous(delete_mysocket);
 
 	PacketSinkHelper sink ("ns3::TcpSocketFactory",
 							InetSocketAddress (Ipv4Address::GetAny(),