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
when parallel ctests are performed, using the default tracing filename may cause...
[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
eed590c
..
f42f9f9
100644
(file)
--- a/
src/surf/ns3/ns3_interface.cc
+++ b/
src/surf/ns3/ns3_interface.cc
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2012
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-102,9
+102,6
@@
int ns3_initialize(const char* TcpProtocol){
Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1024)); // 1024-byte packet for easier reading
Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1024)); // 1024-byte packet for easier reading
Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
-#ifdef _HAVE_NS3_RED
- XBT_INFO("Using RED version of ns3");
-#endif
if(!strcmp(TcpProtocol,"default")){
return 0;
}
if(!strcmp(TcpProtocol,"default")){
return 0;
}
@@
-127,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);
@@
-141,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);
@@
-156,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);
@@
-170,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);
@@
-201,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){
@@
-214,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;
@@
-224,9
+222,7
@@
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, e_ns3_network_element_type_t type_src,
}
void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
@@
-238,11
+234,9
@@
void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
-#ifdef _HAVE_NS3_RED
+
MyPointToPointHelper pointToPoint;
MyPointToPointHelper pointToPoint;
-#else
- PointToPointHelper pointToPoint;
-#endif
+
NetDeviceContainer netA;
Ipv4AddressHelper address;
NetDeviceContainer netA;
Ipv4AddressHelper address;
@@
-254,11
+248,7
@@
void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
//pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
-#ifdef _HAVE_NS3_RED
netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
-#else
- netA.Add(pointToPoint.Install (a, b));
-#endif
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");