Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Action::finish() is never used without setState().
[simgrid.git] / src / surf / network_ns3.cpp
index 2ef3c94..a9139b1 100644 (file)
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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 "src/surf/network_ns3.hpp"
-#include "src/surf/surf_private.h"
-#include "src/surf/host_interface.hpp"
-#include "simgrid/sg_config.h"
+#include <unordered_set>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+#include "xbt/config.hpp"
 
-extern xbt_lib_t host_lib;
-extern xbt_lib_t as_router_lib;
+#include "ns3/core-module.h"
+#include "ns3/node.h"
 
-extern xbt_dict_t dict_socket;
+#include "ns3/ns3_simulator.h"
+#include "network_ns3.hpp"
 
-xbt_dynar_t IPV4addr;
-static double time_to_next_flow_completion = -1;
+#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "src/kernel/routing/NetPoint.hpp"
 
-/*************
- * Callbacks *
- *************/
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 
-static void replace_bdw_ns3(char ** bdw)
-{
-  char *temp = xbt_strdup(*bdw);
-  xbt_free(*bdw);
-  *bdw = bprintf("%fBps",atof(temp));
-  xbt_free(temp);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
 
-}
+std::vector<char*> IPV4addr;
 
-static void replace_lat_ns3(char ** lat)
-{
-  char *temp = xbt_strdup(*lat);
-  xbt_free(*lat);
-  *lat = bprintf("%fs",atof(temp));
-  xbt_free(temp);
-}
+/*****************
+ * Crude globals *
+ *****************/
 
-static void simgrid_ns3_add_host(Host* host)
-{
-  const char* id = host->getName();
-  XBT_DEBUG("NS3_ADD_HOST '%s'", id);
-  xbt_lib_set(host_lib,
-              id,
-              NS3_HOST_LEVEL,
-              ns3_add_host(id)
-    );
-}
+extern xbt_dict_t flowFromSock;
 
-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*),free);
-
-  surf_network_model->createLink(link->id,
-                                     link->bandwidth,
-                                     link->bandwidth_trace,
-                                     link->latency,
-                                     link->latency_trace,
-                                     link->state,
-                                     link->state_trace,
-                                     link->policy,
-                                     link->properties);
-}
+static ns3::InternetStackHelper stack;
+static ns3::NodeContainer nodes;
+static ns3::NodeContainer Cluster_nodes;
+static ns3::Ipv4InterfaceContainer interfaces;
 
-static void simgrid_ns3_add_router(RoutingEdge* router)
-{
-  const char* router_id = router->getName();
-  XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
-  xbt_lib_set(as_router_lib,
-              router_id,
-              NS3_ASR_LEVEL,
-              ns3_add_router(router_id)
-    );
-}
+static int number_of_nodes = 0;
+static int number_of_clusters_nodes = 0;
+static int number_of_links = 1;
+static int number_of_networks = 1;
+static int port_number = 1025; //Port number is limited from 1025 to 65 000
 
-static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
-{
-  XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
-  xbt_lib_set(as_router_lib,
-              AS->id,
-              NS3_ASR_LEVEL,
-              ns3_add_AS(AS->id)
-    );
-}
+simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> NetPointNs3::EXTENSION_ID;
 
