X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f246c4c46920a78ea0af8233449f402c178f04..76d4849864c227687e17bdd93c5b1338e9b4cb50:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 1a80fe61b0..f9c66af07b 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -3,6 +3,8 @@ /* 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. */ +#include "simgrid/plugins/ns3.hpp" + #include #include @@ -18,6 +20,7 @@ #include #include #include +#include #include #include @@ -36,8 +39,7 @@ #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/kernel/EngineImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/xml/platf_private.hpp" -#include "surf/surf.hpp" +#include "src/surf/xml/platf_private.hpp" // ClusterCreationArgs XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns-3"); @@ -169,7 +171,6 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) mobility.SetPositionAllocator(positionAllocS); mobility.Install(nodes); - ns3::Ipv4AddressHelper address; std::string addr = simgrid::xbt::string_printf("%d.%d.0.0", number_of_networks, number_of_links); address.SetBase(addr.c_str(), "255.255.0.0"); @@ -186,6 +187,9 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) } else { number_of_links++; } + /* in theory we can compute the routing table only only once at the platform seal + * however put it here since or platform_created signal is called before the seal right now */ + ns3::Ipv4GlobalRoutingHelper::RecomputeRoutingTables(); } static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs const& cluster) @@ -237,7 +241,7 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con 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 const& link_list) + std::vector const& link_list) { /* ignoring routes from StarZone, not supported */ if (not src || not dst) @@ -332,17 +336,17 @@ NetworkNS3Model::NetworkNS3Model(const std::string& name) : NetworkModel(name) XBT_VERB("Declare SimGrid's %s within ns-3", pt.get_cname()); }); - s4u::Engine::on_platform_created.connect([]() { + s4u::Engine::on_platform_created_cb([]() { /* Create the ns3 topology based on routing strategy */ ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); }); routing::on_cluster_creation.connect(&clusterCreation_cb); routing::NetZoneImpl::on_route_creation.connect(&routeCreation_cb); - s4u::NetZone::on_seal.connect(&zoneCreation_cb); + s4u::NetZone::on_seal_cb(&zoneCreation_cb); } -LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths) +StandardLinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths) { xbt_assert(bandwidths.size() == 1, "ns-3 links must use only 1 bandwidth."); auto* link = new LinkNS3(name, bandwidths[0]); @@ -350,7 +354,7 @@ LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vecto return link; } -LinkImpl* NetworkNS3Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) +StandardLinkImpl* NetworkNS3Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) { auto* link = create_link(name, bandwidths); link->set_sharing_policy(s4u::Link::SharingPolicy::WIFI, {}); @@ -380,7 +384,7 @@ double NetworkNS3Model::next_occurring_event(double now) XBT_DEBUG("doing a ns3 simulation for a duration of %f", now); ns3_simulator(now); - time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock(); + time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - EngineImpl::get_clock(); // NS-3 stops as soon as a flow ends, // but it does not process the other flows that may finish at the same (simulated) time. // If another flow ends at the same time, time_to_next_flow_completion = 0 @@ -389,7 +393,7 @@ double NetworkNS3Model::next_occurring_event(double now) XBT_DEBUG("min : %f", now); XBT_DEBUG("ns3 time : %f", ns3::Simulator::Now().GetSeconds()); - XBT_DEBUG("surf time : %f", surf_get_clock()); + XBT_DEBUG("surf time : %f", EngineImpl::get_clock()); XBT_DEBUG("Next completion %f :", time_to_next_flow_completion); return time_to_next_flow_completion; @@ -416,7 +420,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) 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(); + std::vector route = std::vector(); action->get_src().route_to(&action->get_dst(), route, nullptr); for (auto const& link : route) @@ -455,7 +459,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) * Resource * ************/ -LinkNS3::LinkNS3(const std::string& name, double bandwidth) : LinkImpl(name) +LinkNS3::LinkNS3(const std::string& name, double bandwidth) : StandardLinkImpl(name) { bandwidth_.peak = bandwidth; } @@ -509,17 +513,17 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s // If there is no other started actions, we need to move NS-3 forward to be sync with SimGrid if (model->get_started_action_set()->size() == 1) { - while (double_positive(surf_get_clock() - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) { + while (double_positive(EngineImpl::get_clock() - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) { XBT_DEBUG("Synchronizing NS-3 (time %f) with SimGrid (time %f)", ns3::Simulator::Now().GetSeconds(), - surf_get_clock()); - ns3_simulator(surf_get_clock() - ns3::Simulator::Now().GetSeconds()); + EngineImpl::get_clock()); + ns3_simulator(EngineImpl::get_clock() - ns3::Simulator::Now().GetSeconds()); } } static uint16_t port_number = 1; - ns3::Ptr src_node = src->get_netpoint()->extension()->ns3_node_; - ns3::Ptr dst_node = dst->get_netpoint()->extension()->ns3_node_; + ns3::Ptr src_node = get_ns3node_from_sghost(src); + ns3::Ptr dst_node = get_ns3node_from_sghost(dst); std::string& addr = dst->get_netpoint()->extension()->ipv4_address_; xbt_assert(not addr.empty(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?", @@ -542,8 +546,6 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s port_number = 1 + (port_number % UINT16_MAX); if (port_number == 1) XBT_WARN("Too many connections! Port number is saturated. Trying to use the oldest ports."); - - s4u::Link::on_communicate(*this); } void NetworkNS3Action::suspend() @@ -556,7 +558,7 @@ void NetworkNS3Action::resume() THROW_UNIMPLEMENTED; } -std::list NetworkNS3Action::get_links() const +std::list NetworkNS3Action::get_links() const { THROW_UNIMPLEMENTED; } @@ -567,6 +569,12 @@ void NetworkNS3Action::update_remains_lazy(double /*now*/) } // namespace resource } // namespace kernel + +ns3::Ptr get_ns3node_from_sghost(simgrid::s4u::Host* host) +{ + xbt_assert(host->get_netpoint()->extension() != nullptr, "Please only use this function on ns-3 nodes"); + return host->get_netpoint()->extension()->ns3_node_; +} } // namespace simgrid void ns3_simulator(double maxSeconds) @@ -575,7 +583,7 @@ void ns3_simulator(double maxSeconds) if (maxSeconds > 0.0) // If there is a maximum amount of time to run id = ns3::Simulator::Schedule(ns3::Seconds(maxSeconds), &ns3::Simulator::Stop); - XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, surf_get_clock()); + XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, simgrid::kernel::EngineImpl::get_clock()); ns3::Simulator::Run(); XBT_DEBUG("Simulator stopped at %fs", ns3::Simulator::Now().GetSeconds());