e_smx_state_t is now kernel::activity::State

[simgrid.git] / src / plugins / host_load.cpp

diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp
index dd1b310..f84ffc0 100644 (file)
--- a/src/plugins/host_load.cpp
+++ b/src/plugins/host_load.cpp
@@ -14,7 +14,7 @@ SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init)
 
 /** @defgroup plugin_host_load
 
-  @rst
+  @beginrst
 
 Simple plugin that monitors the current load for each host.
 
@@ -62,7 +62,7 @@ public:
       , last_updated_(surf_get_clock())
       , last_reset_(surf_get_clock())
       , current_speed_(host_->get_speed())
-      , current_flops_(host_->pimpl_cpu->get_constraint()->get_usage())
+      , current_flops_(host_->get_load())
       , theor_max_flops_(0)
   {
   }
@@ -130,15 +130,14 @@ void HostLoad::update()
     auto current_iter                      = iter;
     ++iter;
 
-    if (action != nullptr && action->get_finish_time() != now && activity->state_ == e_smx_state_t::SIMIX_RUNNING) {
+    if (action != nullptr && action->get_finish_time() != now && activity->state_ == kernel::activity::State::RUNNING) {
       if (remaining_cost_after_last_update == activity_uninitialized_remaining_cost) {
         remaining_cost_after_last_update = action->get_cost();
       }
       double computed_flops_since_last_update = remaining_cost_after_last_update - /*remaining now*/activity->get_remaining();
       computed_flops_                        += computed_flops_since_last_update;
       remaining_cost_after_last_update        = activity->get_remaining();
-    }
-    else if (activity->state_ == e_smx_state_t::SIMIX_DONE) {
+    } else if (activity->state_ == kernel::activity::State::DONE) {
       computed_flops_ += remaining_cost_after_last_update;
       current_activities.erase(current_iter);
     }
@@ -146,7 +145,7 @@ void HostLoad::update()
 
   /* Current flop per second computed by the cpu; current_flops = k * pstate_speed_in_flops, k @in {0, 1, ..., cores-1}
    * designates number of active cores; will be 0 if CPU is currently idle */
-  current_flops_ = host_->pimpl_cpu->get_constraint()->get_usage();
+  current_flops_ = host_->get_load();
 
   if (current_flops_ == 0) {
     idle_time_ += (now - last_updated_);
@@ -188,7 +187,7 @@ void HostLoad::reset()
   idle_time_       = 0;
   computed_flops_  = 0;
   theor_max_flops_ = 0;
-  current_flops_   = host_->pimpl_cpu->get_constraint()->get_usage();
+  current_flops_   = host_->get_load();
   current_speed_   = host_->get_speed();
 }
 } // namespace plugin