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<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
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,NS3_NETWORK_ELEMENT_HOST,
- host_dst->node_num,NS3_NETWORK_ELEMENT_HOST,
- bw,lat);
+ ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat);
free(router_id);
free(host_id);
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,NS3_NETWORK_ELEMENT_HOST,host_dst->node_num,NS3_NETWORK_ELEMENT_HOST,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);
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
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);
+ 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->node_num);
- ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2->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->node_num,char*);
+ char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*);
- XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr);
+ XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr);
ns3_sim->create_flow_NS3(src_node, dst_node, port_number, start, addr, TotalBytes, action);
port_number++;
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;
- 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{
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;
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");