X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c05dfe218c074e59069153299e731409a9e83a..e597737e01b6ac76d6e9ccdf67a85c03c53de7c3:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index d9589426aa..3870e535b4 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -44,9 +44,6 @@ 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 * *************/ @@ -60,19 +57,23 @@ static void simgrid_ns3_add_host(simgrid::s4u::Host& host) 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++; + 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(); + + 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 node = ns3::CreateObject (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 @@ -136,9 +137,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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); @@ -196,12 +195,15 @@ static void create_ns3_topology(void) 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(); } /********* @@ -224,18 +226,16 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { 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::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); } @@ -253,7 +253,6 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, do 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); @@ -406,25 +405,37 @@ int NetworkNS3Action::unref() } +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 src_node = nodes.Get(node1); + ns3::Ptr 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); -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); + ns3::Ptr sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId()); - ns3::Ptr src_node = nodes.Get(node1->node_num); - ns3::Ptr 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++; xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); @@ -432,9 +443,6 @@ void ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByt // initialize the NS3 interface and environment void ns3_initialize(const char* TcpProtocol){ - xbt_assert(!ns3_sim, "ns3 already initialized"); - ns3_sim = new NS3Sim(); - // tcpModel are: // "ns3::TcpNewReno" // "ns3::TcpReno" @@ -474,24 +482,10 @@ 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 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) { @@ -510,8 +504,7 @@ 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)); @@ -526,8 +519,7 @@ void ns3_add_cluster(char * bw,char * lat,const char *id) 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{ @@ -543,16 +535,14 @@ static char* transformIpv4Address (ns3::Ipv4Address from){ 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; @@ -563,9 +553,8 @@ void ns3_add_link(int src, e_ns3_network_element_type_t type_src, 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"); @@ -581,19 +570,11 @@ void ns3_add_link(int src, e_ns3_network_element_type_t type_src, 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(); -}