-static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
+NetPointNs3::NetPointNs3()
 {
-  const char *cluster_prefix = cluster->prefix;
-  const char *cluster_suffix = cluster->suffix;
-  const char *cluster_radical = cluster->radical;
-  const char *cluster_bb_bw = bprintf("%f",cluster->bb_bw);
-  const char *cluster_bb_lat = bprintf("%f",cluster->bb_lat);
-  const char *cluster_bw = bprintf("%f",cluster->bw);
-  const char *cluster_lat = bprintf("%f",cluster->lat);
-  const char *groups = NULL;
-
-  int start, end, i;
-  unsigned int iter;
-
-  xbt_dynar_t radical_elements;
-  xbt_dynar_t radical_ends;
-  xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
-
-  char *router_id,*host_id;
-
-  radical_elements = xbt_str_split(cluster_radical, ",");
-  xbt_dynar_foreach(radical_elements, iter, groups) {
-    radical_ends = xbt_str_split(groups, "-");
-
-    switch (xbt_dynar_length(radical_ends)) {
-    case 1:
-      start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
-      xbt_dynar_push_as(tab_elements_num, int, start);
-      router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix);
-      xbt_lib_set(host_lib,
-                  router_id,
-                  NS3_HOST_LEVEL,
-                  ns3_add_host_cluster(router_id)
-        );
-      XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
-      free(router_id);
-      break;
-
-    case 2:
-      start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
-      end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
-      for (i = start; i <= end; i++){
-        xbt_dynar_push_as(tab_elements_num, int, i);
-        router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix);
-        xbt_lib_set(host_lib,
-                    router_id,
-                    NS3_HOST_LEVEL,
-                    ns3_add_host_cluster(router_id)
-          );
-        XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
-        free(router_id);
-      }
-      break;
-
-    default:
-      XBT_DEBUG("Malformed radical");
-    }
-  }
-
-  //Create links
-  unsigned int cpt;
-  int elmts;
-  char * lat = xbt_strdup(cluster_lat);
-  char * bw =  xbt_strdup(cluster_bw);
-  replace_lat_ns3(&lat);
-  replace_bdw_ns3(&bw);
+  ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node>(0);
+  stack.Install(node);
+  nodes.Add(node);
+  node_num = number_of_nodes++;
+}
 
-  xbt_dynar_foreach(tab_elements_num,cpt,elmts)
-  {
-    host_id   = bprintf("%s%d%s", cluster_prefix, elmts, cluster_suffix);
-    router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix);
-    XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id);
+/*************
+ * Callbacks *
+ *************/
 
-    ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,host_id,  NS3_HOST_LEVEL));
-    ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,router_id,NS3_HOST_LEVEL));
+static void clusterCreation_cb(ClusterCreationArgs* cluster)
+{
+  for (int const& i : *cluster->radicals) {
+    // Routers don't create a router on the other end of the private link by themselves.
+    // We just need this router to be given an ID so we create a temporary NetPointNS3 so that it gets one
+    NetPointNs3* host_dst = new NetPointNs3();
 
-    if(host_src && host_dst){}
-    else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
+    // Create private link
+    std::string host_id   = cluster->prefix + std::to_string(i) + cluster->suffix;
+    NetPointNs3* host_src = sg_host_by_name(host_id.c_str())->pimpl_netpoint->extension<NetPointNs3>();
+    xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id.c_str());
 
-    ns3_add_link(host_src->node_num,host_src->type,
-                 host_dst->node_num,host_dst->type,
-                 bw,lat);
+    // Any NS3 route is symmetrical
+    ns3_add_link(host_src, host_dst, cluster->bw, cluster->lat);
 
-    free(router_id);
-    free(host_id);
+    delete host_dst;
   }
-  xbt_dynar_free(&tab_elements_num);
-
 
   //Create link backbone
-  lat = xbt_strdup(cluster_bb_lat);
-  bw =  xbt_strdup(cluster_bb_bw);
-  replace_lat_ns3(&lat);
-  replace_bdw_ns3(&bw);
-  ns3_add_cluster(bw,lat,cluster->id);
-  xbt_free(lat);
-  xbt_free(bw);
+  ns3_add_cluster(cluster->id.c_str(), cluster->bb_bw, cluster->bb_lat);
 }
 
