From 667b4b34e9d5149c4a69007ec1eba9d7689eb6e5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 8 Dec 2016 22:34:14 +0100 Subject: [PATCH 1/1] make NetCards extendable, and use this for NS3 extension --- include/surf/surf_routing.h | 1 - src/kernel/routing/NetCard.hpp | 4 +++- src/surf/network_ns3.cpp | 38 ++++++++++++++-------------------- src/surf/ns3/ns3_interface.h | 6 ++++-- src/surf/surf_routing.cpp | 1 - 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h index d8f2dbc4bf..885d8a10fa 100644 --- a/include/surf/surf_routing.h +++ b/include/surf/surf_routing.h @@ -18,7 +18,6 @@ XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level XBT_PUBLIC_DATA(xbt_lib_t) as_router_lib; XBT_PUBLIC_DATA(int) ROUTING_ASR_LEVEL; //Routing level XBT_PUBLIC_DATA(int) COORD_ASR_LEVEL; //Coordinates level -XBT_PUBLIC_DATA(int) NS3_ASR_LEVEL; //host node for ns3 XBT_PUBLIC_DATA(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router XBT_PUBLIC_DATA(xbt_lib_t) storage_lib; diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp index 9213dd4540..40454d49ef 100644 --- a/src/kernel/routing/NetCard.hpp +++ b/src/kernel/routing/NetCard.hpp @@ -6,6 +6,7 @@ #ifndef KERNEL_ROUTING_NETCARD_HPP_ #define KERNEL_ROUTING_NETCARD_HPP_ +#include #include #include @@ -23,7 +24,8 @@ namespace routing { * * @details This represents a position in the network. One can route information between two netcards */ -class NetCard { +class NetCard : public simgrid::xbt::Extendable { + public: enum class Type { Host, Router, As }; diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 0bdbf2b114..d99ec96486 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -44,7 +44,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 -HostNs3::HostNs3() +simgrid::xbt::Extension NetCardNs3::EXTENSION_ID; + +NetCardNs3::NetCardNs3() { ns3::Ptr node = ns3::CreateObject(0); stack.Install(node); @@ -58,28 +60,27 @@ HostNs3::HostNs3() static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) { - xbt_lib_set(as_router_lib, netcard->cname(), NS3_ASR_LEVEL, new HostNs3()); + netcard->extension_set(new NetCardNs3()); } -#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area 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) { - char* router_id = bprintf("router_%s%d%s", cluster->prefix, i, cluster->suffix); - HostNs3* host_dst = new HostNs3(); - xbt_lib_set(as_router_lib, router_id, NS3_ASR_LEVEL, host_dst); + // 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(); // Create private link char* host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - HostNs3* host_src = static_cast(xbt_lib_get_or_null(as_router_lib, host_id, NS3_ASR_LEVEL)); + 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); ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat); - free(router_id); + delete host_dst; free(host_id); } xbt_free(lat); @@ -109,8 +110,8 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetCard XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat); // create link ns3 - HostNs3* host_src = static_cast(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL)); - HostNs3* host_dst = static_cast(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL)); + NetCardNs3* host_src = src->extension(); + NetCardNs3* 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()); @@ -149,15 +150,12 @@ static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default"); -static void del_netcard(void* n) -{ - delete static_cast(n); -} - namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { + NetCardNs3::EXTENSION_ID = simgrid::kernel::routing::NetCard::extension_create(); + ns3_initialize(ns3_tcp_model.get().c_str()); simgrid::kernel::routing::NetCard::onCreation.connect(&netcardCreation_cb); @@ -165,8 +163,6 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { simgrid::surf::on_postparse.connect(&postparse_cb); simgrid::s4u::As::onRouteCreation.connect(&routeCreation_cb); - NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, &del_netcard); - LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO); } @@ -277,9 +273,7 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, dou Link::onCreation(this); } -LinkNS3::~LinkNS3() -{ -} +LinkNS3::~LinkNS3() = default; void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value) { @@ -349,8 +343,8 @@ void ns3_simulator(double maxSeconds) void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double startTime, u_int32_t TotalBytes, simgrid::surf::NetworkNS3Action* action) { - int node1 = static_cast(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL))->node_num; - int node2 = static_cast(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL))->node_num; + int node1 = src->pimpl_netcard->extension()->node_num; + int node2 = dst->pimpl_netcard->extension()->node_num; ns3::Ptr src_node = nodes.Get(node1); ns3::Ptr dst_node = nodes.Get(node2); diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h index 5445afa71b..215d6d8e1c 100644 --- a/src/surf/ns3/ns3_interface.h +++ b/src/surf/ns3/ns3_interface.h @@ -14,9 +14,11 @@ namespace simgrid{ } } -class HostNs3 { +class NetCardNs3 { public: - explicit HostNs3(); + static simgrid::xbt::Extension EXTENSION_ID; + + explicit NetCardNs3(); int node_num; }; diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 155243ad14..e1540b2fb6 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -42,7 +42,6 @@ int MSG_STORAGE_LEVEL = -1; //Msg storage level xbt_lib_t as_router_lib; int ROUTING_ASR_LEVEL = -1; //Routing level int COORD_ASR_LEVEL = -1; //Coordinates level -int NS3_ASR_LEVEL = -1; //host node for ns3 int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) -- 2.20.1