X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95a02a8febe84fd1c2ed98c78c594a5e8a0116f7..301e8d03b6cc9a9daa12a874582a8ea2b1838269:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index b49a92f254..6fc7185e19 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -26,6 +26,9 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/NetZone.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/surf/surf_interface.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module"); @@ -61,7 +64,7 @@ NetPointNs3::NetPointNs3() * Callbacks * *************/ -static void clusterCreation_cb(ClusterCreationArgs* cluster) +static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs* cluster) { for (int const& i : *cluster->radicals) { // Routers don't create a router on the other end of the private link by themselves. @@ -86,23 +89,23 @@ static void clusterCreation_cb(ClusterCreationArgs* cluster) 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) + std::vector& link_list) { if (link_list.size() == 1) { - simgrid::surf::LinkNS3* link = static_cast(link_list[0]); + simgrid::kernel::resource::LinkNS3* link = static_cast(link_list[0]); - XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->getCname(), dst->getCname(), link->getCname(), + XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->get_cname(), dst->get_cname(), link->get_cname(), (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->getCname(), link->bandwidth(), link->latency()); + XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->get_cname(), link->bandwidth(), link->latency()); // create link ns3 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->getCname()); - xbt_assert(host_dst != nullptr, "Network element %s does not seem to be NS3-ready", dst->getCname()); + 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()); } else { @@ -114,7 +117,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin "of length 1.\n" "WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently " "ignored.", - src->getCname(), dst->getCname(), link_list.size()); + src->get_cname(), dst->get_cname(), link_list.size()); warned_about_long_routes = true; } } @@ -136,7 +139,7 @@ void surf_network_model_init_NS3() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkNS3Model(); + surf_network_model = new simgrid::kernel::resource::NetworkNS3Model(); all_existing_models->push_back(surf_network_model); } @@ -144,9 +147,11 @@ static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default"); namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { -NetworkNS3Model::NetworkNS3Model() : NetworkModel() { +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?"); @@ -156,7 +161,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { 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->getCname(), pt->extension()->node_num); + 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); @@ -169,7 +174,7 @@ NetworkNS3Model::~NetworkNS3Model() { } LinkImpl* NetworkNS3Model::createLink(const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) + s4u::Link::SharingPolicy policy) { return new LinkNS3(this, name, bandwidth, latency); } @@ -179,13 +184,13 @@ kernel::resource::Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host return new NetworkNS3Action(this, size, src, dst); } -double NetworkNS3Model::nextOccuringEvent(double now) +double NetworkNS3Model::next_occuring_event(double now) { double time_to_next_flow_completion; XBT_DEBUG("ns3_next_occuring_event"); //get the first relevant value from the running_actions list - if (not getRunningActionSet()->size() || now == 0.0) + if (not get_running_action_set()->size() || now == 0.0) return -1.0; else do { @@ -201,12 +206,12 @@ double NetworkNS3Model::nextOccuringEvent(double now) return time_to_next_flow_completion; } -void NetworkNS3Model::updateActionsState(double now, double delta) +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 (getRunningActionSet()->empty()) { + if (get_running_action_set()->empty()) { while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) ns3_simulator(now-ns3::Simulator::Now().GetSeconds()); @@ -220,17 +225,17 @@ void NetworkNS3Model::updateActionsState(double now, double delta) SgFlow* sgFlow = elm.second; NetworkNS3Action * action = sgFlow->action_; XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action); - action->setRemains(action->getCost() - sgFlow->sentBytes_); + action->set_remains(action->get_cost() - sgFlow->sentBytes_); - if (TRACE_is_enabled() && action->getState() == kernel::resource::Action::State::running) { + if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::running) { double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_; std::vector route = std::vector(); action->src_->routeTo(action->dst_, route, nullptr); for (auto const& link : route) - TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta, - delta); + TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), (data_delta_sent) / delta, + now - delta, delta); action->lastSent_ = sgFlow->sentBytes_; } @@ -290,7 +295,7 @@ 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) { - XBT_DEBUG("Communicate from %s to %s", src->getCname(), dst->getCname()); + XBT_DEBUG("Communicate from %s to %s", src->get_cname(), dst->get_cname()); src_ = src; dst_ = dst; @@ -303,10 +308,10 @@ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalB ns3::Ptr dst_node = dst->pimpl_netpoint->extension()->ns3Node_; xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?", - dst->pimpl_netpoint->getCname()); + dst->pimpl_netpoint->get_cname()); std::string& addr = IPV4addr[node2]; xbt_assert(not addr.empty(), "Element %s is unknown to NS3. Is it connected to any one-hop link?", - dst->pimpl_netpoint->getCname()); + dst->pimpl_netpoint->get_cname()); XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str()); ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number)); @@ -338,26 +343,12 @@ std::list NetworkNS3Action::links() { THROW_UNIMPLEMENTED; } - -/* Test whether a flow is suspended */ -bool NetworkNS3Action::isSuspended() -{ - return false; -} - -int NetworkNS3Action::unref() +void NetworkNS3Action::update_remains_lazy(double /*now*/) { - refcount_--; - if (not refcount_) { - if (stateSetHook_.is_linked()) - simgrid::xbt::intrusive_erase(*stateSet_, *this); - XBT_DEBUG ("Removing action %p", this); - delete this; - return 1; - } - return 0; + THROW_IMPOSSIBLE; } +} // namespace resource } }