-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
/* 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 <string>
#include <unordered_set>
#include "xbt/config.hpp"
+#include "xbt/string.hpp"
+#include "xbt/utility.hpp"
-#include "ns3/core-module.h"
-#include "ns3/node.h"
+#include <ns3/core-module.h>
+#include <ns3/csma-helper.h>
+#include <ns3/global-route-manager.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/packet-sink-helper.h>
+#include <ns3/point-to-point-helper.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/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/plugins/energy.h"
#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");
-std::vector<char*> IPV4addr;
+std::vector<std::string> IPV4addr;
/*****************
* Crude globals *
*****************/
-extern xbt_dict_t flowFromSock;
+extern std::map<std::string, SgFlow*> flow_from_sock;
static ns3::InternetStackHelper stack;
static ns3::NodeContainer nodes;
static int number_of_clusters_nodes = 0;
static int number_of_links = 1;
static int number_of_networks = 1;
-static int port_number = 1025; //Port number is limited from 1025 to 65 000
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);
- nodes.Add(node);
+ ns3_node_ = ns3::CreateObject<ns3::Node>(0);
+ stack.Install(ns3_node_);
+ nodes.Add(ns3_node_);
node_num = number_of_nodes++;
}
* Callbacks *
*************/
-static void clusterCreation_cb(ClusterCreationArgs* cluster)
+static void clusterCreation_cb(simgrid::kernel::routing::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
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>();
+ NetPointNs3* host_src = simgrid::s4u::Host::by_name(host_id)->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
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)
+ std::vector<simgrid::kernel::resource::LinkImpl*>& link_list)
{
- if (link_list->size() == 1) {
- simgrid::surf::LinkNS3* link = static_cast<simgrid::surf::LinkNS3*>(link_list->at(0));
+ if (link_list.size() == 1) {
+ simgrid::kernel::resource::LinkNS3* link = static_cast<simgrid::kernel::resource::LinkNS3*>(link_list[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->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->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<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->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;
"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->get_cname(), dst->get_cname(), link_list.size());
warned_about_long_routes = true;
}
}
*********/
void surf_network_model_init_NS3()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
- surf_network_model = new simgrid::surf::NetworkNS3Model();
- all_existing_models->push_back(surf_network_model);
+ surf_network_model = new simgrid::kernel::resource::NetworkNS3Model();
}
-static simgrid::config::Flag<std::string> ns3_tcp_model("ns3/TcpModel",
- "The ns3 tcp model can be : NewReno or Reno or Tahoe", "NewReno");
+static simgrid::config::Flag<std::string>
+ 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(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?");
+
+ all_existing_models.push_back(this);
-NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
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<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->get_cname(), pt->extension<NetPointNs3>()->node_num);
});
simgrid::surf::on_cluster.connect(&clusterCreation_cb);
- simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
- simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
- LogComponentEnable("PacketSink", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
+ simgrid::s4u::on_platform_created.connect(&postparse_cb);
+ simgrid::s4u::NetZone::on_route_creation.connect(&routeCreation_cb);
}
NetworkNS3Model::~NetworkNS3Model() {
- for (auto addr : IPV4addr)
- free(addr);
IPV4addr.clear();
- xbt_dict_free(&flowFromSock);
}
-LinkImpl* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy)
+LinkImpl* NetworkNS3Model::create_link(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy)
{
return new LinkNS3(this, name, bandwidth, latency);
}
-Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+kernel::resource::Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
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_started_action_set()->size() || now == 0.0)
return -1.0;
else
do {
return time_to_next_flow_completion;
}
-void NetworkNS3Model::updateActionsState(double now, double delta)
+void NetworkNS3Model::update_actions_state(double now, double delta)
{
- static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr);
+ static std::vector<std::string> socket_to_destroy;
/* If there are no running flows, advance the NS3 simulator and return */
- if (getRunningActionSet()->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());
return;
}
- xbt_dict_cursor_t cursor = nullptr;
- char *ns3Socket;
- SgFlow *sgFlow;
- xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
+ std::string ns3_socket;
+ for (auto elm : flow_from_sock) {
+ ns3_socket = elm.first;
+ 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->sent_bytes_);
- if (TRACE_is_enabled() &&
- action->getState() == Action::State::running){
- double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
+ if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::STARTED) {
+ double data_delta_sent = sgFlow->sent_bytes_ - action->last_sent_;
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,
- delta);
+ action->src_->route_to(action->dst_, route, nullptr);
+ for (auto const& link : route)
+ 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_;
+ action->last_sent_ = sgFlow->sent_bytes_;
}
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);
+ socket_to_destroy.push_back(ns3_socket);
+ XBT_DEBUG("Destroy socket %p of action %p", ns3_socket.c_str(), action);
+ action->finish(kernel::resource::Action::State::FINISHED);
+ } else {
+ XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3_socket.c_str(), sgFlow->sent_bytes_,
+ sgFlow->total_bytes_, sgFlow->remaining_);
}
}
- while (not xbt_dynar_is_empty(socket_to_destroy)) {
- xbt_dynar_pop(socket_to_destroy,&ns3Socket);
-
+ while (not socket_to_destroy.empty()) {
+ ns3_socket = socket_to_destroy.back();
+ socket_to_destroy.pop_back();
+ SgFlow* flow = flow_from_sock.at(ns3_socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
- SgFlow *flow = (SgFlow*)xbt_dict_get (flowFromSock, ns3Socket);
- XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
+ XBT_DEBUG("Removing socket %p of action %p", ns3_socket.c_str(), flow->action_);
}
- xbt_dict_remove(flowFromSock, ns3Socket);
+ delete flow;
+ flow_from_sock.erase(ns3_socket);
}
}
* 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;
latency_.peak = latency;
- s4u::Link::onCreation(this->piface_);
+ s4u::Link::on_creation(this->piface_);
}
LinkNS3::~LinkNS3() = default;
-void LinkNS3::apply_event(tmgr_trace_event_t event, double value)
+void LinkNS3::apply_event(profile::Event* event, double value)
{
THROW_UNIMPLEMENTED;
}
-void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) {
- xbt_die("The NS3 network model doesn't support bandwidth traces");
+void LinkNS3::set_bandwidth_profile(profile::Profile* profile)
+{
+ xbt_die("The NS3 network model doesn't support bandwidth profiles");
}
-void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
- xbt_die("The NS3 network model doesn't support latency traces");
+void LinkNS3::set_latency_profile(profile::Profile* profile)
+{
+ xbt_die("The NS3 network model doesn't support latency profiles");
}
/**********
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst)
- : NetworkAction(model, size, false)
+NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst)
+ : NetworkAction(model, totalBytes, false), src_(src), dst_(dst)
{
- XBT_DEBUG("Communicate from %s to %s", src->getCname(), dst->getCname());
+ XBT_DEBUG("Communicate from %s to %s", src->get_cname(), dst->get_cname());
+
+ static int port_number = 1025; // Port number is limited from 1025 to 65 000
+
+ unsigned int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+ unsigned int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+
+ ns3::Ptr<ns3::Node> src_node = src->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
+ ns3::Ptr<ns3::Node> dst_node = dst->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
+
+ xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
+ 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->get_cname());
- src_ = src;
- dst_ = dst;
- ns3_create_flow(src, dst, size, this);
+ 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));
+ sink.Install(dst_node);
- s4u::Link::onCommunicate(this, src, dst);
+ ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
+
+ flow_from_sock.insert({transform_socket_ptr(sock), new SgFlow(totalBytes, this)});
+
+ sock->Bind(ns3::InetSocketAddress(port_number));
+
+ ns3::Simulator::ScheduleNow(&start_flow, sock, addr.c_str(), port_number);
+
+ port_number++;
+ xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
+
+ s4u::Link::on_communicate(this, src, dst);
}
void NetworkNS3Action::suspend() {
{
THROW_UNIMPLEMENTED;
}
-
-/* Test whether a flow is suspended */
-bool NetworkNS3Action::isSuspended()
+void NetworkNS3Action::update_remains_lazy(double /*now*/)
{
- return false;
-}
-
-int NetworkNS3Action::unref()
-{
- refcount_--;
- if (not refcount_) {
- if (action_hook.is_linked())
- stateSet_->erase(stateSet_->iterator_to(*this));
- XBT_DEBUG ("Removing action %p", this);
- delete this;
- return 1;
- }
- return 0;
+ THROW_IMPOSSIBLE;
}
+} // namespace resource
}
}
ns3::Simulator::Run ();
}
-void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst,
- u_int32_t TotalBytes,
- simgrid::surf::NetworkNS3Action* action) {
- unsigned int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
- unsigned 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);
-
- xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
- dst->pimpl_netpoint->cname());
- 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());
-
- 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);
-
- ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
-
- xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr);
-
- sock->Bind(ns3::InetSocketAddress(port_number));
-
- ns3::Simulator::ScheduleNow(&StartFlow, sock, addr, port_number);
-
- port_number++;
- xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
-}
// initialize the NS3 interface and environment
-void ns3_initialize(const char* TcpProtocol){
-// tcpModel are:
-// "ns3::TcpNewReno"
-// "ns3::TcpReno"
-// "ns3::TcpTahoe"
+void ns3_initialize(std::string TcpProtocol)
+{
+ // tcpModel are:
+ // "ns3::TcpNewReno"
+ // "ns3::TcpReno"
+ // "ns3::TcpTahoe"
ns3::Config::SetDefault ("ns3::TcpSocket::SegmentSize", ns3::UintegerValue (1000));
ns3::Config::SetDefault ("ns3::TcpSocket::DelAckCount", ns3::UintegerValue (1));
ns3::Config::SetDefault ("ns3::TcpSocketBase::Timestamp", ns3::BooleanValue (false));
- if (not strcmp(TcpProtocol, "default"))
- return;
+ if (TcpProtocol == "default") {
+ /* nothing to do */
- if (not strcmp(TcpProtocol, "Reno")) {
- XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+ } else if (TcpProtocol == "Reno") {
+ XBT_INFO("Switching Tcp protocol to '%s'", TcpProtocol.c_str());
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpReno"));
- return;
- }
- if (not strcmp(TcpProtocol, "NewReno")) {
- XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+
+ } else if (TcpProtocol == "NewReno") {
+ XBT_INFO("Switching Tcp protocol to '%s'", TcpProtocol.c_str());
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpNewReno"));
- return;
- }
- if (not strcmp(TcpProtocol, "Tahoe")) {
- XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+
+ } else if (TcpProtocol == "Tahoe") {
+ XBT_INFO("Switching Tcp protocol to '%s'", TcpProtocol.c_str());
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe"));
- return;
- }
- xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
+ } else {
+ xbt_die("The ns3/TcpModel must be: NewReno or Reno or Tahoe");
+ }
}
void ns3_add_cluster(const char* id, double bw, double lat) {
xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
ns3::CsmaHelper csma;
- csma.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+ csma.SetChannelAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw * 8))); // NS3 takes bps, but we provide Bps
csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
ns3::NetDeviceContainer devices = csma.Install(Nodes);
XBT_DEBUG("Create CSMA");
- char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
- XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
+ std::string addr = simgrid::xbt::string_printf("%d.%d.0.0", number_of_networks, number_of_links);
+ XBT_DEBUG("Assign IP Addresses %s to CSMA.", addr.c_str());
ns3::Ipv4AddressHelper ipv4;
- ipv4.SetBase (adr, "255.255.0.0");
- free(adr);
+ ipv4.SetBase(addr.c_str(), "255.255.0.0");
interfaces.Add(ipv4.Assign (devices));
if(number_of_links == 255){
XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN());
}
-static char* transformIpv4Address (ns3::Ipv4Address from){
+static std::string transformIpv4Address(ns3::Ipv4Address from)
+{
std::stringstream sstream;
sstream << from ;
- std::string s = sstream.str();
- return bprintf("%s",s.c_str());
+ return sstream.str();
}
void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) {
int srcNum = src->node_num;
int dstNum = dst->node_num;
- ns3::Ptr<ns3::Node> a = nodes.Get(srcNum);
- ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
+ ns3::Ptr<ns3::Node> a = src->ns3_node_;
+ ns3::Ptr<ns3::Node> b = dst->ns3_node_;
XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
- pointToPoint.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+ pointToPoint.SetDeviceAttribute("DataRate",
+ ns3::DataRateValue(ns3::DataRate(bw * 8))); // NS3 takes bps, but we provide Bps
pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
- char *filename = bprintf("link-%d-%d.tr", srcNum, dstNum);
- ns3::AsciiTraceHelper ascii;
- pointToPoint.EnableAsciiAll (ascii.CreateFileStream (filename));
- pointToPoint.EnablePcapAll ("tcp-bulk-send", false);
- xbt_free(filename);
-
ns3::NetDeviceContainer netA;
netA.Add(pointToPoint.Install (a, b));
- char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
- address.SetBase (adr, "255.255.0.0");
- XBT_DEBUG("\tInterface stack '%s'",adr);
- free(adr);
+ 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");
+ XBT_DEBUG("\tInterface stack '%s'", addr.c_str());
interfaces.Add(address.Assign (netA));
if (IPV4addr.size() <= (unsigned)srcNum)
- IPV4addr.resize(srcNum + 1, nullptr);
- IPV4addr.at(srcNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2));
+ IPV4addr.resize(srcNum + 1);
+ IPV4addr[srcNum] = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2));
if (IPV4addr.size() <= (unsigned)dstNum)
- IPV4addr.resize(dstNum + 1, nullptr);
- IPV4addr.at(dstNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1));
+ IPV4addr.resize(dstNum + 1);
+ IPV4addr[dstNum] = 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");
