X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3bf83c178e063b2a63809add332e54e810df87cc..65fb3bd8de358e97a3a971de6781661456de302d:/src/surf/network_ns3.cpp?ds=sidebyside diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index fece65ae48..6ede3c79de 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -5,7 +5,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #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" @@ -15,14 +18,32 @@ #include "simgrid/s4u/As.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); +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; -extern xbt_dict_t dict_socket; +/***************** + * Crude globals * + *****************/ + +extern xbt_dict_t flowFromSock; + +static ns3::InternetStackHelper stack; +static ns3::NodeContainer nodes; +static ns3::NodeContainer Cluster_nodes; +static ns3::Ipv4InterfaceContainer interfaces; + +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; + /************* * Callbacks * @@ -32,7 +53,16 @@ static void simgrid_ns3_add_host(simgrid::s4u::Host& host) { const char* id = host.name().c_str(); XBT_DEBUG("NS3_ADD_HOST '%s'", id); - host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id)); + + ns3_node_t ns3host = xbt_new0(s_ns3_node_t,1); + ns3::Ptr node = ns3::CreateObject (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) @@ -254,9 +284,9 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { } NetworkNS3Model::~NetworkNS3Model() { - ns3_finalize(); + delete ns3_sim; xbt_dynar_free_container(&IPV4addr); - xbt_dict_free(&dict_socket); + xbt_dict_free(&flowFromSock); } Link* NetworkNS3Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, @@ -303,31 +333,28 @@ double NetworkNS3Model::next_occuring_event(double 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*),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()) { - /* 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(dict_socket,cursor,key,data){ - action = static_cast(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 = 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_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 *route = new std::vector(); @@ -336,24 +363,25 @@ void NetworkNS3Model::updateActionsState(double now, double delta) 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); - void *data = xbt_dict_get (dict_socket, key); - action = static_cast(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; } @@ -426,3 +454,208 @@ int NetworkNS3Action::unref() } } + + + + + +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 src_node = nodes.Get(node1->node_num); + ns3::Ptr 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 node = ns3::CreateObject (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 node = ns3::CreateObject (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 a = nodes.Get(src); + ns3::Ptr 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(); +}