factor attachment of state traces to resources

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index eba8890..ace74b4 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -134,12 +134,6 @@ int Cpu::get_core_count()
   return core_count_;
 }
 
-void Cpu::set_state_trace(tmgr_trace_t trace)
-{
-  xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname());
-
-  state_event_ = future_evt_set->add_trace(trace, this);
-}
 void Cpu::set_speed_trace(tmgr_trace_t trace)
 {
   xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
@@ -172,26 +166,24 @@ void CpuAction::update_remains_lazy(double now)
   set_last_value(get_variable()->get_value());
 }
 
-simgrid::xbt::signal<void(simgrid::surf::CpuAction*, kernel::resource::Action::State)> CpuAction::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> CpuAction::on_state_change;
 
 void CpuAction::suspend(){
-  Action::State previous = get_state();
-  onStateChange(this, previous);
+  on_state_change(this);
   Action::suspend();
 }
 
 void CpuAction::resume(){
-  Action::State previous = get_state();
-  onStateChange(this, previous);
+  on_state_change(this);
   Action::resume();
 }
 
 void CpuAction::set_state(Action::State state)
 {
-  Action::State previous = get_state();
   Action::set_state(state);
-  onStateChange(this, previous);
+  on_state_change(this);
 }
+
 /** @brief returns a list of all CPUs that this action is using */
 std::list<Cpu*> CpuAction::cpus() {
   std::list<Cpu*> retlist;