-/* Create the ns3 topology based on routing strategy */
-static void create_ns3_topology(void)
+static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoint* src,
+                             simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src,
+                             simgrid::kernel::routing::NetPoint* gw_dst,
+                             std::vector<simgrid::surf::LinkImpl*>* link_list)
 {
-  XBT_DEBUG("Starting topology generation");
-
-  xbt_dynar_shrink(IPV4addr,0);
-
-  //get the onelinks from the parsed platform
-  xbt_dynar_t onelink_routes = routing_platf->getOneLinkRoutes();
-  if (!onelink_routes)
-    xbt_die("There is no routes!");
-  XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
-  //save them in trace file
-  Onelink *onelink;
-  unsigned int iter;
-  xbt_dynar_foreach(onelink_routes, iter, onelink) {
-    char *src = onelink->p_src->getName();
-    char *dst = onelink->p_dst->getName();
-    NetworkNS3Link *link = static_cast<NetworkNS3Link *>(onelink->p_link);
-
-    if (strcmp(src,dst) && link->m_created){
-      XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
-      char * link_bdw = xbt_strdup(link->p_bdw);
-      char * link_lat = xbt_strdup(link->p_lat);
-      replace_lat_ns3(&link_lat);
-      replace_bdw_ns3(&link_bdw);
-      link->m_created = 0;
-
-      //   XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
-      XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat);
-
-      //create link ns3
-      ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,src,NS3_HOST_LEVEL));
-      if(!host_src) host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
-      ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_LEVEL));
-      if(!host_dst) host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
-
-      if(host_src && host_dst){}
-      else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
-
-      ns3_add_link(host_src->node_num,host_src->type,host_dst->node_num,host_dst->type,link_bdw,link_lat);
-
-      xbt_free(link_bdw);
-      xbt_free(link_lat);
-    }
+  if (link_list->size() == 1) {
+    simgrid::surf::LinkNS3* link = static_cast<simgrid::surf::LinkNS3*>(link_list->at(0));
+
+    XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->cname(),
+              (symmetrical ? "(symmetrical)" : "(not symmetrical)"));
+
+    //   XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
+    XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->cname(), link->bandwidth(),
+        link->latency());
+
+    // create link ns3
+    NetPointNs3* host_src = src->extension<NetPointNs3>();
+    NetPointNs3* host_dst = dst->extension<NetPointNs3>();
+
+    xbt_assert(host_src != nullptr, "Network element %s does not seem to be NS3-ready", src->cname());
+    xbt_assert(host_dst != nullptr, "Network element %s does not seem to be NS3-ready", dst->cname());
+
+    ns3_add_link(host_src, host_dst, link->bandwidth(), link->latency());
+  } else {
+    static bool warned_about_long_routes = false;
+
+    if (not warned_about_long_routes)
+      XBT_WARN("Ignoring a route between %s and %s of length %zu: Only routes of length 1 are considered with NS3.\n"
+               "WARNING: You can ignore this warning if your hosts can still communicate when only considering routes "
+               "of length 1.\n"
+               "WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently "
+               "ignored.",
+               src->cname(), dst->cname(), link_list->size());
+    warned_about_long_routes = true;
   }
 }
 
-static void parse_ns3_end_platform(void)
+/* Create the ns3 topology based on routing strategy */
+static void postparse_cb()
 {
-  ns3_end_platform();
-}
+  IPV4addr.shrink_to_fit();
 
-static void define_callbacks_ns3(void)
-{
-  hostCreatedCallbacks.connect(simgrid_ns3_add_host);
-  routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
-  sg_platf_link_add_cb (&parse_ns3_add_link);
-  sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
-  sg_platf_AS_begin_add_cb (&parse_ns3_add_AS);
-  sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
-  sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
+  ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+  ns3::GlobalRouteManager::InitializeRoutes();
 }
 
 /*********
  * Model *
  *********/
-static void free_ns3_link(void * elmts)
-{
-  delete static_cast<NetworkNS3Link*>(elmts);
-}
-
-static void free_ns3_host(void * elmts)
-{
-  ns3_nodes_t host = static_cast<ns3_nodes_t>(elmts);
-  free(host);
-}
-
 void surf_network_model_init_NS3()
 {
   if (surf_network_model)
     return;
 
-  surf_network_model = new NetworkNS3Model();
-
-  xbt_dynar_push(all_existing_models, &surf_network_model);
+  surf_network_model = new simgrid::surf::NetworkNS3Model();
+  all_existing_models->push_back(surf_network_model);
 }
 
-NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
-  if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
-    xbt_die("Impossible to initialize NS3 interface");
-  }
-  routing_model_create(NULL);
-  define_callbacks_ns3();
+static simgrid::config::Flag<std::string> ns3_tcp_model("ns3/TcpModel",
+    "The ns3 tcp model can be : NewReno or Reno or Tahoe", "NewReno");
 
-  NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
-  NS3_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host);
-}
+namespace simgrid {
+namespace surf {
 
-NetworkNS3Model::~NetworkNS3Model() {
-  ns3_finalize();
-  xbt_dynar_free_container(&IPV4addr);
-  xbt_dict_free(&dict_socket);
+NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
+  NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
+
+  flowFromSock = xbt_dict_new_homogeneous([](void* p) { delete static_cast<SgFlow*>(p); });
+  ns3_initialize(ns3_tcp_model.get().c_str());
+
+  simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) {
+    pt->extension_set<NetPointNs3>(new NetPointNs3());
+    XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->cname(), pt->extension<NetPointNs3>()->node_num);
+  });
+  simgrid::surf::on_cluster.connect(&clusterCreation_cb);
+  simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
+  simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
+
+  LogComponentEnable("PacketSink", ns3::LOG_LEVEL_INFO);
+  LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
+  LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
 }
 
-Link* NetworkNS3Model::createLink(const char *name,
-                                        double bw_initial,
-                                        tmgr_trace_t bw_trace,
-                                        double lat_initial,
-                                        tmgr_trace_t lat_trace,
-                                        e_surf_resource_state_t state_initial,
-                                        tmgr_trace_t state_trace,
-                                        e_surf_link_sharing_policy_t policy,
-                                        xbt_dict_t properties){
-  if (bw_trace)
-    XBT_INFO("The NS3 network model doesn't support bandwidth state traces");
-  if (lat_trace)
-    XBT_INFO("The NS3 network model doesn't support latency state traces");
-  if (state_trace)
-    XBT_INFO("The NS3 network model doesn't support link state traces");
-  Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
-  surf_callback_emit(networkLinkCreatedCallbacks, link);
-  return link;
+NetworkNS3Model::~NetworkNS3Model() {
+  for (auto const& addr : IPV4addr)
+    free(addr);
+  IPV4addr.clear();
+  xbt_dict_free(&flowFromSock);
 }
 
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
+LinkImpl* NetworkNS3Model::createLink(const std::string& name, double bandwidth, double latency,
+                                      e_surf_link_sharing_policy_t policy)
 {
-  xbt_dynar_t route = NULL;
-  routing_get_route_and_latency(src, dst, &route, NULL);
-  //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
-  return route;
+  return new LinkNS3(this, name, bandwidth, latency);
 }
 
-Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst,
-                                              double size, double rate)
+Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
 {
-  XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());
-  NetworkNS3Action *action = new NetworkNS3Action(this, size, 0);
-
-  ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action);
-
-  action->m_lastSent = 0;
-  action->p_srcElm = src;
-  action->p_dstElm = dst;
-  surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
-
-  return (surf_action_t) action;
+  return new NetworkNS3Action(this, size, src, dst);
 }
 
