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
make ns3 not segfault anymore. Now it timeouts
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
85aab98
..
c6a2fda
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-393,7
+393,7
@@
void ns3_initialize(const char* TcpProtocol){
return;
}
return;
}
- xbt_die("The ns3/TcpModel must be
: NewReno or Reno or Tahoe");
+ xbt_die("The ns3/TcpModel must be: NewReno or Reno or Tahoe");
}
void ns3_add_cluster(const char* id, double bw, double lat) {
}
void ns3_add_cluster(const char* id, double bw, double lat) {
@@
-410,7
+410,7
@@
void ns3_add_cluster(const char* id, double bw, double lat) {
xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
ns3::CsmaHelper csma;
xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
ns3::CsmaHelper csma;
- csma.Set
DeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));
// NS3 takes bps, but we provide Bps
+ csma.Set
ChannelAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw * 8)));
// NS3 takes bps, but we provide Bps
csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
ns3::NetDeviceContainer devices = csma.Install(Nodes);
XBT_DEBUG("Create CSMA");
csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
ns3::NetDeviceContainer devices = csma.Install(Nodes);
XBT_DEBUG("Create CSMA");
@@
-450,14
+450,10
@@
void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) {
ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
- pointToPoint.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps
+ pointToPoint.SetChannelAttribute("DataRate",
+ ns3::DataRateValue(ns3::DataRate(bw * 8))); // NS3 takes bps, but we provide Bps
pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat)));
- std::string filename = simgrid::xbt::string_printf("link-%d-%d.tr", srcNum, dstNum);
- ns3::AsciiTraceHelper ascii;
- pointToPoint.EnableAsciiAll(ascii.CreateFileStream(filename));
- pointToPoint.EnablePcapAll ("tcp-bulk-send", false);
-
ns3::NetDeviceContainer netA;
netA.Add(pointToPoint.Install (a, b));
ns3::NetDeviceContainer netA;
netA.Add(pointToPoint.Install (a, b));