#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
NetPointNs3::NetPointNs3()
{
- ns3::Ptr<ns3::Node> node = ns3::CreateObject<ns3::Node>(0);
- stack.Install(node);
- nodes.Add(node);
+ ns3Node_ = ns3::CreateObject<ns3::Node>(0);
+ stack.Install(ns3Node_);
+ nodes.Add(ns3Node_);
node_num = number_of_nodes++;
}
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
+ xbt_assert(not sg_link_energy_is_inited(),
+ "LinkEnergy plugin and NS3 network models are not compatible. Are you looking for Ecofen, maybe?");
+
NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
ns3_initialize(ns3_tcp_model.get().c_str());
XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->getCname(), pt->extension<NetPointNs3>()->node_num);
});
simgrid::surf::on_cluster.connect(&clusterCreation_cb);
+
simgrid::s4u::onPlatformCreated.connect(&postparse_cb);
simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
}
XBT_DEBUG("Destroy socket %p of action %p", ns3Socket.c_str(), action);
action->finish(Action::State::done);
} else {
- XBT_DEBUG("Socket %p sent %d bytes out of %d (%d remaining)", ns3Socket.c_str(), sgFlow->sentBytes_,
+ XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3Socket.c_str(), sgFlow->sentBytes_,
sgFlow->totalBytes_, sgFlow->remaining_);
}
}
unsigned int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
unsigned int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
- ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
- ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
+ ns3::Ptr<ns3::Node> src_node = src->pimpl_netpoint->extension<NetPointNs3>()->ns3Node_;
+ ns3::Ptr<ns3::Node> dst_node = dst->pimpl_netpoint->extension<NetPointNs3>()->ns3Node_;
xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?",
dst->pimpl_netpoint->getCname());
int srcNum = src->node_num;
int dstNum = dst->node_num;
- ns3::Ptr<ns3::Node> a = nodes.Get(srcNum);
- ns3::Ptr<ns3::Node> b = nodes.Get(dstNum);
+ ns3::Ptr<ns3::Node> a = src->ns3Node_;
+ ns3::Ptr<ns3::Node> b = dst->ns3Node_;
XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, bw, lat);
pointToPoint.SetDeviceAttribute("DataRate",