-double NetworkNS3Model::shareResources(double now)
+double NetworkNS3Model::nextOccuringEvent(double now)
 {
-  XBT_DEBUG("ns3_share_resources");
+  double time_to_next_flow_completion;
+  XBT_DEBUG("ns3_next_occuring_event");
 
   //get the first relevant value from the running_actions list
-  if (!getRunningActionSet()->size() || now == 0.0)
+  if (not getRunningActionSet()->size() || now == 0.0)
     return -1.0;
   else
     do {
       ns3_simulator(now);
-      time_to_next_flow_completion = ns3_time() - surf_get_clock();//FIXME: use now instead ?
+      time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();
     } while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
 
   XBT_DEBUG("min       : %f", now);
-  XBT_DEBUG("ns3  time : %f", ns3_time());
+  XBT_DEBUG("ns3  time : %f", ns3::Simulator::Now().GetSeconds());
   XBT_DEBUG("surf time : %f", surf_get_clock());
   XBT_DEBUG("Next completion %f :", time_to_next_flow_completion);
 
@@ -360,127 +201,292 @@ double NetworkNS3Model::shareResources(double now)
 
 void NetworkNS3Model::updateActionsState(double now, double delta)
 {
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  void *data;
+  static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr);
 
-  static xbt_dynar_t socket_to_destroy = NULL;
-  if(!socket_to_destroy) socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL);
+  /* If there are no running flows, advance the NS3 simulator and return */
+  if (getRunningActionSet()->empty()) {
+
+    while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision))
+      ns3_simulator(now-ns3::Simulator::Now().GetSeconds());
 
-  /* If there are no running flows, just return */
-  if (!getRunningActionSet()->size()) {
-    while(double_positive(now-ns3_time(), sg_surf_precision)) {
-      ns3_simulator(now-ns3_time());
-    }
     return;
   }
 
-  NetworkNS3Action *action;
-  xbt_dict_foreach(dict_socket,cursor,key,data){
-    action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
-    XBT_DEBUG("Processing socket %p (action %p)",data,action);
-    action->setRemains(action->getCost() - ns3_get_socket_sent(data));
+  xbt_dict_cursor_t cursor = nullptr;
+  char *ns3Socket;
+  SgFlow *sgFlow;
+  xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
+    NetworkNS3Action * action = sgFlow->action_;
+    XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
+    action->setRemains(action->getCost() - sgFlow->sentBytes_);
 
     if (TRACE_is_enabled() &&
-               action->getState() == SURF_ACTION_RUNNING){
-       double data_sent = ns3_get_socket_sent(data);
-       double data_delta_sent = data_sent - action->m_lastSent;
-
-       xbt_dynar_t route = NULL;
-
-       routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
-       unsigned int i;
-       for (i = 0; i < xbt_dynar_length (route); i++){
-               NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
-               TRACE_surf_link_set_utilization (link->getName(),
-                               action->getCategory(),
-                                       (data_delta_sent)/delta,
-                                       now-delta,
-                                       delta);
-       }
-       action->m_lastSent = data_sent;
+        action->getState() == Action::State::running){
+      double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
+
+      std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
+
+      action->src_->routeTo(action->dst_, &route, nullptr);
+      for (auto const& link : route)
+        TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
+                                        delta);
+
+      action->lastSent_ = sgFlow->sentBytes_;
     }
 
-    if(ns3_get_socket_is_finished(data) == 1){
-      xbt_dynar_push(socket_to_destroy,&key);
-      XBT_DEBUG("Destroy socket %p of action %p", key, action);
-      action->finish();
-      action->setState(SURF_ACTION_DONE);
+    if(sgFlow->finished_){
+      xbt_dynar_push(socket_to_destroy,&ns3Socket);
+      XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
+      action->finish(Action::State::done);
     }
   }
 
-  while (!xbt_dynar_is_empty(socket_to_destroy)){
-    xbt_dynar_pop(socket_to_destroy,&key);
+  while (not xbt_dynar_is_empty(socket_to_destroy)) {
+    xbt_dynar_pop(socket_to_destroy,&ns3Socket);
 
-    void *data = xbt_dict_get (dict_socket, key);
-    action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
-    XBT_DEBUG ("Removing socket %p of action %p", key, action);
-    xbt_dict_remove(dict_socket, key);
+    if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
+      SgFlow* flow = static_cast<SgFlow*>(xbt_dict_get(flowFromSock, ns3Socket));
+      XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
+    }
+    xbt_dict_remove(flowFromSock, ns3Socket);
   }
-  return;
 }
 
 /************
  * Resource *
  ************/
 
-NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
-                                      double bw_initial, double lat_initial)
- : Link(model, name, props)
- , p_lat(bprintf("%f", lat_initial))
- , p_bdw(bprintf("%f", bw_initial))
- , m_created(1)
+LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency)
+    : LinkImpl(model, name, nullptr)
 {
-}
+  bandwidth_.peak = bandwidth;
+  latency_.peak   = latency;
 
-NetworkNS3Link::~NetworkNS3Link()
-{
+  s4u::Link::onCreation(this->piface_);
 }
 
-void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, double date)
-{
+LinkNS3::~LinkNS3() = default;
 
+void LinkNS3::apply_event(tmgr_trace_event_t event, double value)
+{
+  THROW_UNIMPLEMENTED;
+}
+void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) {
+  xbt_die("The NS3 network model doesn't support bandwidth traces");
+}
+void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
+  xbt_die("The NS3 network model doesn't support latency traces");
 }
 
 /**********
  * Action *
  **********/
 
-NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
-: NetworkAction(model, cost, failed)
-{}
+NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst)
+    : NetworkAction(model, size, false)
+{
+  XBT_DEBUG("Communicate from %s to %s", src->getCname(), dst->getCname());
 
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  int NetworkNS3Action::getLatencyLimited() {
-    return m_latencyLimited;
-  }
-#endif
+  src_ = src;
+  dst_ = dst;
+  ns3_create_flow(src, dst, size, this);
 
- void NetworkNS3Action::suspend()
-{
+  s4u::Link::onCommunicate(this, src, dst);
+}
+
+void NetworkNS3Action::suspend() {
+  THROW_UNIMPLEMENTED;
+}
+
+void NetworkNS3Action::resume() {
   THROW_UNIMPLEMENTED;
 }
 
-void NetworkNS3Action::resume()
+std::list<LinkImpl*> NetworkNS3Action::links()
 {
   THROW_UNIMPLEMENTED;
 }
 
-  /* Test whether a flow is suspended */
+/* Test whether a flow is suspended */
 bool NetworkNS3Action::isSuspended()
 {
-  return 0;
+  return false;
 }
 
 int NetworkNS3Action::unref()
 {
-  m_refcount--;
-  if (!m_refcount) {
-       if (action_hook.is_linked())
-         p_stateSet->erase(p_stateSet->iterator_to(*this));
+  refcount_--;
+  if (not refcount_) {
+    if (action_hook.is_linked())
+      stateSet_->erase(stateSet_->iterator_to(*this));
     XBT_DEBUG ("Removing action %p", this);
-       delete this;
+    delete this;
     return 1;
   }
   return 0;
 }
+
+}
+}
+
+void ns3_simulator(double maxSeconds)
+{
+  if (maxSeconds > 0.0) // If there is a maximum amount of time to run
+    ns3::Simulator::Stop(ns3::Seconds(maxSeconds));
+  XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, surf_get_clock());
+  ns3::Simulator::Run ();
+}
+
+void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst,
+    u_int32_t TotalBytes,
+    simgrid::surf::NetworkNS3Action* action) {
+  unsigned int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+  unsigned int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+
+  ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
+  ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
+
+  xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
+             dst->pimpl_netpoint->cname());
+  char* addr = IPV4addr.at(node2);
+  xbt_assert(addr != nullptr, "Element %s is unknown to NS3. Is it connected to any one-hop link?",
+             dst->pimpl_netpoint->cname());
+
+  XBT_DEBUG("ns3_create_flow %u Bytes from %u to %u with Interface %s", TotalBytes, node1, node2, addr);
+  ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number));
+  sink.Install (dst_node);
+
+  ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
+
+  xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr);
+
+  sock->Bind(ns3::InetSocketAddress(port_number));
+
+  ns3::Simulator::ScheduleNow(&StartFlow, sock, addr, port_number);
+
+  port_number++;
+  xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
+}
+
+// initialize the NS3 interface and environment
+void ns3_initialize(const char* TcpProtocol){
+//  tcpModel are:
+//  "ns3::TcpNewReno"
+//  "ns3::TcpReno"
+//  "ns3::TcpTahoe"
+
+  ns3::Config::SetDefault ("ns3::TcpSocket::SegmentSize", ns3::UintegerValue (1000));
+  ns3::Config::SetDefault ("ns3::TcpSocket::DelAckCount", ns3::UintegerValue (1));
+  ns3::Config::SetDefault ("ns3::TcpSocketBase::Timestamp", ns3::BooleanValue (false));
+
+  if (not strcmp(TcpProtocol, "default"))
+    return;
+
+  if (not strcmp(TcpProtocol, "Reno")) {
+    XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+    ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpReno"));
+    return;
+  }
+  if (not strcmp(TcpProtocol, "NewReno")) {
+    XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+    ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpNewReno"));
+    return;
+  }
+  if (not strcmp(TcpProtocol, "Tahoe")) {
+    XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+    ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe"));
+    return;
+  }
+
+  xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+}
+
+void ns3_add_cluster(const char* id, double bw, double lat) {
+  ns3::NodeContainer Nodes;
+
+  for (unsigned int i = number_of_clusters_nodes; i < Cluster_nodes.GetN(); i++) {
+    Nodes.Add(Cluster_nodes.Get(i));
+    XBT_DEBUG("Add node %u to cluster", i);
+  }
+  number_of_clusters_nodes = Cluster_nodes.GetN();
+
+  XBT_DEBUG("Add router %u to cluster", nodes.GetN() - Nodes.GetN() - 1);
+  Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1));
+
+  xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
+  ns3::CsmaHelper csma;
+  csma.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+  csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
+  ns3::NetDeviceContainer devices = csma.Install(Nodes);
+  XBT_DEBUG("Create CSMA");
+
+  char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
+  XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
+  ns3::Ipv4AddressHelper ipv4;
+  ipv4.SetBase (adr, "255.255.0.0");
+  free(adr);
+  interfaces.Add(ipv4.Assign (devices));
+
+  if(number_of_links == 255){
+    xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
+    number_of_links = 1;
+    number_of_networks++;
+  }else{
+    number_of_links++;
+  }
+  XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN());
+}
+
+static char* transformIpv4Address (ns3::Ipv4Address from){
+  std::stringstream sstream;
+  sstream << from ;
+  std::string s = sstream.str();
+  return bprintf("%s",s.c_str());
+}
+
+void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) {
+  ns3::PointToPointHelper pointToPoint;
+
+  ns3::Ipv4AddressHelper address;
+
+  int srcNum = src->node_num;
+  int dstNum = dst->node_num;
+
+  ns3::Ptr<ns3::Node> a = nodes.Get(srcNum);
+  ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
+
+  XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
+  pointToPoint.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+  pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
+
+  char *filename = bprintf("link-%d-%d.tr", srcNum, dstNum);
+  ns3::AsciiTraceHelper ascii;
+  pointToPoint.EnableAsciiAll (ascii.CreateFileStream (filename));
+  pointToPoint.EnablePcapAll ("tcp-bulk-send", false);
+  xbt_free(filename);
+
+  ns3::NetDeviceContainer netA;
+  netA.Add(pointToPoint.Install (a, b));
+
+  char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
+  address.SetBase (adr, "255.255.0.0");
+  XBT_DEBUG("\tInterface stack '%s'",adr);
+  free(adr);
+  interfaces.Add(address.Assign (netA));
+
+  if (IPV4addr.size() <= (unsigned)srcNum)
+    IPV4addr.resize(srcNum + 1, nullptr);
+  IPV4addr.at(srcNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2));
+
+  if (IPV4addr.size() <= (unsigned)dstNum)
+    IPV4addr.resize(dstNum + 1, nullptr);
+  IPV4addr.at(dstNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1));
+
+  if (number_of_links == 255){
+    xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
+    number_of_links = 1;
+    number_of_networks++;
+  } else {
+    number_of_links++;
+  }
+}