remove last bits of tracing from cpu_interface \o/

[simgrid.git] / src / surf / cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 21867e6..6445903 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_interface.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include <xbt/dynar.h>
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
@@ -26,40 +26,17 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/)
 
     CpuAction* action = static_cast<CpuAction*>(get_action_heap().pop());
     XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
-    if (TRACE_is_enabled()) {
-      Cpu* cpu = static_cast<Cpu*>(action->get_variable()->get_constraint(0)->get_id());
-      TRACE_surf_host_set_utilization(cpu->get_cname(), action->get_category(), action->get_variable()->get_value(),
-                                      action->get_last_update(), now - action->get_last_update());
-    }
 
-    action->finish(kernel::resource::Action::State::done);
+    action->finish(kernel::resource::Action::State::FINISHED);
     XBT_CDEBUG(surf_kernel, "Action %p finished", action);
   }
-  if (TRACE_is_enabled()) {
-    //defining the last timestamp that we can safely dump to trace file
-    //without losing the event ascending order (considering all CPU's)
-    double smaller = -1;
-    for (kernel::resource::Action const& action : *get_running_action_set()) {
-      if (smaller < 0 || action.get_last_update() < smaller)
-        smaller = action.get_last_update();
-    }
-    if (smaller > 0) {
-      TRACE_last_timestamp_to_dump = smaller;
-    }
-  }
 }
 
 void CpuModel::update_actions_state_full(double now, double delta)
 {
-  for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+  for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
     CpuAction& action = static_cast<CpuAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
-    if (TRACE_is_enabled()) {
-      Cpu* cpu = static_cast<Cpu*>(action.get_variable()->get_constraint(0)->get_id());
-      TRACE_surf_host_set_utilization(cpu->get_cname(), action.get_category(), action.get_variable()->get_value(),
-                                      now - delta, delta);
-      TRACE_last_timestamp_to_dump = now - delta;
-    }
 
     action.update_remains(action.get_variable()->get_value() * delta);
 
@@ -68,7 +45,7 @@ void CpuModel::update_actions_state_full(double now, double delta)
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
         ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
-      action.finish(kernel::resource::Action::State::done);
+      action.finish(kernel::resource::Action::State::FINISHED);
     }
   }
 }
@@ -143,8 +120,7 @@ double Cpu::get_available_speed()
 }
 
 void Cpu::onSpeedChange() {
-  TRACE_surf_host_set_speed(surf_get_clock(), get_cname(), coresAmount_ * speed_.scale * speed_.peak);
-  s4u::Host::onSpeedChange(*host_);
+  s4u::Host::on_speed_change(*host_);
 }
 
 int Cpu::coreCount()
@@ -172,7 +148,7 @@ void Cpu::set_speed_trace(tmgr_trace_t trace)
 
 void CpuAction::update_remains_lazy(double now)
 {
-  xbt_assert(get_state_set() == get_model()->get_running_action_set(),
+  xbt_assert(get_state_set() == get_model()->get_started_action_set(),
              "You're updating an action that is not running.");
   xbt_assert(get_priority() > 0, "You're updating an action that seems suspended.");
 
@@ -183,11 +159,6 @@ void CpuAction::update_remains_lazy(double now)
                get_last_update());
     update_remains(get_last_value() * delta);
 
-    if (TRACE_is_enabled()) {
-      Cpu* cpu = static_cast<Cpu*>(get_variable()->get_constraint(0)->get_id());
-      TRACE_surf_host_set_utilization(cpu->get_cname(), get_category(), get_last_value(), get_last_update(),
-                                      now - get_last_update());
-    }
     XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update());
   }