simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> NetPointNs3::EXTENSION_ID;
-NetPointNs3::NetPointNs3()
+NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject<ns3::Node>(0))
{
- ns3_node_ = ns3::CreateObject<ns3::Node>(0);
stack.Install(ns3_node_);
nodes.Add(ns3_node_);
node_num = number_of_nodes++;
return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::next_occuring_event(double now)
+double NetworkNS3Model::next_occurring_event(double now)
{
double time_to_next_flow_completion = 0.0;
- XBT_DEBUG("ns3_next_occuring_event");
+ XBT_DEBUG("ns3_next_occurring_event");
//get the first relevant value from the running_actions list
SgFlow* sgFlow = elm.second;
NetworkNS3Action * action = sgFlow->action_;
XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
- // Because NS3 stops as soon as a flow is finished, the other flows that ends at the same time may remains in an inconsistant state
- // (i.e. remains_ == 0 but finished_ == false).
+ // Because NS3 stops as soon as a flow is finished, the other flows that ends at the same time may remains in an
+ // inconsistent state (i.e. remains_ == 0 but finished_ == false).
// However, SimGrid considers sometimes that an action with remains_ == 0 is finished.
// Thus, to avoid inconsistencies between SimGrid and NS3, set remains to 0 only when the flow is finished in NS3
int remains = action->get_cost() - sgFlow->sent_bytes_;