#include "ns3/core-module.h"
#include "ns3/node.h"
-#include "ns3/ns3_simulator.h"
#include "network_ns3.hpp"
+#include "ns3/ns3_simulator.hpp"
-#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "src/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
* Callbacks *
*************/
-static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster)
+static void clusterCreation_cb(ClusterCreationArgs* cluster)
{
- for (int i : *cluster->radicals) {
+ for (int const& i : *cluster->radicals) {
// 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);
- 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);
+ 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>();
+ xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id.c_str());
// Any NS3 route is symmetrical
ns3_add_link(host_src, host_dst, cluster->bw, cluster->lat);
delete host_dst;
- free(host_id);
}
//Create link backbone
- ns3_add_cluster(cluster->id, cluster->bb_bw, cluster->bb_lat);
+ ns3_add_cluster(cluster->id.c_str(), cluster->bb_bw, cluster->bb_lat);
}
static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoint* src,
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->cname(),
+ XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->getCname(), dst->getCname(), link->getCname(),
(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->cname(), link->bandwidth(),
- link->latency());
+ XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->getCname(), link->bandwidth(), link->latency());
// create link ns3
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());
+ 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());
ns3_add_link(host_src, host_dst, link->bandwidth(), link->latency());
} else {
"of length 1.\n"
"WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently "
"ignored.",
- src->cname(), dst->cname(), link_list->size());
+ src->getCname(), dst->getCname(), link_list->size());
warned_about_long_routes = true;
}
}
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
+ flowFromSock = xbt_dict_new_homogeneous([](void* p) { delete static_cast<SgFlow*>(p); });
ns3_initialize(ns3_tcp_model.get().c_str());
simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) {
pt->extension_set<NetPointNs3>(new NetPointNs3());
- XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->cname(), pt->extension<NetPointNs3>()->node_num);
+ XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->getCname(), pt->extension<NetPointNs3>()->node_num);
});
simgrid::surf::on_cluster.connect(&clusterCreation_cb);
simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
}
NetworkNS3Model::~NetworkNS3Model() {
- for (auto addr : IPV4addr)
+ for (auto const& addr : IPV4addr)
free(addr);
IPV4addr.clear();
xbt_dict_free(&flowFromSock);
}
-LinkImpl* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency,
+LinkImpl* NetworkNS3Model::createLink(const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
{
return new LinkNS3(this, name, bandwidth, latency);
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
action->src_->routeTo(action->dst_, &route, nullptr);
- for (auto link : route)
- TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
+ for (auto const& link : route)
+ TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
delta);
action->lastSent_ = sgFlow->sentBytes_;
if(sgFlow->finished_){
xbt_dynar_push(socket_to_destroy,&ns3Socket);
XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
- action->finish();
- action->setState(Action::State::done);
+ action->finish(Action::State::done);
}
}
xbt_dynar_pop(socket_to_destroy,&ns3Socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
- SgFlow *flow = (SgFlow*)xbt_dict_get (flowFromSock, ns3Socket);
+ SgFlow* flow = static_cast<SgFlow*>(xbt_dict_get(flowFromSock, ns3Socket));
XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
}
xbt_dict_remove(flowFromSock, ns3Socket);
* Resource *
************/
-LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, double latency)
+LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency)
: LinkImpl(model, name, nullptr)
{
bandwidth_.peak = bandwidth;
ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
- dst->pimpl_netpoint->cname());
+ dst->pimpl_netpoint->getCname());
char* addr = IPV4addr.at(node2);
xbt_assert(addr != nullptr, "Element %s is unknown to NS3. Is it connected to any one-hop link?",
- dst->pimpl_netpoint->cname());
+ dst->pimpl_netpoint->getCname());
- XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr);
+ XBT_DEBUG("ns3_create_flow %u Bytes from %u to %u with Interface %s", TotalBytes, node1, node2, addr);
ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number));
sink.Install (dst_node);
for (unsigned int i = number_of_clusters_nodes; i < Cluster_nodes.GetN(); i++) {
Nodes.Add(Cluster_nodes.Get(i));
- XBT_DEBUG("Add node %d to cluster",i);
+ XBT_DEBUG("Add node %u to cluster", i);
}
number_of_clusters_nodes = Cluster_nodes.GetN();
- XBT_DEBUG("Add router %d to cluster",nodes.GetN()-Nodes.GetN()-1);
+ XBT_DEBUG("Add router %u to cluster", nodes.GetN() - Nodes.GetN() - 1);
Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1));
xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
}else{
number_of_links++;
}
- XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
+ XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN());
}
static char* transformIpv4Address (ns3::Ipv4Address from){