X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..247d96de592ac1fcd59411032c6528f238764516:/src/surf/ns3/ns3_simulator.cc diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 5e2c1084ba..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 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(), @@ -109,7 +115,7 @@ double NS3Sim::get_sent_from_socket(void *socket){ void NS3Sim::simulator_start(double min){ if(min > 0.0) Simulator::Stop(Seconds(min)); - XBT_DEBUG("Start simulator"); + XBT_DEBUG("Start simulator '%f'",min); Simulator::Run (); }