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
Remove one of the many pimple: HostModel::p_cpuModel
[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
21eb92a
..
0b9b1a3
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
-2014
. 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
@@
-17,7
+17,7
@@
extern xbt_lib_t host_lib;
extern int NS3_HOST_LEVEL; //host node for ns3
extern xbt_dynar_t IPV4addr;
extern int NS3_HOST_LEVEL; //host node for ns3
extern xbt_dynar_t IPV4addr;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
interface_
ns3, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf,
"Logging specific to the SURF network NS3 module");
InternetStackHelper stack;
"Logging specific to the SURF network NS3 module");
InternetStackHelper stack;
@@
-122,9
+122,10
@@
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");
+ return 0;
}
}
-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);
@@
-138,7
+139,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);
@@
-153,7
+154,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);
@@
-167,7
+168,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,const
char *id)
{
XBT_DEBUG("cluster_id: %s",id);
{
XBT_DEBUG("cluster_id: %s",id);
@@
-175,7
+176,7
@@
void * ns3_add_cluster(char * bw,char * lat,char *id)
XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
NodeContainer Nodes;
XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
NodeContainer Nodes;
- int i;
+
unsigned
int i;
for(i = number_of_clusters_nodes; i < Cluster_nodes.GetN() ; i++){
Nodes.Add(Cluster_nodes.Get(i));
for(i = number_of_clusters_nodes; i < Cluster_nodes.GetN() ; i++){
Nodes.Add(Cluster_nodes.Get(i));
@@
-212,7
+213,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;
@@
-225,7
+226,7
@@
static char* transformIpv4Address (Ipv4Address from){
return bprintf("%s",s.c_str());
}
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,
int dst, e_ns3_network_element_type_t type_dst,
char * bw,char * lat)
{
int dst, e_ns3_network_element_type_t type_dst,
char * bw,char * lat)
{
@@
-234,7
+235,6
@@
void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
}
-
MyPointToPointHelper pointToPoint;
NetDeviceContainer netA;
MyPointToPointHelper pointToPoint;
NetDeviceContainer netA;
@@
-274,7
+274,7
@@
void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
}
}
}
}
-void
*
ns3_end_platform(void)
+void ns3_end_platform(void)
{
XBT_DEBUG("InitializeRoutes");
GlobalRouteManager::BuildGlobalRoutingDatabase();
{
XBT_DEBUG("InitializeRoutes");
GlobalRouteManager::BuildGlobalRoutingDatabase();