-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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 <unordered_set>
+
+#include "xbt/config.hpp"
+
#include "ns3/core-module.h"
#include "ns3/node.h"
-#include "ns3/ns3_interface.h"
#include "ns3/ns3_simulator.h"
-#include "src/surf/network_ns3.hpp"
+#include "network_ns3.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "src/surf/surf_private.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/NetPoint.hpp"
-#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/NetZone.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
-int NS3_EXTENSION_ID;
-
-xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
-static double time_to_next_flow_completion = -1;
+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
-static NS3Sim* ns3_sim = 0;
-
-
-/*************
- * Callbacks *
- *************/
+simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> NetPointNs3::EXTENSION_ID;
-static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
+NetPointNs3::NetPointNs3()
{
- const char* id = host.name().c_str();
- XBT_DEBUG("NS3_ADD_HOST '%s'", id);
-
- ns3_node_t ns3host = xbt_new0(s_ns3_node_t,1);
- ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node> (0);
+ ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node>(0);
stack.Install(node);
nodes.Add(node);
- ns3host->node_num = number_of_nodes;
- ns3host->type = NS3_NETWORK_ELEMENT_HOST;
- number_of_nodes++;
-
- host.extension_set(NS3_EXTENSION_ID, ns3host);
-}
-
-static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
-{
- XBT_DEBUG("NS3_ADD_LINK '%s'",link->id);
-
- Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency, link->policy, link->properties);
- if (link->bandwidth_trace)
- l->setBandwidthTrace(link->latency_trace);
- if (link->latency_trace)
- l->setLatencyTrace(link->latency_trace);
- if (link->state_trace)
- l->setStateTrace(link->state_trace);
-}
-static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
-{
- const char* router_id = router->name();
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
- xbt_lib_set(as_router_lib,
- router_id,
- NS3_ASR_LEVEL,
- ns3_add_router(router_id)
- );
+ node_num = number_of_nodes++;
}
-static void parse_ns3_add_AS(simgrid::s4u::As* as)
-{
- const char* as_id = as->name();
- XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
- xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
-}
+/*************
+ * Callbacks *
+ *************/
-#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)
{
- const char *groups = NULL;
-
- int start, end, i;
- unsigned int iter;
-
- xbt_dynar_t radical_elements;
- xbt_dynar_t radical_ends;
- xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
-
- char *router_id,*host_id;
-
- radical_elements = xbt_str_split(cluster->radical, ",");
- xbt_dynar_foreach(radical_elements, iter, groups) {
- radical_ends = xbt_str_split(groups, "-");
-
- switch (xbt_dynar_length(radical_ends)) {
- case 1:
- start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- xbt_dynar_push_as(tab_elements_num, int, start);
- router_id = bprintf("ns3_%s%d%s", cluster->prefix, start, cluster->suffix);
- simgrid::s4u::Host::by_name_or_create(router_id)
- ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
- free(router_id);
- break;
-
- case 2:
- start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
- for (i = start; i <= end; i++){
- xbt_dynar_push_as(tab_elements_num, int, i);
- router_id = bprintf("ns3_%s%d%s", cluster->prefix, i, cluster->suffix);
- simgrid::s4u::Host::by_name_or_create(router_id)
- ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
- free(router_id);
- }
- break;
-
- default:
- XBT_DEBUG("Malformed radical");
- }
- }
-
- //Create links
- unsigned int cpt;
- int elmts;
- char * lat = bprintf("%fs", cluster->lat);
- char * bw = bprintf("%fBps", cluster->bw);
+ char* lat = bprintf("%fs", cluster->lat);
+ char* bw = bprintf("%fBps", cluster->bw);
- xbt_dynar_foreach(tab_elements_num,cpt,elmts)
- {
- host_id = bprintf("%s%d%s", cluster->prefix, elmts, cluster->suffix);
- router_id = bprintf("ns3_%s%d%s", cluster->prefix, elmts, cluster->suffix);
- XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id);
+ for (int 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();
- ns3_node_t host_src = ns3_find_host(host_id);
- ns3_node_t host_dst = ns3_find_host(router_id);
+ // 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);
- if(host_src && host_dst){}
- else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
+ ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat);
- ns3_add_link(host_src->node_num,host_src->type,
- host_dst->node_num,host_dst->type,
- bw,lat);
-
- free(router_id);
+ delete host_dst;
free(host_id);
}
xbt_free(lat);
xbt_free(bw);
- xbt_dynar_free(&tab_elements_num);
-
//Create link backbone
lat = bprintf("%fs", cluster->bb_lat);
bw = bprintf("%fBps", cluster->bb_bw);
- ns3_add_cluster(bw,lat,cluster->id);
+ ns3_add_cluster(cluster->id, bw, lat);
xbt_free(lat);
xbt_free(bw);
}
-/* Create the ns3 topology based on routing strategy */
-static void create_ns3_topology(void)
+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)
{
- XBT_DEBUG("Starting topology generation");
-
- xbt_dynar_shrink(IPV4addr,0);
-
- //get the onelinks from the parsed platform
- xbt_dynar_t onelink_routes = routing_platf->getOneLinkRoutes();
- if (!onelink_routes)
- xbt_die("There is no routes!");
- XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
- //save them in trace file
- simgrid::surf::Onelink *onelink;
- unsigned int iter;
- xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = onelink->src_->name();
- char *dst = onelink->dst_->name();
- simgrid::surf::LinkNS3 *link =
- static_cast<simgrid::surf::LinkNS3 *>(onelink->link_);
-
- if (strcmp(src,dst) && link->m_created){
- XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
- char * link_bdw = bprintf("%fBps", link->getBandwidth());
- char * link_lat = bprintf("%fs", link->getLatency());
- link->m_created = 0;
-
- // 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);
-
- //create link ns3
- ns3_node_t host_src = ns3_find_host(src);
- if (!host_src)
- host_src = static_cast<ns3_node_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
- ns3_node_t host_dst = ns3_find_host(dst);
- if(!host_dst)
- host_dst = static_cast<ns3_node_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
-
- if (!host_src || !host_dst)
- xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
-
- ns3_add_link(host_src->node_num,host_src->type,host_dst->node_num,host_dst->type,link_bdw,link_lat);
-
- xbt_free(link_bdw);
- xbt_free(link_lat);
- }
+ 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(),
+ (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->cname(), link_bdw, link_lat);
+
+ // 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());
+
+ ns3_add_link(host_src->node_num, host_dst->node_num, link_bdw, link_lat);
+ if (symmetrical)
+ ns3_add_link(host_dst->node_num, host_src->node_num, link_bdw, link_lat);
+
+ xbt_free(link_bdw);
+ xbt_free(link_lat);
}
}
-static void parse_ns3_end_platform(void)
+/* Create the ns3 topology based on routing strategy */
+static void postparse_cb(void)
{
- ns3_end_platform();
-}
+ IPV4addr.shrink_to_fit();
-static void define_callbacks_ns3(void)
-{
- simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
- simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
- simgrid::surf::on_link.connect (parse_ns3_add_link);
- simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
- simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
- simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
- simgrid::surf::on_postparse.connect(&parse_ns3_end_platform); //InitializeRoutes
+ ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+ ns3::GlobalRouteManager::InitializeRoutes();
}
/*********
* Model *
*********/
-static void free_ns3_link(void * elmts)
-{
- delete static_cast<simgrid::surf::LinkNS3*>(elmts);
-}
-
-static void free_ns3_host(void * elmts)
-{
- ns3_node_t host = static_cast<ns3_node_t>(elmts);
- free(host);
-}
-
void surf_network_model_init_NS3()
{
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkNS3Model();
-
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
}
+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 {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
- if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
- xbt_die("Impossible to initialize NS3 interface");
- }
- routing_model_create(NULL);
- define_callbacks_ns3();
+ 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) {
+ pt->extension_set<NetPointNs3>(new NetPointNs3());
- NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host);
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
+ });
+ 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() {
- delete ns3_sim;
- 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,
- xbt_dict_t properties){
-
- return new LinkNS3(this, name, properties, bandwidth, latency);
+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 *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
+Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
- XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
- NetworkNS3Action *action = new NetworkNS3Action(this, size, 0);
-
- ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, action);
-
- action->m_lastSent = 0;
- action->p_srcElm = src;
- action->p_dstElm = dst;
- networkCommunicateCallbacks(action, src, dst, size, rate);
-
- return (surf_action_t) action;
+ return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::next_occuring_event(double now)
+double NetworkNS3Model::nextOccuringEvent(double now)
{
+ double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
else
do {
ns3_simulator(now);
- time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();//FIXME: use now instead ?
+ time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();
} while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
void NetworkNS3Model::updateActionsState(double now, double delta)
{
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- void *data;
+ static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr);
- static xbt_dynar_t socket_to_destroy = NULL;
- if(!socket_to_destroy) socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL);
+ /* If there are no running flows, advance the NS3 simulator and return */
+ if (getRunningActionSet()->empty()) {
- /* If there are no running flows, just return */
- if (!getRunningActionSet()->size()) {
- while(double_positive(now-ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) {
+ while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision))
ns3_simulator(now-ns3::Simulator::Now().GetSeconds());
- }
+
return;
}
- NetworkNS3Action *action;
- xbt_dict_foreach(flowFromSock,cursor,key,data){
- action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
- XBT_DEBUG("Processing socket %p (action %p)",data,action);
- action->setRemains(action->getCost() - ns3_get_socket_sent(data));
+ xbt_dict_cursor_t cursor = nullptr;
+ char *ns3Socket;
+ SgFlow *sgFlow;
+ xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
+ NetworkNS3Action * action = sgFlow->action_;
+ XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
+ action->setRemains(action->getCost() - sgFlow->sentBytes_);
if (TRACE_is_enabled() &&
action->getState() == Action::State::running){
- double data_sent = ns3_get_socket_sent(data);
- double data_delta_sent = data_sent - action->m_lastSent;
+ double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
- std::vector<Link*> *route = new std::vector<Link*>();
+ std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
- routing_platf->getRouteAndLatency (action->p_srcElm, action->p_dstElm, route, NULL);
- for (auto link : *route)
- TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
- delete route;
+ 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->m_lastSent = data_sent;
+ action->lastSent_ = sgFlow->sentBytes_;
}
- if(ns3_get_socket_is_finished(data) == 1){
- xbt_dynar_push(socket_to_destroy,&key);
- XBT_DEBUG("Destroy socket %p of action %p", key, action);
+ 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);
}
}
while (!xbt_dynar_is_empty(socket_to_destroy)){
- xbt_dynar_pop(socket_to_destroy,&key);
+ xbt_dynar_pop(socket_to_destroy,&ns3Socket);
- void *data = xbt_dict_get (flowFromSock, key);
- action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
- XBT_DEBUG ("Removing socket %p of action %p", key, action);
- xbt_dict_remove(flowFromSock, key);
+ 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_dict_remove(flowFromSock, ns3Socket);
}
- return;
}
/************
* Resource *
************/
-LinkNS3::LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency)
- : Link(model, name, props)
- , m_created(1)
+LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, double latency)
+ : LinkImpl(model, name, nullptr)
{
- m_bandwidth.peak = bandwidth;
- m_latency.peak = latency;
+ 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)
{
THROW_UNIMPLEMENTED;
}
void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) {
- xbt_die("The NS3 network model doesn't support latency state traces");
+ xbt_die("The NS3 network model doesn't support bandwidth traces");
}
void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
- xbt_die("The NS3 network model doesn't support latency state traces");
+ xbt_die("The NS3 network model doesn't support latency traces");
}
/**********
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
-: NetworkAction(model, cost, failed)
-{}
-
-void NetworkNS3Action::suspend()
+NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst)
+ : NetworkAction(model, size, false)
{
+ XBT_DEBUG("Communicate from %s to %s", src->cname(), dst->cname());
+
+ src_ = src;
+ dst_ = dst;
+ ns3_create_flow(src, dst, surf_get_clock(), size, this);
+
+ s4u::Link::onCommunicate(this, src, dst);
+}
+
+void NetworkNS3Action::suspend() {
THROW_UNIMPLEMENTED;
}
-void NetworkNS3Action::resume()
-{
+void NetworkNS3Action::resume() {
THROW_UNIMPLEMENTED;
}
/* Test whether a flow is suspended */
bool NetworkNS3Action::isSuspended()
{
- return 0;
+ return false;
}
int NetworkNS3Action::unref()
{
- m_refcount--;
- if (!m_refcount) {
- if (action_hook.is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ refcount_--;
+ if (!refcount_) {
+ if (action_hook.is_linked())
+ stateSet_->erase(stateSet_->iterator_to(*this));
XBT_DEBUG ("Removing action %p", this);
- delete this;
+ delete this;
return 1;
}
return 0;
}
}
-
-
-
-
-void ns3_simulator(double min){
- ns3_sim->simulator_start(min);
+void ns3_simulator(double maxSeconds)
+{
+ if (maxSeconds > 0.0) // If there is a maximum amount of time to run
+ ns3::Simulator::Stop(ns3::Seconds(maxSeconds));
+ XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, surf_get_clock());
+ ns3::Simulator::Run ();
}
-simgrid::surf::NetworkNS3Action* ns3_get_socket_action(void *socket){
- return ((SgFlow *)socket)->action_;
-}
+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->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+ int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
-double ns3_get_socket_remains(void *socket){
- return ((SgFlow *)socket)->remaining_;
-}
+ ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
+ ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
-double ns3_get_socket_sent(void *socket){
- return ((SgFlow *)socket)->sentBytes_;
-}
+ char* addr = IPV4addr.at(node2);
-bool ns3_get_socket_is_finished(void *socket){
- return ((SgFlow *)socket)->finished_;
-}
+ 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));
+ sink.Install (dst_node);
-int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action)
-{
- ns3_node_t node1 = ns3_find_host(a);
- ns3_node_t node2 = ns3_find_host(b);
+ ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId());
- ns3::Ptr<ns3::Node> src_node = nodes.Get(node1->node_num);
- ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2->node_num);
+ xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr);
- char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*);
+ sock->Bind(ns3::InetSocketAddress(port_number));
+ XBT_DEBUG("Create flow starting to %fs + %fs = %fs",
+ startTime-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), startTime);
- XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr);
- ns3_sim->create_flow_NS3(src_node, dst_node, port_number,
- start,
- addr,
- TotalBytes,
- action);
+ ns3::Simulator::Schedule (ns3::Seconds(startTime-ns3::Simulator::Now().GetSeconds()),
+ &StartFlow, sock, addr, port_number);
port_number++;
- if(port_number >= 65001 ) xbt_die("Too many connections! Port number is saturated.");
- return 0;
+ xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
}
// initialize the NS3 interface and environment
-int ns3_initialize(const char* TcpProtocol){
- xbt_assert(!ns3_sim, "ns3 already initialized");
- ns3_sim = new NS3Sim();
-
+void ns3_initialize(const char* TcpProtocol){
// tcpModel are:
// "ns3::TcpNewReno"
// "ns3::TcpReno"
ns3::Config::SetDefault ("ns3::TcpSocket::SegmentSize", ns3::UintegerValue (1024)); // 1024-byte packet for easier reading
ns3::Config::SetDefault ("ns3::TcpSocket::DelAckCount", ns3::UintegerValue (1));
- if(!strcmp(TcpProtocol,"default")){
- return 0;
- }
- if(!strcmp(TcpProtocol,"Reno")){
+ if (!strcmp(TcpProtocol,"default"))
+ return;
+
+ if (!strcmp(TcpProtocol,"Reno")) {
XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpReno"));
- return 0;
+ return;
}
- if(!strcmp(TcpProtocol,"NewReno")){
+ if (!strcmp(TcpProtocol,"NewReno")) {
XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpNewReno"));
- return 0;
+ return;
}
if(!strcmp(TcpProtocol,"Tahoe")){
XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe"));
- return 0;
+ return;
}
- XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
- return 0;
-}
-
-void * ns3_add_host_cluster(const char * id)
-{
- ns3_node_t host = xbt_new0(s_ns3_node_t,1);
- XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
- ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node> (0);
- stack.Install(node);
- Cluster_nodes.Add(node);
- nodes.Add(node);
- host->node_num = number_of_nodes;
- host->type = NS3_NETWORK_ELEMENT_HOST;
- number_of_nodes++;
- return host;
-}
-
-void * ns3_add_router(const char * id)
-{
- ns3_node_t router = xbt_new0(s_ns3_node_t,1);
- XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
- ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node> (0);
- stack.Install(node);
- nodes.Add(node);
- router->node_num = number_of_nodes;
- router->type = NS3_NETWORK_ELEMENT_ROUTER;
- number_of_nodes++;
- return router;
+ xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
}
-void ns3_add_cluster(char * bw,char * lat,const char *id)
+void ns3_add_cluster(const char* id, char* bw, char* lat)
{
-
- XBT_DEBUG("cluster_id: %s",id);
- XBT_DEBUG("bw: %s lat: %s",bw,lat);
- XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
-
ns3::NodeContainer Nodes;
- for(unsigned int i = number_of_clusters_nodes; i < Cluster_nodes.GetN() ; i++){
+ 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 router %d to cluster",nodes.GetN()-Nodes.GetN()-1);
Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1));
- if(Nodes.GetN() > 65000)
- xbt_die("Cluster with NS3 is limited to 65000 nodes");
+ xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
ns3::CsmaHelper csma;
csma.SetChannelAttribute ("DataRate", ns3::StringValue (bw));
csma.SetChannelAttribute ("Delay", ns3::StringValue (lat));
interfaces.Add(ipv4.Assign (devices));
if(number_of_links == 255){
- if(number_of_networks == 255)
- xbt_die("Number of links and networks exceed 255*255");
+ xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
number_of_links = 1;
number_of_networks++;
}else{
XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
}
-void * ns3_add_AS(const char * id)
-{
- XBT_DEBUG("Interface ns3 add AS '%s'",id);
- return NULL;
-}
-
static char* transformIpv4Address (ns3::Ipv4Address from){
std::stringstream sstream;
- sstream << from ;
- std::string s = sstream.str();
- return bprintf("%s",s.c_str());
+ sstream << from ;
+ std::string s = sstream.str();
+ return bprintf("%s",s.c_str());
}
-void ns3_add_link(int src, e_ns3_network_element_type_t type_src,
- int dst, e_ns3_network_element_type_t type_dst,
- char *bw, char *lat)
+void ns3_add_link(int src, int dst, char *bw, char *lat)
{
- if(number_of_links == 1 ) {
- LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
- }
-
- ns3::MyPointToPointHelper pointToPoint;
+ ns3::PointToPointHelper pointToPoint;
ns3::NetDeviceContainer netA;
ns3::Ipv4AddressHelper address;
XBT_DEBUG("\tAdd PTP from %d to %d bw:'%s' lat:'%s'",src,dst,bw,lat);
pointToPoint.SetDeviceAttribute ("DataRate", ns3::StringValue (bw));
pointToPoint.SetChannelAttribute ("Delay", ns3::StringValue (lat));
- //pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
- netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
+ 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");
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){
- if(number_of_networks == 255)
- xbt_die("Number of links and networks exceed 255*255");
+ if (number_of_links == 255){
+ xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
number_of_links = 1;
number_of_networks++;
- }else{
+ } else {
number_of_links++;
}
}
-
-void ns3_end_platform(void)
-{
- XBT_DEBUG("InitializeRoutes");
- ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
- ns3::GlobalRouteManager::InitializeRoutes();
-}
