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
change call of xbt_dynar_set for xbt_dynar_set_as and xbt_dynar_get_ptr
[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
..
a748ce3
100644
(file)
--- a/
src/surf/ns3/ns3_interface.cc
+++ b/
src/surf/ns3/ns3_interface.cc
@@
-66,7
+66,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,
@@
-255,12
+255,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)