/* 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 "ns3/core-module.h"
#include "ns3/node.h"
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)
+ xbt_lib_set(as_router_lib, router_id, NS3_ASR_LEVEL, ns3_add_router(router_id)
);
}
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_t radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
- radical_ends = xbt_str_split(groups, "-");
+ xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
switch (xbt_dynar_length(radical_ends)) {
case 1:
char * lat = bprintf("%fs", cluster->lat);
char * bw = bprintf("%fBps", cluster->bw);
- xbt_dynar_foreach(tab_elements_num,cpt,elmts)
- {
+ 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);
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);
+ xbt_assert(host_src && host_dst, "\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,
//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
+
+ std::unordered_set<simgrid::surf::LinkNS3*> already_seen = std::unordered_set<simgrid::surf::LinkNS3*>();
+
+ XBT_DEBUG("There is %ld one-link routes",onelink_routes->used);
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_);
+ simgrid::surf::LinkNS3 *link = static_cast<simgrid::surf::LinkNS3 *>(onelink->link_);
- if (strcmp(src,dst) && link->m_created){
+ if (strcmp(src,dst) && (already_seen.find(link) == already_seen.end())) {
+ already_seen.insert(link);
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);
}
}
-static void parse_ns3_end_platform(void)
-{
- ns3_end_platform();
-}
-
-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
-}
-
/*********
* 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);
}
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
- if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
- xbt_die("Impossible to initialize NS3 interface");
- }
+ ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"));
+
routing_model_create(NULL);
- define_callbacks_ns3();
+ simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
+ simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
+ simgrid::surf::on_link.connect(netlink_parse_init);
+ 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(&ns3_end_platform); //InitializeRoutes
- NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host);
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
+ NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f);
+ NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f);
}
NetworkNS3Model::~NetworkNS3Model() {
action->p_dstElm = dst;
networkCommunicateCallbacks(action, src, dst, size, rate);
- return (surf_action_t) action;
+ return action;
}
double NetworkNS3Model::next_occuring_event(double now)
}
xbt_dict_cursor_t cursor = NULL;
- char *key;
- void *data;
- xbt_dict_foreach(flowFromSock,cursor,key,data){
- NetworkNS3Action * 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));
+ 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->m_lastSent;
std::vector<Link*> *route = new std::vector<Link*>();
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
delete route;
- action->m_lastSent = data_sent;
+ action->m_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);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
- SgFlow *data = (SgFlow*)xbt_dict_get (flowFromSock, key);
- NetworkNS3Action * action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
- XBT_DEBUG ("Removing socket %p of action %p", key, action);
+ SgFlow *flow = (SgFlow*)xbt_dict_get (flowFromSock, ns3Socket);
+ XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
}
- xbt_dict_remove(flowFromSock, key);
+ xbt_dict_remove(flowFromSock, ns3Socket);
}
return;
}
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;
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;
ns3_sim->simulator_start(min);
}
-simgrid::surf::NetworkNS3Action* ns3_get_socket_action(void *socket){
- return ((SgFlow *)socket)->action_;
-}
-
-double ns3_get_socket_remains(void *socket){
- return ((SgFlow *)socket)->remaining_;
-}
-
-double ns3_get_socket_sent(void *socket){
- return ((SgFlow *)socket)->sentBytes_;
-}
-
-bool ns3_get_socket_is_finished(void *socket){
- return ((SgFlow *)socket)->finished_;
-}
-
-int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action)
+void 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);
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);
+ 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;
+ xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
}
// initialize the NS3 interface and environment
-int ns3_initialize(const char* TcpProtocol){
+void ns3_initialize(const char* TcpProtocol){
xbt_assert(!ns3_sim, "ns3 already initialized");
ns3_sim = new NS3Sim();
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;
+ xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
}
void * ns3_add_host_cluster(const char * id)
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,
