A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cleanup!
[simgrid.git]
/
src
/
surf
/
ns3
/
ns3_interface.cc
diff --git
a/src/surf/ns3/ns3_interface.cc
b/src/surf/ns3/ns3_interface.cc
index
10d8d6b
..
b6e5b6e
100644
(file)
--- a/
src/surf/ns3/ns3_interface.cc
+++ b/
src/surf/ns3/ns3_interface.cc
@@
-10,6
+10,7
@@
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
+
using namespace ns3;
extern xbt_lib_t host_lib;
using namespace ns3;
extern xbt_lib_t host_lib;
@@
-24,8
+25,6
@@
NodeContainer nodes;
NodeContainer Cluster_nodes;
Ipv4InterfaceContainer interfaces;
NodeContainer Cluster_nodes;
Ipv4InterfaceContainer interfaces;
-
-
int number_of_nodes = 0;
int number_of_clusters_nodes = 0;
int number_of_links = 1;
int number_of_nodes = 0;
int number_of_clusters_nodes = 0;
int number_of_links = 1;
@@
-66,7
+65,7
@@
int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByte
Ptr<Node> src_node = nodes.Get(node1->node_num);
Ptr<Node> dst_node = nodes.Get(node2->node_num);
Ptr<Node> src_node = nodes.Get(node1->node_num);
Ptr<Node> dst_node = nodes.Get(node2->node_num);
- char* addr = (char*)xbt_dynar_get_
ptr(IPV4addr,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,
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,
@@
-125,7
+124,7
@@
int ns3_initialize(const char* TcpProtocol){
XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
}
XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
}
-void * ns3_add_host(char * id)
+void * ns3_add_host(c
onst c
har * id)
{
ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
{
ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@
-139,7
+138,7
@@
void * ns3_add_host(char * id)
return host;
}
return host;
}
-void * ns3_add_host_cluster(char * id)
+void * ns3_add_host_cluster(c
onst c
har * id)
{
ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
{
ns3_nodes_t host = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@
-154,7
+153,7
@@
void * ns3_add_host_cluster(char * id)
return host;
}
return host;
}
-void * ns3_add_router(char * id)
+void * ns3_add_router(c
onst c
har * id)
{
ns3_nodes_t router = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
{
ns3_nodes_t router = xbt_new0(s_ns3_nodes_t,1);
XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
@@
-168,7
+167,7
@@
void * ns3_add_router(char * id)
return router;
}
return router;
}
-void * ns3_add_cluster(char * bw,char * lat,char *id)
+void * ns3_add_cluster(char * bw,char * lat,c
onst c
har *id)
{
XBT_DEBUG("cluster_id: %s",id);
{
XBT_DEBUG("cluster_id: %s",id);
@@
-199,6
+198,7
@@
void * ns3_add_cluster(char * bw,char * lat,char *id)
XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
Ipv4AddressHelper ipv4;
ipv4.SetBase (adr, "255.255.0.0");
XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
Ipv4AddressHelper ipv4;
ipv4.SetBase (adr, "255.255.0.0");
+ free(adr);
interfaces.Add(ipv4.Assign (devices));
if(number_of_links == 255){
interfaces.Add(ipv4.Assign (devices));
if(number_of_links == 255){
@@
-212,7
+212,7
@@
void * ns3_add_cluster(char * bw,char * lat,char *id)
XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
}
XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
}
-void * ns3_add_AS(char * id)
+void * ns3_add_AS(c
onst c
har * id)
{
XBT_DEBUG("Interface ns3 add AS '%s'",id);
return NULL;
{
XBT_DEBUG("Interface ns3 add AS '%s'",id);
return NULL;
@@
-222,19
+222,21
@@
static char* transformIpv4Address (Ipv4Address from){
std::stringstream sstream;
sstream << from ;
std::string s = sstream.str();
std::stringstream sstream;
sstream << from ;
std::string s = sstream.str();
- size_t size = s.size() + 1;
- char* IPaddr = bprintf("%s",s.c_str());
- return IPaddr;
+ return bprintf("%s",s.c_str());
}
}
-void * ns3_add_link(int src,int dst,char * bw,char * lat)
+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", LOG_LEVEL_INFO);
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
{
if(number_of_links == 1 ) {
LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
- PointToPointHelper pointToPoint;
+
+ MyPointToPointHelper pointToPoint;
+
NetDeviceContainer netA;
Ipv4AddressHelper address;
NetDeviceContainer netA;
Ipv4AddressHelper address;
@@
-246,7
+248,7
@@
void * ns3_add_link(int src,int dst,char * bw,char * lat)
pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
- netA.Add(pointToPoint.Install (a,
b
));
+ 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");
char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
address.SetBase (adr, "255.255.0.0");
@@
-255,12
+257,12
@@
void * ns3_add_link(int src,int dst,char * bw,char * lat)
interfaces.Add(address.Assign (netA));
char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
interfaces.Add(address.Assign (netA));
char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
-
XBT_DEBUG("Have write '%s' for Node '%d'",tmp,src
);
-
xbt_dynar_set(IPV4addr,src,tmp
);
+
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));
tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1));
-
XBT_DEBUG("Have write '%s' for Node '%d'",tmp,dst
);
-
xbt_dynar_set(IPV4addr,dst,tmp
);
+
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)
if(number_of_links == 255){
if(number_of_networks == 255)