X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/309e5f403c858d0548cc4d7fc72901a79770b2f0..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 6fc7185e19..0a71792214 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -38,7 +38,7 @@ std::vector IPV4addr; * Crude globals * *****************/ -extern std::map flowFromSock; +extern std::map flow_from_sock; static ns3::InternetStackHelper stack; static ns3::NodeContainer nodes; @@ -54,9 +54,9 @@ simgrid::xbt::Extension NetPoin NetPointNs3::NetPointNs3() { - ns3Node_ = ns3::CreateObject(0); - stack.Install(ns3Node_); - nodes.Add(ns3Node_); + ns3_node_ = ns3::CreateObject(0); + stack.Install(ns3_node_); + nodes.Add(ns3_node_); node_num = number_of_nodes++; } @@ -73,7 +73,7 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs* cl // Create private link 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(); + NetPointNs3* host_src = simgrid::s4u::Host::by_name(host_id)->pimpl_netpoint->extension(); xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id.c_str()); // Any NS3 route is symmetrical @@ -98,7 +98,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin (symmetrical ? "(symmetrical)" : "(not symmetrical)")); // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); - XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->get_cname(), link->bandwidth(), link->latency()); + XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->get_cname(), link->get_bandwidth(), link->get_latency()); // create link ns3 NetPointNs3* host_src = src->extension(); @@ -107,7 +107,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin xbt_assert(host_src != nullptr, "Network element %s does not seem to be NS3-ready", src->get_cname()); xbt_assert(host_dst != nullptr, "Network element %s does not seem to be NS3-ready", dst->get_cname()); - ns3_add_link(host_src, host_dst, link->bandwidth(), link->latency()); + ns3_add_link(host_src, host_dst, link->get_bandwidth(), link->get_latency()); } else { static bool warned_about_long_routes = false; @@ -136,11 +136,9 @@ static void postparse_cb() *********/ void surf_network_model_init_NS3() { - if (surf_network_model) - return; + xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); surf_network_model = new simgrid::kernel::resource::NetworkNS3Model(); - all_existing_models->push_back(surf_network_model); } static simgrid::config::Flag @@ -150,31 +148,33 @@ namespace simgrid { namespace kernel { namespace resource { -NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::Full) +NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) { xbt_assert(not sg_link_energy_is_inited(), "LinkEnergy plugin and NS3 network models are not compatible. Are you looking for Ecofen, maybe?"); + all_existing_models.push_back(this); + NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create(); ns3_initialize(ns3_tcp_model.get().c_str()); - simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) { + simgrid::kernel::routing::NetPoint::on_creation.connect([](simgrid::kernel::routing::NetPoint* pt) { pt->extension_set(new NetPointNs3()); XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->get_cname(), pt->extension()->node_num); }); simgrid::surf::on_cluster.connect(&clusterCreation_cb); - simgrid::s4u::onPlatformCreated.connect(&postparse_cb); - simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb); + simgrid::s4u::on_platform_created.connect(&postparse_cb); + simgrid::s4u::NetZone::on_route_creation.connect(&routeCreation_cb); } NetworkNS3Model::~NetworkNS3Model() { IPV4addr.clear(); } -LinkImpl* NetworkNS3Model::createLink(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) +LinkImpl* NetworkNS3Model::create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) { return new LinkNS3(this, name, bandwidth, latency); } @@ -190,7 +190,7 @@ double NetworkNS3Model::next_occuring_event(double now) XBT_DEBUG("ns3_next_occuring_event"); //get the first relevant value from the running_actions list - if (not get_running_action_set()->size() || now == 0.0) + if (not get_started_action_set()->size() || now == 0.0) return -1.0; else do { @@ -211,7 +211,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) static std::vector socket_to_destroy; /* If there are no running flows, advance the NS3 simulator and return */ - if (get_running_action_set()->empty()) { + if (get_started_action_set()->empty()) { while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) ns3_simulator(now-ns3::Simulator::Now().GetSeconds()); @@ -219,46 +219,46 @@ void NetworkNS3Model::update_actions_state(double now, double delta) return; } - std::string ns3Socket; - for (auto elm : flowFromSock) { - ns3Socket = elm.first; + std::string ns3_socket; + for (auto elm : flow_from_sock) { + ns3_socket = elm.first; SgFlow* sgFlow = elm.second; NetworkNS3Action * action = sgFlow->action_; XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action); - action->set_remains(action->get_cost() - sgFlow->sentBytes_); + action->set_remains(action->get_cost() - sgFlow->sent_bytes_); - if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::running) { - double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_; + if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::STARTED) { + double data_delta_sent = sgFlow->sent_bytes_ - action->last_sent_; std::vector route = std::vector(); - action->src_->routeTo(action->dst_, route, nullptr); + action->src_->route_to(action->dst_, route, nullptr); for (auto const& link : route) - TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), (data_delta_sent) / delta, - now - delta, delta); + TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), + (data_delta_sent) / delta, now - delta, delta); - action->lastSent_ = sgFlow->sentBytes_; + action->last_sent_ = sgFlow->sent_bytes_; } if(sgFlow->finished_){ - socket_to_destroy.push_back(ns3Socket); - XBT_DEBUG("Destroy socket %p of action %p", ns3Socket.c_str(), action); - action->finish(kernel::resource::Action::State::done); + socket_to_destroy.push_back(ns3_socket); + XBT_DEBUG("Destroy socket %p of action %p", ns3_socket.c_str(), action); + action->finish(kernel::resource::Action::State::FINISHED); } else { - XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3Socket.c_str(), sgFlow->sentBytes_, - sgFlow->totalBytes_, sgFlow->remaining_); + XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3_socket.c_str(), sgFlow->sent_bytes_, + sgFlow->total_bytes_, sgFlow->remaining_); } } while (not socket_to_destroy.empty()) { - ns3Socket = socket_to_destroy.back(); + ns3_socket = socket_to_destroy.back(); socket_to_destroy.pop_back(); - SgFlow* flow = flowFromSock.at(ns3Socket); + SgFlow* flow = flow_from_sock.at(ns3_socket); if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) { - XBT_DEBUG("Removing socket %p of action %p", ns3Socket.c_str(), flow->action_); + XBT_DEBUG("Removing socket %p of action %p", ns3_socket.c_str(), flow->action_); } delete flow; - flowFromSock.erase(ns3Socket); + flow_from_sock.erase(ns3_socket); } } @@ -272,20 +272,22 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwid bandwidth_.peak = bandwidth; latency_.peak = latency; - s4u::Link::onCreation(this->piface_); + s4u::Link::on_creation(this->piface_); } LinkNS3::~LinkNS3() = default; -void LinkNS3::apply_event(tmgr_trace_event_t event, double value) +void LinkNS3::apply_event(profile::Event* event, double value) { THROW_UNIMPLEMENTED; } -void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) { - xbt_die("The NS3 network model doesn't support bandwidth traces"); +void LinkNS3::set_bandwidth_profile(profile::Profile* profile) +{ + xbt_die("The NS3 network model doesn't support bandwidth profiles"); } -void LinkNS3::setLatencyTrace(tmgr_trace_t trace) { - xbt_die("The NS3 network model doesn't support latency traces"); +void LinkNS3::set_latency_profile(profile::Profile* profile) +{ + xbt_die("The NS3 network model doesn't support latency profiles"); } /********** @@ -293,19 +295,17 @@ void LinkNS3::setLatencyTrace(tmgr_trace_t trace) { **********/ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst) - : NetworkAction(model, totalBytes, false) + : NetworkAction(model, totalBytes, false), src_(src), dst_(dst) { XBT_DEBUG("Communicate from %s to %s", src->get_cname(), dst->get_cname()); - src_ = src; - dst_ = dst; static int port_number = 1025; // Port number is limited from 1025 to 65 000 unsigned int node1 = src->pimpl_netpoint->extension()->node_num; unsigned int node2 = dst->pimpl_netpoint->extension()->node_num; - ns3::Ptr src_node = src->pimpl_netpoint->extension()->ns3Node_; - ns3::Ptr dst_node = dst->pimpl_netpoint->extension()->ns3Node_; + ns3::Ptr src_node = src->pimpl_netpoint->extension()->ns3_node_; + ns3::Ptr dst_node = dst->pimpl_netpoint->extension()->ns3_node_; xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?", dst->pimpl_netpoint->get_cname()); @@ -319,16 +319,16 @@ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalB ns3::Ptr sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId()); - flowFromSock.insert({transformSocketPtr(sock), new SgFlow(totalBytes, this)}); + flow_from_sock.insert({transform_socket_ptr(sock), new SgFlow(totalBytes, this)}); sock->Bind(ns3::InetSocketAddress(port_number)); - ns3::Simulator::ScheduleNow(&StartFlow, sock, addr.c_str(), port_number); + ns3::Simulator::ScheduleNow(&start_flow, sock, addr.c_str(), port_number); port_number++; xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); - s4u::Link::onCommunicate(this, src, dst); + s4u::Link::on_communicate(this, src, dst); } void NetworkNS3Action::suspend() { @@ -443,8 +443,8 @@ void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { int srcNum = src->node_num; int dstNum = dst->node_num; - ns3::Ptr a = src->ns3Node_; - ns3::Ptr b = dst->ns3Node_; + ns3::Ptr a = src->ns3_node_; + ns3::Ptr b = dst->ns3_node_; XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat); pointToPoint.SetDeviceAttribute("DataRate",