X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/353856867665015bd39041aacba13ad22035287c..7c047878cb2905079a6a0544f1a15134ae3ab3a6:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index ceb4afc415..e97c67d270 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -6,6 +6,8 @@ #include +#include + #include "ns3/core-module.h" #include "ns3/node.h" @@ -25,7 +27,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network int NS3_EXTENSION_ID; xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free); -static double time_to_next_flow_completion = -1; /***************** * Crude globals * @@ -48,7 +49,7 @@ static int port_number = 1025; //Port number is limited from 1025 to 65 000 * Callbacks * *************/ -static void simgrid_ns3_add_host(simgrid::s4u::Host& host) +static void ns3_add_host(simgrid::s4u::Host& host) { const char* id = host.name().c_str(); XBT_DEBUG("NS3_ADD_HOST '%s'", id); @@ -62,7 +63,7 @@ static void simgrid_ns3_add_host(simgrid::s4u::Host& host) host.extension_set(NS3_EXTENSION_ID, ns3host); } -static void simgrid_ns3_add_netcard(simgrid::surf::NetCard* netcard) +static void ns3_add_netcard(simgrid::surf::NetCard* netcard) { const char* id = netcard->name(); @@ -79,26 +80,25 @@ static void simgrid_ns3_add_netcard(simgrid::surf::NetCard* netcard) #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) { - const char *groups = NULL; + const char *groups = nullptr; int start, end, i; unsigned int iter; - xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); + xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), nullptr); char *router_id,*host_id; xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { - xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); + xbt_dynar_t 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); - simgrid::s4u::Host::by_name_or_create(router_id) - ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); + simgrid::s4u::Host::by_name_or_create(router_id)->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); free(router_id); break; @@ -109,8 +109,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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); - simgrid::s4u::Host::by_name_or_create(router_id) - ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); + simgrid::s4u::Host::by_name_or_create(router_id)->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); free(router_id); } @@ -218,21 +217,27 @@ void surf_network_model_init_NS3() xbt_dynar_push(all_existing_models, &surf_network_model); } +static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", + "The ns3 tcp model can be : NewReno or Reno or Tahoe", + "default"); + namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { - ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel")); + ns3_initialize(ns3_tcp_model.get().c_str()); - routing_model_create(NULL); - 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); + routing_model_create(nullptr); + simgrid::s4u::Host::onCreation.connect(ns3_add_host); + simgrid::surf::netcardCreatedCallbacks.connect(ns3_add_netcard); 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(&create_ns3_topology); NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f); NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f); + + LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); + LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO); } NetworkNS3Model::~NetworkNS3Model() { @@ -253,6 +258,7 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, do double NetworkNS3Model::next_occuring_event(double now) { + double time_to_next_flow_completion; XBT_DEBUG("ns3_next_occuring_event"); //get the first relevant value from the running_actions list @@ -274,7 +280,7 @@ double NetworkNS3Model::next_occuring_event(double now) void NetworkNS3Model::updateActionsState(double now, double delta) { - static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL); + static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr); /* If there are no running flows, advance the NS3 simulator and return */ if (getRunningActionSet()->empty()) { @@ -285,7 +291,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) return; } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *ns3Socket; SgFlow *sgFlow; xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){ @@ -299,7 +305,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency (action->srcElm_, action->dstElm_, route, NULL); + routing_platf->getRouteAndLatency (action->src_, action->dst_, route, nullptr); for (auto link : *route) TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); delete route; @@ -324,7 +330,6 @@ void NetworkNS3Model::updateActionsState(double now, double delta) } xbt_dict_remove(flowFromSock, ns3Socket); } - return; } /************ @@ -364,8 +369,8 @@ NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetC { XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name()); - srcElm_ = src; - dstElm_ = dst; + src_ = src; + dst_ = dst; ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this); Link::onCommunicate(this, src, dst); @@ -382,15 +387,15 @@ void NetworkNS3Action::resume() { /* 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 (!refcount_) { + if (action_hook.is_linked()) + stateSet_->erase(stateSet_->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); delete this; return 1; @@ -425,7 +430,7 @@ void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t Tota ns3::Ptr sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId()); - xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), NULL); + xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr); sock->Bind(ns3::InetSocketAddress(port_number)); XBT_DEBUG("Create flow starting to %fs + %fs = %fs", @@ -485,7 +490,6 @@ void * ns3_add_host_cluster(const char * id) void ns3_add_cluster(char * bw,char * lat,const char *id) { - XBT_DEBUG("cluster_id: %s",id); XBT_DEBUG("bw: %s lat: %s",bw,lat); XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes); @@ -534,11 +538,6 @@ static char* transformIpv4Address (ns3::Ipv4Address from){ 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::PointToPointHelper pointToPoint; ns3::NetDeviceContainer netA;