-/* Copyright (c) 2007-2013. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+/* Copyright (c) 2007-2015. 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 "network_ns3.hpp"
-#include "surf_private.h"
+
+#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 "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
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
- "Logging specific to the SURF network NS3 module");
+#include "simgrid/s4u/As.hpp"
-extern xbt_lib_t host_lib;
-extern xbt_lib_t link_lib;
-extern xbt_lib_t as_router_lib;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
-extern xbt_dict_t dict_socket;
+int NS3_EXTENSION_ID;
-xbt_dynar_t IPV4addr;
+xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
static double time_to_next_flow_completion = -1;
-/*************
- * Callbacks *
- *************/
+/*****************
+ * Crude globals *
+ *****************/
-static void replace_bdw_ns3(char ** bdw)
-{
- char *temp = xbt_strdup(*bdw);
- xbt_free(*bdw);
- *bdw = bprintf("%fBps",atof(temp));
- xbt_free(temp);
+extern xbt_dict_t flowFromSock;
-}
+static ns3::InternetStackHelper stack;
+static ns3::NodeContainer nodes;
+static ns3::NodeContainer Cluster_nodes;
+static ns3::Ipv4InterfaceContainer interfaces;
-static void replace_lat_ns3(char ** lat)
-{
- char *temp = xbt_strdup(*lat);
- xbt_free(*lat);
- *lat = bprintf("%fs",atof(temp));
- xbt_free(temp);
-}
+static int number_of_nodes = 0;
+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
+
+static NS3Sim* ns3_sim = 0;
-static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
+
+/*************
+ * Callbacks *
+ *************/
+
+static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
{
- XBT_DEBUG("NS3_ADD_HOST '%s'",host->id);
- xbt_lib_set(host_lib,
- host->id,
- NS3_HOST_LEVEL,
- ns3_add_host(host->id)
- );
+ 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);
+ 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);
- if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free);
-
- NetworkLinkPtr net_link = surf_network_model->createResource(link->id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->state,
- link->state_trace,
- link->policy,
- link->properties);
- xbt_lib_set(link_lib, link->id, SURF_LINK_LEVEL, net_link);
+ 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 parse_ns3_add_router(sg_platf_router_cbarg_t router)
+static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
{
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id);
+ const char* router_id = router->name();
+ XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
xbt_lib_set(as_router_lib,
- router->id,
+ router_id,
NS3_ASR_LEVEL,
- ns3_add_router(router->id)
+ ns3_add_router(router_id)
);
}
-static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
+static void parse_ns3_add_AS(simgrid::s4u::As* as)
{
- XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
- xbt_lib_set(as_router_lib,
- AS->id,
- NS3_ASR_LEVEL,
- ns3_add_AS(AS->id)
- );
+ 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) );
}
+#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)
{
- const char *cluster_prefix = cluster->prefix;
- const char *cluster_suffix = cluster->suffix;
- const char *cluster_radical = cluster->radical;
- const char *cluster_bb_bw = bprintf("%f",cluster->bb_bw);
- const char *cluster_bb_lat = bprintf("%f",cluster->bb_lat);
- const char *cluster_bw = bprintf("%f",cluster->bw);
- const char *cluster_lat = bprintf("%f",cluster->lat);
const char *groups = NULL;
int start, end, i;
char *router_id,*host_id;
- radical_elements = xbt_str_split(cluster_radical, ",");
+ radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
radical_ends = xbt_str_split(groups, "-");
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);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ 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;
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);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ 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);
}
//Create links
unsigned int cpt;
int elmts;
- char * lat = xbt_strdup(cluster_lat);
- char * bw = xbt_strdup(cluster_bw);
- replace_lat_ns3(&lat);
- replace_bdw_ns3(&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);
+ 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);
- ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,host_id, NS3_HOST_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,router_id,NS3_HOST_LEVEL));
+ ns3_node_t host_src = ns3_find_host(host_id);
+ ns3_node_t host_dst = ns3_find_host(router_id);
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
free(router_id);
free(host_id);
}
+ xbt_free(lat);
+ xbt_free(bw);
xbt_dynar_free(&tab_elements_num);
//Create link backbone
- lat = xbt_strdup(cluster_bb_lat);
- bw = xbt_strdup(cluster_bb_bw);
- replace_lat_ns3(&lat);
- replace_bdw_ns3(&bw);
+ lat = bprintf("%fs", cluster->bb_lat);
+ bw = bprintf("%fBps", cluster->bb_bw);
ns3_add_cluster(bw,lat,cluster->id);
xbt_free(lat);
xbt_free(bw);
xbt_die("There is no routes!");
XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
//save them in trace file
- OnelinkPtr onelink;
+ simgrid::surf::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = onelink->p_src->getName();
- char *dst = onelink->p_dst->getName();
- NetworkNS3LinkPtr link = static_cast<NetworkNS3LinkPtr>(onelink->p_link);
+ 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 = xbt_strdup(link->p_bdw);
- char * link_lat = xbt_strdup(link->p_lat);
- replace_lat_ns3(&link_lat);
- replace_bdw_ns3(&link_bdw);
+ 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_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,src,NS3_HOST_LEVEL));
- if(!host_src) host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_LEVEL));
- if(!host_dst) host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
+ 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){}
- else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
+ 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);
static void define_callbacks_ns3(void)
{
- sg_platf_host_add_cb (&parse_ns3_add_host);
- sg_platf_router_add_cb (&parse_ns3_add_router);
- sg_platf_link_add_cb (&parse_ns3_add_link);
- sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
- sg_platf_AS_begin_add_cb (&parse_ns3_add_AS);
- sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
- sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
+ 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
}
/*********
*********/
static void free_ns3_link(void * elmts)
{
- delete static_cast<NetworkNS3LinkPtr>(elmts);
+ delete static_cast<simgrid::surf::LinkNS3*>(elmts);
}
static void free_ns3_host(void * elmts)
{
- ns3_nodes_t host = static_cast<ns3_nodes_t>(elmts);
+ ns3_node_t host = static_cast<ns3_node_t>(elmts);
free(host);
}
if (surf_network_model)
return;
- surf_network_model = new NetworkNS3Model();
+ surf_network_model = new simgrid::surf::NetworkNS3Model();
- xbt_dynar_push(model_list, &surf_network_model);
+ xbt_dynar_push(all_existing_models, &surf_network_model);
}
-NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") {
+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();
- NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host);
- NS3_LINK_LEVEL = xbt_lib_add_level(link_lib,(void_f_pvoid_t)free_ns3_link);
+ NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host);
+ NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
}
NetworkNS3Model::~NetworkNS3Model() {
- ns3_finalize();
+ delete ns3_sim;
xbt_dynar_free_container(&IPV4addr);
- xbt_dict_free(&dict_socket);
-}
-
-NetworkLinkPtr NetworkNS3Model::createResource(const char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties){
- if (bw_trace)
- XBT_INFO("The NS3 network model doesn't support bandwidth state traces");
- if (lat_trace)
- XBT_INFO("The NS3 network model doesn't support latency state traces");
- if (state_trace)
- XBT_INFO("The NS3 network model doesn't support link state traces");
- return new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
-}
-
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst)
-{
- xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL);
- //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
- return route;
+ xbt_dict_free(&flowFromSock);
}
-ActionPtr NetworkNS3Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
- double size, double rate)
+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);
+}
+
+Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
{
- XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());
- NetworkNS3ActionPtr action = new NetworkNS3Action(this, size, 0);
+ XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
+ NetworkNS3Action *action = new NetworkNS3Action(this, size, 0);
- ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action);
+ ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, action);
-#ifdef HAVE_TRACING
action->m_lastSent = 0;
action->p_srcElm = src;
action->p_dstElm = dst;
-#endif
+ networkCommunicateCallbacks(action, src, dst, size, rate);
return (surf_action_t) action;
}
-double NetworkNS3Model::shareResources(double now)
+double NetworkNS3Model::next_occuring_event(double now)
{
- XBT_DEBUG("ns3_share_resources");
+ XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
if (!getRunningActionSet()->size() || now == 0.0)
else
do {
ns3_simulator(now);
- time_to_next_flow_completion = ns3_time() - surf_get_clock();//FIXME: use now instead ?
- } while(double_equals(time_to_next_flow_completion, 0));
+ time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();//FIXME: use now instead ?
+ } while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
- XBT_DEBUG("ns3 time : %f", ns3_time());
+ XBT_DEBUG("ns3 time : %f", ns3::Simulator::Now().GetSeconds());
XBT_DEBUG("surf time : %f", surf_get_clock());
XBT_DEBUG("Next completion %f :", time_to_next_flow_completion);
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*),NULL);
- 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()) {
+
+ while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision))
+ ns3_simulator(now-ns3::Simulator::Now().GetSeconds());
- /* If there are no running flows, just return */
- if (!getRunningActionSet()->size()) {
- while(double_positive(now-ns3_time())) {
- ns3_simulator(now-ns3_time());
- }
return;
}
- NetworkNS3ActionPtr action;
- xbt_dict_foreach(dict_socket,cursor,key,data){
- action = static_cast<NetworkNS3ActionPtr>(ns3_get_socket_action(data));
- XBT_DEBUG("Processing socket %p (action %p)",data,action);
- action->setRemains(action->getCost() - ns3_get_socket_sent(data));
-
- #ifdef HAVE_TRACING
- if (TRACE_is_enabled() &&
- action->getState() == SURF_ACTION_RUNNING){
- double data_sent = ns3_get_socket_sent(data);
- double data_delta_sent = data_sent - action->m_lastSent;
-
- xbt_dynar_t route = NULL;
-
- routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
- unsigned int i;
- for (i = 0; i < xbt_dynar_length (route); i++){
- NetworkNS3LinkPtr link = ((NetworkNS3LinkPtr)xbt_dynar_get_ptr (route, i));
- TRACE_surf_link_set_utilization (link->getName(),
- action->getCategory(),
- (data_delta_sent)/delta,
- now-delta,
- delta);
- }
- action->m_lastSent = data_sent;
- }
- #endif
+ xbt_dict_cursor_t cursor = NULL;
+ 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_delta_sent = sgFlow->sentBytes_ - action->m_lastSent;
- 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);
+ std::vector<Link*> *route = new std::vector<Link*>();
+
+ 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->m_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(SURF_ACTION_DONE);
+ 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 (dict_socket, key);
- action = static_cast<NetworkNS3ActionPtr>(ns3_get_socket_action(data));
- XBT_DEBUG ("Removing socket %p of action %p", key, action);
- xbt_dict_remove(dict_socket, 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 *
************/
-NetworkNS3Link::NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
- double bw_initial, double lat_initial)
- : NetworkLink(model, name, props)
- , p_bdw(bprintf("%f", bw_initial))
- , p_lat(bprintf("%f", lat_initial))
+LinkNS3::LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency)
+ : Link(model, name, props)
, m_created(1)
{
+ m_bandwidth.peak = bandwidth;
+ m_latency.peak = latency;
+
+ Link::onCreation(this);
}
-NetworkNS3Link::~NetworkNS3Link()
+LinkNS3::~LinkNS3()
{
}
-void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, double date)
+void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value)
{
-
+ THROW_UNIMPLEMENTED;
}
-double NetworkNS3Link::getLatency()
-{
-
+void LinkNS3::setBandwidthTrace(tmgr_trace_t trace) {
+ xbt_die("The NS3 network model doesn't support latency state traces");
}
-double NetworkNS3Link::getBandwidth()
-{
-
+void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
+ xbt_die("The NS3 network model doesn't support latency state traces");
}
/**********
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(ModelPtr model, double cost, bool failed)
+NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
: NetworkAction(model, cost, failed)
{}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- int NetworkNS3Action::getLatencyLimited() {
- return m_latencyLimited;
- }
-#endif
-
- void NetworkNS3Action::suspend()
+void NetworkNS3Action::suspend()
{
THROW_UNIMPLEMENTED;
}
{
m_refcount--;
if (!m_refcount) {
- if (actionHook::is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ if (action_hook.is_linked())
+ p_stateSet->erase(p_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);
+}
+
+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::Node> src_node = nodes.Get(node1->node_num);
+ ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2->node_num);
+
+ char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*);
+
+ 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);
+
+ port_number++;
+ if(port_number >= 65001 ) xbt_die("Too many connections! Port number is saturated.");
+ return 0;
+}
+
+// initialize the NS3 interface and environment
+int ns3_initialize(const char* TcpProtocol){
+ xbt_assert(!ns3_sim, "ns3 already initialized");
+ ns3_sim = new NS3Sim();
+
+// tcpModel are:
+// "ns3::TcpNewReno"
+// "ns3::TcpReno"
+// "ns3::TcpTahoe"
+
+ 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")){
+ XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+ ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpReno"));
+ return 0;
+ }
+ if(!strcmp(TcpProtocol,"NewReno")){
+ XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+ ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpNewReno"));
+ return 0;
+ }
+ if(!strcmp(TcpProtocol,"Tahoe")){
+ XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+ ns3::Config::SetDefault ("ns3::TcpL4Protocol::SocketType", ns3::StringValue("ns3::TcpTahoe"));
+ return 0;
+ }
+
+ 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;
+}
+
+void ns3_add_cluster(char * bw,char * lat,const char *id)
+{
+
+ 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++){
+ Nodes.Add(Cluster_nodes.Get(i));
+ XBT_DEBUG("Add node %d to cluster",i);
+ }
+ number_of_clusters_nodes = Cluster_nodes.GetN();
+
+ 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");
+ ns3::CsmaHelper csma;
+ csma.SetChannelAttribute ("DataRate", ns3::StringValue (bw));
+ csma.SetChannelAttribute ("Delay", ns3::StringValue (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);
+ ns3::Ipv4AddressHelper ipv4;
+ ipv4.SetBase (adr, "255.255.0.0");
+ free(adr);
+ 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");
+ number_of_links = 1;
+ number_of_networks++;
+ }else{
+ number_of_links++;
+ }
+ 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());
+}
+
+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)
+{
+ if(number_of_links == 1 ) {
+ LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
+ LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
+ }
+
+ ns3::MyPointToPointHelper pointToPoint;
+
+ ns3::NetDeviceContainer netA;
+ ns3::Ipv4AddressHelper address;
+
+ ns3::Ptr<ns3::Node> a = nodes.Get(src);
+ ns3::Ptr<ns3::Node> b = nodes.Get(dst);
+
+ 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));
+
+ 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);
+ 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);
+
+ 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(number_of_links == 255){
+ if(number_of_networks == 255)
+ xbt_die("Number of links and networks exceed 255*255");
+ number_of_links = 1;
+ number_of_networks++;
+ }else{
+ number_of_links++;
+ }
+}
+
+void ns3_end_platform(void)
+{
+ XBT_DEBUG("InitializeRoutes");
+ ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+ ns3::GlobalRouteManager::InitializeRoutes();
+}