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
get ns3 to compile (but still fails)
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
ec74310
..
f7c56ae
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-8,6
+8,7
@@
#include "xbt/config.hpp"
#include "xbt/string.hpp"
#include "xbt/config.hpp"
#include "xbt/string.hpp"
+#include "xbt/utility.hpp"
#include "ns3/core-module.h"
#include "ns3/node.h"
#include "ns3/core-module.h"
#include "ns3/node.h"
@@
-81,10
+82,10
@@
static void clusterCreation_cb(ClusterCreationArgs* cluster)
static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoint* src,
simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src,
simgrid::kernel::routing::NetPoint* gw_dst,
static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoint* src,
simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src,
simgrid::kernel::routing::NetPoint* gw_dst,
- std::vector<simgrid::surf::LinkImpl*>
*
link_list)
+ std::vector<simgrid::surf::LinkImpl*>
&
link_list)
{
{
- if (link_list
->
size() == 1) {
- simgrid::surf::LinkNS3* link = static_cast<simgrid::surf::LinkNS3*>(link_list
->at(0)
);
+ if (link_list
.
size() == 1) {
+ simgrid::surf::LinkNS3* link = static_cast<simgrid::surf::LinkNS3*>(link_list
[0]
);
XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->getCname(), dst->getCname(), link->getCname(),
(symmetrical ? "(symmetrical)" : "(not symmetrical)"));
XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->getCname(), dst->getCname(), link->getCname(),
(symmetrical ? "(symmetrical)" : "(not symmetrical)"));
@@
-109,7
+110,7
@@
static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin
"of length 1.\n"
"WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently "
"ignored.",
"of length 1.\n"
"WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently "
"ignored.",
- src->getCname(), dst->getCname(), link_list
->
size());
+ src->getCname(), dst->getCname(), link_list
.
size());
warned_about_long_routes = true;
}
}
warned_about_long_routes = true;
}
}
@@
-135,8
+136,8
@@
void surf_network_model_init_NS3()
all_existing_models->push_back(surf_network_model);
}
all_existing_models->push_back(surf_network_model);
}
-static simgrid::config::Flag<std::string>
ns3_tcp_model("ns3/TcpModel",
-
"The ns3 tcp model can be : NewReno or Reno or Tahoe", "NewReno
");
+static simgrid::config::Flag<std::string>
+
ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default
");
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-153,10
+154,6
@@
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
simgrid::surf::on_cluster.connect(&clusterCreation_cb);
simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
simgrid::surf::on_cluster.connect(&clusterCreation_cb);
simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
-
- LogComponentEnable("PacketSink", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
}
NetworkNS3Model::~NetworkNS3Model() {
}
NetworkNS3Model::~NetworkNS3Model() {
@@
-223,7
+220,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
- action->src_->routeTo(action->dst_,
&
route, nullptr);
+ action->src_->routeTo(action->dst_, route, nullptr);
for (auto const& link : route)
TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
delta);
for (auto const& link : route)
TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
delta);
@@
-233,7
+230,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
if(sgFlow->finished_){
socket_to_destroy.push_back(ns3Socket);
if(sgFlow->finished_){
socket_to_destroy.push_back(ns3Socket);
- XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
+ XBT_DEBUG("Destroy socket %p of action %p", ns3Socket
.c_str()
, action);
action->finish(Action::State::done);
}
}
action->finish(Action::State::done);
}
}
@@
-243,7
+240,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
socket_to_destroy.pop_back();
SgFlow* flow = flowFromSock.at(ns3Socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
socket_to_destroy.pop_back();
SgFlow* flow = flowFromSock.at(ns3Socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
- XBT_DEBUG
("Removing socket %p of action %p", ns3Socket
, flow->action_);
+ XBT_DEBUG
("Removing socket %p of action %p", ns3Socket.c_str()
, flow->action_);
}
delete flow;
flowFromSock.erase(ns3Socket);
}
delete flow;
flowFromSock.erase(ns3Socket);
@@
-316,7
+313,7
@@
int NetworkNS3Action::unref()
refcount_--;
if (not refcount_) {
if (action_hook.is_linked())
refcount_--;
if (not refcount_) {
if (action_hook.is_linked())
- s
tateSet_->erase(stateSet_->iterator_to(*this)
);
+ s
imgrid::xbt::intrusive_erase(*stateSet_, *this
);
XBT_DEBUG ("Removing action %p", this);
delete this;
return 1;
XBT_DEBUG ("Removing action %p", this);
delete this;
return 1;
@@
-396,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) {
@@
-413,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");
@@
-453,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));