/* 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"
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 *
*************/
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++;
+ ns3host->node_num = number_of_nodes ++;
host.extension_set(NS3_EXTENSION_ID, ns3host);
}
-static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
+static void simgrid_ns3_add_netcard(simgrid::surf::NetCard* netcard)
{
- 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)
- );
-}
+ const char* id = netcard->name();
-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) );
+ ns3_node_t ns3netcard = xbt_new0(s_ns3_node_t,1);
+ XBT_DEBUG("Interface ns3 add netcard[%d] '%s'",number_of_nodes,id);
+ ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node> (0);
+ stack.Install(node);
+ nodes.Add(node);
+ ns3netcard->node_num = number_of_nodes++;
+
+ xbt_lib_set(as_router_lib, id, NS3_ASR_LEVEL, ns3netcard );
}
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
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,
- bw,lat);
+ ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat);
free(router_id);
free(host_id);
//get the onelinks from the parsed platform
xbt_dynar_t onelink_routes = routing_platf->getOneLinkRoutes();
+ 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);
- //save them in trace file
simgrid::surf::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
char *dst = onelink->dst_->name();
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);
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);
+ ns3_add_link(host_src->node_num, host_dst->node_num, link_bdw, link_lat);
xbt_free(link_bdw);
xbt_free(link_lat);
}
}
+
+ ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+ ns3::GlobalRouteManager::InitializeRoutes();
}
/*********
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);
simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
- simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
+ simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard);
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(xbt_free_f);
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f);
}
NetworkNS3Model::~NetworkNS3Model() {
- delete ns3_sim;
xbt_dynar_free_container(&IPV4addr);
xbt_dict_free(&flowFromSock);
}
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 action;
}
double NetworkNS3Model::next_occuring_event(double now)
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;
}
+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",maxSeconds);
+ ns3::Simulator::Run ();
+}
+
+void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action)
+{
+ int node1 = ns3_find_host(a)->node_num;
+ int node2 = ns3_find_host(b)->node_num;
+ ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
+ ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
+ char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*);
-void ns3_simulator(double min){
- ns3_sim->simulator_start(min);
-}
+ 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), NULL);
- 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;
+ xbt_die("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
}
void * ns3_add_host_cluster(const char * id)
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("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");
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");
+ 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();
-}
