#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
+#include "src/surf/xml/platf_private.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
* Callbacks *
*************/
-static void clusterCreation_cb(ClusterCreationArgs* cluster)
+static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs* cluster)
{
for (int const& i : *cluster->radicals) {
// Routers don't create a router on the other end of the private link by themselves.
namespace simgrid {
namespace surf {
-NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
+NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::Full)
+{
xbt_assert(not sg_link_energy_is_inited(),
"LinkEnergy plugin and NS3 network models are not compatible. Are you looking for Ecofen, maybe?");
return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::nextOccuringEvent(double now)
+double NetworkNS3Model::next_occuring_event(double now)
{
double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
- if (not getRunningActionSet()->size() || now == 0.0)
+ if (not get_running_action_set()->size() || now == 0.0)
return -1.0;
else
do {
return time_to_next_flow_completion;
}
-void NetworkNS3Model::updateActionsState(double now, double delta)
+void NetworkNS3Model::update_actions_state(double now, double delta)
{
static std::vector<std::string> socket_to_destroy;
/* If there are no running flows, advance the NS3 simulator and return */
- if (getRunningActionSet()->empty()) {
+ if (get_running_action_set()->empty()) {
while(double_positive(now - ns3::Simulator::Now().GetSeconds(), sg_surf_precision))
ns3_simulator(now-ns3::Simulator::Now().GetSeconds());
SgFlow* sgFlow = elm.second;
NetworkNS3Action * action = sgFlow->action_;
XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
- action->setRemains(action->getCost() - sgFlow->sentBytes_);
+ action->set_remains(action->get_cost() - sgFlow->sentBytes_);
- if (TRACE_is_enabled() && action->getState() == kernel::resource::Action::State::running) {
+ if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::running) {
double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
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);
+ TRACE_surf_link_set_utilization(link->getCname(), action->get_category(), (data_delta_sent) / delta,
+ now - delta, delta);
action->lastSent_ = sgFlow->sentBytes_;
}
{
THROW_UNIMPLEMENTED;
}
-
-/* Test whether a flow is suspended */
-bool NetworkNS3Action::isSuspended()
-{
- return false;
-}
-
-int NetworkNS3Action::unref()
+void NetworkNS3Action::update_remains_lazy(double /*now*/)
{
- refcount_--;
- if (not refcount_) {
- if (stateSetHook_.is_linked())
- simgrid::xbt::intrusive_erase(*stateSet_, *this);
- XBT_DEBUG ("Removing action %p", this);
- delete this;
- return 1;
- }
- return 0;
+ THROW_IMPOSSIBLE;
}
}