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
Merge branch 'coverity_scan' of github.com:mquinson/simgrid
[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
f42f9f9
..
4507c9d
100644
(file)
--- a/
src/surf/ns3/ns3_interface.cc
+++ b/
src/surf/ns3/ns3_interface.cc
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
2
. The SimGrid Team.
+/* Copyright (c) 2007-201
4
. 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
@@
-9,15
+9,14
@@
#include "xbt/lib.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/lib.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
+#include "xbt/Extendable.hpp"
using namespace ns3;
using namespace ns3;
-extern xbt_lib_t host_lib;
-extern int NS3_HOST_LEVEL; //host node for ns3
extern xbt_dynar_t IPV4addr;
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;
@@
-59,8
+58,8
@@
double ns3_time(){
int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action)
{
int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action)
{
- ns3_nodes_t node1 =
(ns3_nodes_t) xbt_lib_get_or_null(host_lib,a,NS3_HOST_LEVEL
);
- ns3_nodes_t node2 =
(ns3_nodes_t) xbt_lib_get_or_null(host_lib,b,NS3_HOST_LEVEL
);
+ ns3_nodes_t node1 =
ns3_find_host(a
);
+ ns3_nodes_t node2 =
ns3_find_host(b
);
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);
@@
-122,6
+121,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");
+ return 0;
}
void * ns3_add_host(const char * id)
}
void * ns3_add_host(const char * id)
@@
-167,7
+167,7
@@
void * ns3_add_router(const char * id)
return router;
}
return router;
}
-void
*
ns3_add_cluster(char * bw,char * lat,const 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
+175,7
@@
void * ns3_add_cluster(char * bw,char * lat,const 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));
@@
-225,16
+225,15
@@
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,
int dst, e_ns3_network_element_type_t type_dst,
- char *
bw,char *
lat)
+ 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);
}
-
MyPointToPointHelper pointToPoint;
NetDeviceContainer netA;
MyPointToPointHelper pointToPoint;
NetDeviceContainer netA;
@@
-274,7
+273,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();