Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 955de3a..caf30b7 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -210,6 +210,18 @@ void CpuAction::updateRemainingLazy(double now)
 
 simgrid::xbt::signal<void(simgrid::surf::CpuAction*, Action::State)> CpuAction::onStateChange;
 
+void CpuAction::suspend(){
+  Action::State previous = getState();
+  onStateChange(this, previous);
+  Action::suspend();
+}
+
+void CpuAction::resume(){
+  Action::State previous = getState();
+  onStateChange(this, previous);
+  Action::resume();
+}
+
 void CpuAction::setState(Action::State state){
   Action::State previous = getState();
   Action::setState(state);

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 920f92f..fc67386 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -168,6 +168,9 @@ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
 
   void updateRemainingLazy(double now) override;
   std::list<Cpu*> cpus();
+  
+  void suspend() override;
+  void resume() override;
 };
 
 }