X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a79a8e1cab86ccc687cfbc97b01b735acb996f16..13dc60b5feb8778432f44b21022857b241e524fa:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 16d6986c2c..34631b53a2 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2016. 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. */ @@ -10,18 +10,14 @@ #include "ns3/core-module.h" #include "ns3/node.h" -#include "ns3/ns3_interface.h" #include "ns3/ns3_simulator.h" #include "network_ns3.hpp" -#include "simgrid/sg_config.h" #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals -#include "src/kernel/routing/NetCard.hpp" -#include "src/surf/HostImpl.hpp" -#include "src/surf/surf_private.h" +#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/NetZone.hpp" -#include "simgrid/s4u/engine.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module"); @@ -44,9 +40,9 @@ 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 -simgrid::xbt::Extension NetCardNs3::EXTENSION_ID; +simgrid::xbt::Extension NetPointNs3::EXTENSION_ID; -NetCardNs3::NetCardNs3() +NetPointNs3::NetPointNs3() { ns3::Ptr node = ns3::CreateObject(0); stack.Install(node); @@ -58,75 +54,67 @@ NetCardNs3::NetCardNs3() * Callbacks * *************/ -static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) +static void clusterCreation_cb(ClusterCreationArgs* cluster) { - netcard->extension_set(new NetCardNs3()); -} - -static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) -{ - char* lat = bprintf("%fs", cluster->lat); - char* bw = bprintf("%fBps", cluster->bw); - for (int 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 NetCardNS3 so that it gets one - NetCardNs3* host_dst = new NetCardNs3(); + // 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(); // Create private link - char* host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - NetCardNs3* host_src = sg_host_by_name(host_id)->pimpl_netcard->extension(); - xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id); + 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(); + xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id.c_str()); - ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat); + // Any NS3 route is symmetrical + ns3_add_link(host_src, host_dst, cluster->bw, cluster->lat); delete host_dst; - free(host_id); } - xbt_free(lat); - xbt_free(bw); //Create link backbone - lat = bprintf("%fs", cluster->bb_lat); - bw = bprintf("%fBps", cluster->bb_bw); - ns3_add_cluster(cluster->id, bw, lat); - xbt_free(lat); - xbt_free(bw); + ns3_add_cluster(cluster->id.c_str(), cluster->bb_bw, cluster->bb_lat); } -static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetCard* src, - simgrid::kernel::routing::NetCard* dst, simgrid::kernel::routing::NetCard* gw_src, - simgrid::kernel::routing::NetCard* gw_dst, std::vector* link_list) +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* link_list) { if (link_list->size() == 1) { simgrid::surf::LinkNS3* link = static_cast(link_list->at(0)); - XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->getName(), + XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->cname(), (symmetrical ? "(symmetrical)" : "(not symmetrical)")); - char* link_bdw = bprintf("%fBps", link->bandwidth()); - char* link_lat = bprintf("%fs", link->latency()); // 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); + XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->cname(), link->bandwidth(), + link->latency()); // create link ns3 - NetCardNs3* host_src = src->extension(); - NetCardNs3* host_dst = dst->extension(); + NetPointNs3* host_src = src->extension(); + NetPointNs3* host_dst = dst->extension(); 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->node_num, host_dst->node_num, link_bdw, link_lat); - if (symmetrical) - ns3_add_link(host_dst->node_num, host_src->node_num, link_bdw, link_lat); - - xbt_free(link_bdw); - xbt_free(link_lat); + 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; } } /* Create the ns3 topology based on routing strategy */ -static void postparse_cb(void) +static void postparse_cb() { IPV4addr.shrink_to_fit(); @@ -147,22 +135,25 @@ void surf_network_model_init_NS3() } static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", - "The ns3 tcp model can be : NewReno or Reno or Tahoe", - "default"); + "The ns3 tcp model can be : NewReno or Reno or Tahoe", "NewReno"); namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { - NetCardNs3::EXTENSION_ID = simgrid::kernel::routing::NetCard::extension_create(); + NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create(); ns3_initialize(ns3_tcp_model.get().c_str()); - simgrid::kernel::routing::NetCard::onCreation.connect(&netcardCreation_cb); + simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) { + pt->extension_set(new NetPointNs3()); + XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->cname(), pt->extension()->node_num); + }); simgrid::surf::on_cluster.connect(&clusterCreation_cb); - simgrid::surf::on_postparse.connect(&postparse_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); } @@ -174,8 +165,8 @@ NetworkNS3Model::~NetworkNS3Model() { xbt_dict_free(&flowFromSock); } -Link* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) +LinkImpl* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { return new LinkNS3(this, name, bandwidth, latency); } @@ -191,7 +182,7 @@ double NetworkNS3Model::nextOccuringEvent(double now) 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 { @@ -232,11 +223,12 @@ void NetworkNS3Model::updateActionsState(double now, double delta) action->getState() == Action::State::running){ double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_; - std::vector route = std::vector(); + std::vector route = std::vector(); action->src_->routeTo(action->dst_, &route, nullptr); for (auto link : route) - TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); + TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), (data_delta_sent) / delta, now - delta, + delta); action->lastSent_ = sgFlow->sentBytes_; } @@ -249,7 +241,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) } } - while (!xbt_dynar_is_empty(socket_to_destroy)){ + while (not xbt_dynar_is_empty(socket_to_destroy)) { xbt_dynar_pop(socket_to_destroy,&ns3Socket); if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) { @@ -265,17 +257,17 @@ void NetworkNS3Model::updateActionsState(double now, double delta) ************/ LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, double latency) - : Link(model, name, nullptr) + : LinkImpl(model, name, nullptr) { bandwidth_.peak = bandwidth; latency_.peak = latency; - Link::onCreation(this); + s4u::Link::onCreation(this->piface_); } LinkNS3::~LinkNS3() = default; -void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value) +void LinkNS3::apply_event(tmgr_trace_event_t event, double value) { THROW_UNIMPLEMENTED; } @@ -293,13 +285,13 @@ void LinkNS3::setLatencyTrace(tmgr_trace_t trace) { NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst) : NetworkAction(model, size, false) { - XBT_DEBUG("Communicate from %s to %s", src->cname(), dst->cname()); + XBT_DEBUG("Communicate from %s to %s", src->getCname(), dst->getCname()); src_ = src; dst_ = dst; - ns3_create_flow(src, dst, surf_get_clock(), size, this); + ns3_create_flow(src, dst, size, this); - Link::onCommunicate(this, src, dst); + s4u::Link::onCommunicate(this, src, dst); } void NetworkNS3Action::suspend() { @@ -310,7 +302,12 @@ void NetworkNS3Action::resume() { THROW_UNIMPLEMENTED; } - /* Test whether a flow is suspended */ +std::list NetworkNS3Action::links() +{ + THROW_UNIMPLEMENTED; +} + +/* Test whether a flow is suspended */ bool NetworkNS3Action::isSuspended() { return false; @@ -319,7 +316,7 @@ bool NetworkNS3Action::isSuspended() int NetworkNS3Action::unref() { refcount_--; - if (!refcount_) { + if (not refcount_) { if (action_hook.is_linked()) stateSet_->erase(stateSet_->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); @@ -340,31 +337,32 @@ void ns3_simulator(double maxSeconds) ns3::Simulator::Run (); } -void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double startTime, u_int32_t TotalBytes, - simgrid::surf::NetworkNS3Action* action) -{ - int node1 = src->pimpl_netcard->extension()->node_num; - int node2 = dst->pimpl_netcard->extension()->node_num; +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()->node_num; + unsigned int node2 = dst->pimpl_netpoint->extension()->node_num; ns3::Ptr src_node = nodes.Get(node1); ns3::Ptr 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 %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr); + 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 sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId()); + ns3::Ptr 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)); - XBT_DEBUG("Create flow starting to %fs + %fs = %fs", - startTime-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), startTime); - ns3::Simulator::Schedule (ns3::Seconds(startTime-ns3::Simulator::Now().GetSeconds()), - &StartFlow, sock, addr, port_number); + ns3::Simulator::ScheduleNow(&StartFlow, sock, addr, port_number); port_number++; xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); @@ -377,23 +375,24 @@ void ns3_initialize(const char* TcpProtocol){ // "ns3::TcpReno" // "ns3::TcpTahoe" - ns3::Config::SetDefault ("ns3::TcpSocket::SegmentSize", ns3::UintegerValue (1024)); // 1024-byte packet for easier reading + 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 (!strcmp(TcpProtocol,"default")) + if (not strcmp(TcpProtocol, "default")) return; - if (!strcmp(TcpProtocol,"Reno")) { + 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 (!strcmp(TcpProtocol,"NewReno")) { + 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(!strcmp(TcpProtocol,"Tahoe")){ + if (not strcmp(TcpProtocol, "Tahoe")) { XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol); ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe")); return; @@ -402,24 +401,23 @@ void ns3_initialize(const char* TcpProtocol){ xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe"); } -void ns3_add_cluster(const char* id, char* bw, char* lat) -{ +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 %d to cluster",i); + XBT_DEBUG("Add node %u to cluster", i); } number_of_clusters_nodes = Cluster_nodes.GetN(); - XBT_DEBUG("Add router %d to cluster",nodes.GetN()-Nodes.GetN()-1); + 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.SetChannelAttribute ("DataRate", ns3::StringValue (bw)); - csma.SetChannelAttribute ("Delay", ns3::StringValue (lat)); - ns3::NetDeviceContainer devices = csma.Install (Nodes); + 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); @@ -436,7 +434,7 @@ void ns3_add_cluster(const char* id, char* bw, char* lat) }else{ number_of_links++; } - XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN()); + XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN()); } static char* transformIpv4Address (ns3::Ipv4Address from){ @@ -446,20 +444,28 @@ static char* transformIpv4Address (ns3::Ipv4Address from){ return bprintf("%s",s.c_str()); } -void ns3_add_link(int src, int dst, char *bw, char *lat) -{ +void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { ns3::PointToPointHelper pointToPoint; - ns3::NetDeviceContainer netA; ns3::Ipv4AddressHelper address; - ns3::Ptr a = nodes.Get(src); - ns3::Ptr b = nodes.Get(dst); + int srcNum = src->node_num; + int dstNum = dst->node_num; + + ns3::Ptr a = nodes.Get(srcNum); + ns3::Ptr b = nodes.Get(dstNum); - XBT_DEBUG("\tAdd PTP from %d to %d bw:'%s' lat:'%s'",src,dst,bw,lat); - pointToPoint.SetDeviceAttribute ("DataRate", ns3::StringValue (bw)); - pointToPoint.SetChannelAttribute ("Delay", ns3::StringValue (lat)); + 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); @@ -468,13 +474,13 @@ void ns3_add_link(int src, int dst, char *bw, char *lat) free(adr); interfaces.Add(address.Assign (netA)); - if (IPV4addr.size() <= (unsigned)src) - IPV4addr.resize(src + 1, nullptr); - IPV4addr.at(src) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2)); + if (IPV4addr.size() <= (unsigned)srcNum) + IPV4addr.resize(srcNum + 1, nullptr); + IPV4addr.at(srcNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2)); - if (IPV4addr.size() <= (unsigned)dst) - IPV4addr.resize(dst + 1, nullptr); - IPV4addr.at(dst) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1)); + 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");