X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a79a8e1cab86ccc687cfbc97b01b735acb996f16..c5a48995c0e24c9ae38c3d14203388523c565a5b:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 16d6986c2c..6bc87ef269 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -16,7 +16,7 @@ #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/kernel/routing/NetPoint.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/surf_private.h" @@ -44,9 +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 -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,11 +58,6 @@ NetCardNs3::NetCardNs3() * Callbacks * *************/ -static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) -{ - netcard->extension_set(new NetCardNs3()); -} - static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) { char* lat = bprintf("%fs", cluster->lat); @@ -70,12 +65,12 @@ static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) 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(); + NetPointNs3* host_src = sg_host_by_name(host_id)->pimpl_netpoint->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); @@ -94,24 +89,25 @@ static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) xbt_free(bw); } -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) bdw:%s lat:%s", link->cname(), link_bdw, link_lat); // 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()); @@ -154,13 +150,16 @@ 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()); + + }); 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("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); @@ -174,8 +173,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); } @@ -232,11 +231,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_; } @@ -265,12 +265,12 @@ 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; @@ -299,7 +299,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4 dst_ = dst; ns3_create_flow(src, dst, surf_get_clock(), size, this); - Link::onCommunicate(this, src, dst); + s4u::Link::onCommunicate(this, src, dst); } void NetworkNS3Action::suspend() { @@ -343,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 = src->pimpl_netcard->extension()->node_num; - int node2 = dst->pimpl_netcard->extension()->node_num; + int node1 = src->pimpl_netpoint->extension()->node_num; + int node2 = dst->pimpl_netpoint->extension()->node_num; ns3::Ptr src_node = nodes.Get(node1); ns3::Ptr dst_node = nodes.Get(node2);