X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29cedcb0af274d0dd82224451767e8d01162d734..dbfaf2c37c080ab6f6c41fb4d3d0d481db6b7780:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 5cb83009d7..5137477cb4 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -4,6 +4,8 @@ /* 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 + #include "ns3/core-module.h" #include "ns3/node.h" @@ -29,7 +31,7 @@ static double time_to_next_flow_completion = -1; * Crude globals * *****************/ -extern xbt_dict_t dict_socket; +extern xbt_dict_t flowFromSock; static ns3::InternetStackHelper stack; static ns3::NodeContainer nodes; @@ -58,41 +60,23 @@ static void simgrid_ns3_add_host(simgrid::s4u::Host& host) ns3::Ptr node = ns3::CreateObject (0); stack.Install(node); nodes.Add(node); - ns3host->node_num = number_of_nodes; - ns3host->type = NS3_NETWORK_ELEMENT_HOST; - number_of_nodes++; + ns3host->node_num = number_of_nodes ++; host.extension_set(NS3_EXTENSION_ID, ns3host); } -static void parse_ns3_add_link(sg_platf_link_cbarg_t link) +static void simgrid_ns3_add_netcard(simgrid::surf::NetCard* netcard) { - XBT_DEBUG("NS3_ADD_LINK '%s'",link->id); - - Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency, link->policy, link->properties); - if (link->bandwidth_trace) - l->setBandwidthTrace(link->latency_trace); - if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); - if (link->state_trace) - l->setStateTrace(link->state_trace); -} -static void simgrid_ns3_add_router(simgrid::surf::NetCard* router) -{ - const char* router_id = router->name(); - XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); - xbt_lib_set(as_router_lib, - router_id, - NS3_ASR_LEVEL, - ns3_add_router(router_id) - ); -} + const char* id = netcard->name(); -static void parse_ns3_add_AS(simgrid::s4u::As* as) -{ - const char* as_id = as->name(); - XBT_DEBUG("NS3_ADD_AS '%s'", as_id); - xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) ); + ns3_node_t ns3netcard = xbt_new0(s_ns3_node_t,1); + XBT_DEBUG("Interface ns3 add netcard[%d] '%s'",number_of_nodes,id); + ns3::Ptr node = ns3::CreateObject (0); + stack.Install(node); + nodes.Add(node); + ns3netcard->node_num = number_of_nodes++; + + xbt_lib_set(as_router_lib, id, NS3_ASR_LEVEL, ns3netcard ); } #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area @@ -103,15 +87,13 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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_t radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { - radical_ends = xbt_str_split(groups, "-"); + xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); switch (xbt_dynar_length(radical_ends)) { case 1: @@ -148,8 +130,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) char * lat = bprintf("%fs", cluster->lat); char * bw = bprintf("%fBps", cluster->bw); - xbt_dynar_foreach(tab_elements_num,cpt,elmts) - { + 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); @@ -157,12 +138,9 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) ns3_node_t host_src = ns3_find_host(host_id); ns3_node_t host_dst = ns3_find_host(router_id); - if(host_src && host_dst){} - else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); + xbt_assert(host_src && host_dst, "\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, - bw,lat); + ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat); free(router_id); free(host_id); @@ -189,23 +167,22 @@ static void create_ns3_topology(void) //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 + + std::unordered_set already_seen = std::unordered_set(); + + XBT_DEBUG("There is %ld one-link routes",onelink_routes->used); simgrid::surf::Onelink *onelink; unsigned int iter; xbt_dynar_foreach(onelink_routes, iter, onelink) { char *src = onelink->src_->name(); char *dst = onelink->dst_->name(); - simgrid::surf::LinkNS3 *link = - static_cast(onelink->link_); + simgrid::surf::LinkNS3 *link = static_cast(onelink->link_); - if (strcmp(src,dst) && link->m_created){ + if (strcmp(src,dst) && (already_seen.find(link) == already_seen.end())) { + already_seen.insert(link); XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName()); char * link_bdw = bprintf("%fBps", link->getBandwidth()); char * link_lat = bprintf("%fs", link->getLatency()); - 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); @@ -221,7 +198,7 @@ static void create_ns3_topology(void) if (!host_src || !host_dst) 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); + ns3_add_link(host_src->node_num, host_dst->node_num, link_bdw, link_lat); xbt_free(link_bdw); xbt_free(link_lat); @@ -229,43 +206,15 @@ static void create_ns3_topology(void) } } -static void parse_ns3_end_platform(void) -{ - ns3_end_platform(); -} - -static void define_callbacks_ns3(void) -{ - simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host); - simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router); - simgrid::surf::on_link.connect (parse_ns3_add_link); - simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); - simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS); - simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes - simgrid::surf::on_postparse.connect(&parse_ns3_end_platform); //InitializeRoutes -} - /********* * Model * *********/ -static void free_ns3_link(void * elmts) -{ - delete static_cast(elmts); -} - -static void free_ns3_host(void * elmts) -{ - ns3_node_t host = static_cast(elmts); - free(host); -} - void surf_network_model_init_NS3() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkNS3Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); } @@ -273,20 +222,24 @@ namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { - if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) { - xbt_die("Impossible to initialize NS3 interface"); - } + ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel")); + routing_model_create(NULL); - define_callbacks_ns3(); + simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host); + simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard); + simgrid::surf::on_link.connect(netlink_parse_init); + simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); + simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes + simgrid::surf::on_postparse.connect(&ns3_end_platform); //InitializeRoutes - NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host); - NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host); + NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f); + NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f); } NetworkNS3Model::~NetworkNS3Model() { - ns3_finalize(); + delete ns3_sim; xbt_dynar_free_container(&IPV4addr); - xbt_dict_free(&dict_socket); + xbt_dict_free(&flowFromSock); } Link* NetworkNS3Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, @@ -307,7 +260,7 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, do action->p_dstElm = dst; networkCommunicateCallbacks(action, src, dst, size, rate); - return (surf_action_t) action; + return action; } double NetworkNS3Model::next_occuring_event(double now) @@ -333,31 +286,28 @@ double NetworkNS3Model::next_occuring_event(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*),NULL); - 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()) { - /* If there are no running flows, just return */ - if (!getRunningActionSet()->size()) { - while(double_positive(now-ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) { + while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) ns3_simulator(now-ns3::Simulator::Now().GetSeconds()); - } + return; } - NetworkNS3Action *action; - xbt_dict_foreach(dict_socket,cursor,key,data){ - action = static_cast(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 = NULL; + 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() == Action::State::running){ - double data_sent = ns3_get_socket_sent(data); - double data_delta_sent = data_sent - action->m_lastSent; + double data_delta_sent = sgFlow->sentBytes_ - action->m_lastSent; std::vector *route = new std::vector(); @@ -366,24 +316,25 @@ void NetworkNS3Model::updateActionsState(double now, double delta) TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); delete route; - action->m_lastSent = data_sent; + action->m_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); + if(sgFlow->finished_){ + xbt_dynar_push(socket_to_destroy,&ns3Socket); + XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action); action->finish(); action->setState(Action::State::done); } } while (!xbt_dynar_is_empty(socket_to_destroy)){ - xbt_dynar_pop(socket_to_destroy,&key); + xbt_dynar_pop(socket_to_destroy,&ns3Socket); - void *data = xbt_dict_get (dict_socket, key); - action = static_cast(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 = (SgFlow*)xbt_dict_get (flowFromSock, ns3Socket); + XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_); + } + xbt_dict_remove(flowFromSock, ns3Socket); } return; } @@ -394,7 +345,6 @@ void NetworkNS3Model::updateActionsState(double now, double delta) LinkNS3::LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency) : Link(model, name, props) - , m_created(1) { m_bandwidth.peak = bandwidth; m_latency.peak = latency; @@ -448,7 +398,7 @@ int NetworkNS3Action::unref() if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); - delete this; + delete this; return 1; } return 0; @@ -465,54 +415,25 @@ void ns3_simulator(double min){ ns3_sim->simulator_start(min); } -simgrid::surf::NetworkNS3Action* ns3_get_socket_action(void *socket){ - return ((MySocket *)socket)->action; -} - -double ns3_get_socket_remains(void *socket){ - return ((MySocket *)socket)->remaining; -} - -double ns3_get_socket_sent(void *socket){ - return ((MySocket *)socket)->sentBytes; -} - -bool ns3_get_socket_is_finished(void *socket){ - return ((MySocket *)socket)->finished; -} - -int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action) +void ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action) { - ns3_node_t node1 = ns3_find_host(a); - ns3_node_t node2 = ns3_find_host(b); + int node1 = ns3_find_host(a)->node_num; + int node2 = ns3_find_host(b)->node_num; - ns3::Ptr src_node = nodes.Get(node1->node_num); - ns3::Ptr dst_node = nodes.Get(node2->node_num); + ns3::Ptr src_node = nodes.Get(node1); + ns3::Ptr dst_node = nodes.Get(node2); - char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*); + char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*); - XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr); - ns3_sim->create_flow_NS3(src_node, dst_node, port_number, - start, - addr, - TotalBytes, - action); + XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr); + ns3_sim->create_flow_NS3(src_node, dst_node, port_number, start, addr, TotalBytes, action); port_number++; - if(port_number >= 65001 ) xbt_die("Too many connections! Port number is saturated."); - return 0; -} - -// clean up -void ns3_finalize(){ - if (!ns3_sim) - return; - delete ns3_sim; - ns3_sim = 0; + xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); } // initialize the NS3 interface and environment -int ns3_initialize(const char* TcpProtocol){ +void ns3_initialize(const char* TcpProtocol){ xbt_assert(!ns3_sim, "ns3 already initialized"); ns3_sim = new NS3Sim(); @@ -524,27 +445,26 @@ int ns3_initialize(const char* TcpProtocol){ ns3::Config::SetDefault ("ns3::TcpSocket::SegmentSize", ns3::UintegerValue (1024)); // 1024-byte packet for easier reading ns3::Config::SetDefault ("ns3::TcpSocket::DelAckCount", ns3::UintegerValue (1)); - if(!strcmp(TcpProtocol,"default")){ - return 0; - } - if(!strcmp(TcpProtocol,"Reno")){ + if (!strcmp(TcpProtocol,"default")) + return; + + if (!strcmp(TcpProtocol,"Reno")) { XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol); ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpReno")); - return 0; + return; } - if(!strcmp(TcpProtocol,"NewReno")){ + if (!strcmp(TcpProtocol,"NewReno")) { XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol); ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpNewReno")); - return 0; + return; } if(!strcmp(TcpProtocol,"Tahoe")){ XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol); ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe")); - return 0; + return; } - XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe"); - return 0; + xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe"); } void * ns3_add_host_cluster(const char * id) @@ -556,24 +476,10 @@ void * ns3_add_host_cluster(const char * id) Cluster_nodes.Add(node); nodes.Add(node); host->node_num = number_of_nodes; - host->type = NS3_NETWORK_ELEMENT_HOST; number_of_nodes++; return host; } -void * ns3_add_router(const char * id) -{ - ns3_node_t router = xbt_new0(s_ns3_node_t,1); - XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id); - ns3::Ptr node = ns3::CreateObject (0); - stack.Install(node); - nodes.Add(node); - router->node_num = number_of_nodes; - router->type = NS3_NETWORK_ELEMENT_ROUTER; - number_of_nodes++; - return router; -} - void ns3_add_cluster(char * bw,char * lat,const char *id) { @@ -592,8 +498,7 @@ void ns3_add_cluster(char * bw,char * lat,const char *id) XBT_DEBUG("Add router %d to cluster",nodes.GetN()-Nodes.GetN()-1); Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1)); - if(Nodes.GetN() > 65000) - xbt_die("Cluster with NS3 is limited to 65000 nodes"); + xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes"); ns3::CsmaHelper csma; csma.SetChannelAttribute ("DataRate", ns3::StringValue (bw)); csma.SetChannelAttribute ("Delay", ns3::StringValue (lat)); @@ -608,8 +513,7 @@ void ns3_add_cluster(char * bw,char * lat,const char *id) interfaces.Add(ipv4.Assign (devices)); if(number_of_links == 255){ - if(number_of_networks == 255) - xbt_die("Number of links and networks exceed 255*255"); + xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255"); number_of_links = 1; number_of_networks++; }else{ @@ -618,29 +522,21 @@ void ns3_add_cluster(char * bw,char * lat,const char *id) XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN()); } -void * ns3_add_AS(const char * id) -{ - XBT_DEBUG("Interface ns3 add AS '%s'",id); - return NULL; -} - static char* transformIpv4Address (ns3::Ipv4Address from){ std::stringstream sstream; - sstream << from ; - std::string s = sstream.str(); - return bprintf("%s",s.c_str()); + sstream << from ; + std::string s = sstream.str(); + return bprintf("%s",s.c_str()); } -void ns3_add_link(int src, e_ns3_network_element_type_t type_src, - int dst, e_ns3_network_element_type_t type_dst, - char *bw, char *lat) +void ns3_add_link(int src, int dst, char *bw, char *lat) { if(number_of_links == 1 ) { LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO); } - ns3::MyPointToPointHelper pointToPoint; + ns3::PointToPointHelper pointToPoint; ns3::NetDeviceContainer netA; ns3::Ipv4AddressHelper address; @@ -653,7 +549,7 @@ void ns3_add_link(int src, e_ns3_network_element_type_t type_src, pointToPoint.SetChannelAttribute ("Delay", ns3::StringValue (lat)); //pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG - netA.Add(pointToPoint.Install (a, type_src, b, type_dst)); + 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");