#include <unordered_set>
-#include <xbt/config.hpp>
+#include "xbt/config.hpp"
#include "ns3/core-module.h"
#include "ns3/node.h"
#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"
-#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/engine.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
-xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
+std::vector<char*> IPV4addr;
/*****************
* Crude globals *
static int number_of_networks = 1;
static int port_number = 1025; //Port number is limited from 1025 to 65 000
-HostNs3::HostNs3()
+simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> NetPointNs3::EXTENSION_ID;
+
+NetPointNs3::NetPointNs3()
{
ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node>(0);
stack.Install(node);
* Callbacks *
*************/
-static void ns3_add_host(simgrid::s4u::Host& host)
-{
- host.extension_set<HostNs3>(new HostNs3());
-}
-
-static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard)
-{
- xbt_lib_set(as_router_lib, netcard->name().c_str(), NS3_ASR_LEVEL, new HostNs3());
-}
-
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
+static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster)
{
char* lat = bprintf("%fs", cluster->lat);
char* bw = bprintf("%fBps", cluster->bw);
for (int i : *cluster->radicals) {
- char* router_id = bprintf("router_%s%d%s", cluster->prefix, i, cluster->suffix);
-
- simgrid::s4u::Host* router = new simgrid::s4u::Host(router_id);
- ns3_add_host(*router);
+ // 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 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);
- HostNs3* host_src = ns3_find_host(host_id);
- HostNs3* host_dst = router->extension<HostNs3>();
-
- xbt_assert(host_src && host_dst, "\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
+ NetPointNs3* host_src = sg_host_by_name(host_id)->pimpl_netpoint->extension<NetPointNs3>();
+ 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);
- free(router_id);
+ delete host_dst;
free(host_id);
}
xbt_free(lat);
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*>* 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<simgrid::surf::LinkImpl*>* link_list)
{
if (link_list->size() == 1) {
simgrid::surf::LinkNS3* link = static_cast<simgrid::surf::LinkNS3*>(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
- HostNs3* host_src = nullptr;
- HostNs3* host_dst = nullptr;
- if (src->isHost())
- host_src = sg_host_by_name(src->cname())->extension<HostNs3>();
- else
- host_src = static_cast<HostNs3*>(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL));
-
- if (dst->isHost())
- host_dst = sg_host_by_name(dst->cname())->extension<HostNs3>();
- else
- host_dst = static_cast<HostNs3*>(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL));
+ NetPointNs3* host_src = src->extension<NetPointNs3>();
+ NetPointNs3* host_dst = dst->extension<NetPointNs3>();
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());
/* Create the ns3 topology based on routing strategy */
static void postparse_cb(void)
{
- XBT_DEBUG("Starting topology generation");
-
- xbt_dynar_shrink(IPV4addr,0);
+ IPV4addr.shrink_to_fit();
ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
ns3::GlobalRouteManager::InitializeRoutes();
"The ns3 tcp model can be : NewReno or Reno or Tahoe",
"default");
-simgrid::xbt::Extension<simgrid::s4u::Host, HostNs3> HostNs3::EXTENSION_ID;
-
namespace simgrid {
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
- ns3_initialize(ns3_tcp_model.get().c_str());
+ NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
- simgrid::s4u::Host::onCreation.connect(ns3_add_host);
- simgrid::kernel::routing::NetCard::onCreation.connect(ns3_add_netcard);
- simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
- simgrid::surf::on_postparse.connect(&postparse_cb);
- simgrid::s4u::As::onRouteCreation.connect(&routeCreation_cb);
+ ns3_initialize(ns3_tcp_model.get().c_str());
- HostNs3::EXTENSION_ID = simgrid::s4u::Host::extension_create<HostNs3>();
+ simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) {
+ pt->extension_set<NetPointNs3>(new NetPointNs3());
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f);
+ });
+ simgrid::surf::on_cluster.connect(&clusterCreation_cb);
+ simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
+ simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
}
NetworkNS3Model::~NetworkNS3Model() {
- xbt_dynar_free_container(&IPV4addr);
+ for (auto addr : IPV4addr)
+ free(addr);
+ IPV4addr.clear();
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);
}
action->getState() == Action::State::running){
double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
- std::vector<Link*> route = std::vector<Link*>();
+ std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
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_;
}
************/
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()
-{
-}
+LinkNS3::~LinkNS3() = default;
void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value)
{
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() {
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->extension<HostNs3>()->node_num;
- int node2 = dst->extension<HostNs3>()->node_num;
+ int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+ int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
- char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*);
+ char* addr = IPV4addr.at(node2);
XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr);
ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number));
free(adr);
interfaces.Add(address.Assign (netA));
- char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
- xbt_dynar_set_as(IPV4addr,src,char*,tmp);
- XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,src,char*),src);
+ if (IPV4addr.size() <= (unsigned)src)
+ IPV4addr.resize(src + 1, nullptr);
+ IPV4addr.at(src) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2));
- tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1));
- xbt_dynar_set_as(IPV4addr,dst,char*,tmp);
- XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,dst,char*),dst);
+ if (IPV4addr.size() <= (unsigned)dst)
+ IPV4addr.resize(dst + 1, nullptr);
+ IPV4addr.at(dst) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1));
if (number_of_links == 255){
xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
