-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "surf/ns3/ns3_simulator.h"
+#include "src/surf/ns3/ns3_simulator.h"
#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
const char *to,
uint16_t port_number);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simulator_ns3, surf,
- "Logging specific to the SURF network NS3 module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
// Constructor.
NS3Sim::NS3Sim(){
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
*
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(),
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 ();
}