X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/666a812d1b3ee4568f2beb317dfcd08d99055697..171293b2177631594dafc0a8449ee370aebdd305:/src/surf/network_ns3.cpp?ds=sidebyside diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 372e1291db..bc8a59a3ce 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -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; @@ -150,7 +150,7 @@ 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?"); @@ -159,22 +159,22 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::Full) 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::on_platform_created.connect(&postparse_cb); - simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_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()); @@ -227,15 +227,15 @@ void NetworkNS3Model::update_actions_state(double now, double delta) XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action); action->set_remains(action->get_cost() - sgFlow->sentBytes_); - if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::running) { + if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::STARTED) { double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_; 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_; } @@ -243,7 +243,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) 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); + 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_); @@ -272,7 +272,7 @@ 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; @@ -281,10 +281,12 @@ void LinkNS3::apply_event(tmgr_trace_event_t event, double value) { THROW_UNIMPLEMENTED; } -void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) { +void LinkNS3::set_bandwidth_trace(tmgr_trace_t trace) +{ xbt_die("The NS3 network model doesn't support bandwidth traces"); } -void LinkNS3::setLatencyTrace(tmgr_trace_t trace) { +void LinkNS3::set_latency_trace(tmgr_trace_t trace) +{ xbt_die("The NS3 network model doesn't support latency traces"); } @@ -328,7 +330,7 @@ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalB 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() {