Merge branch 'master' of framagit.org:simgrid/simgrid

diff --cc ChangeLog
Simple merge

diff --cc include/simgrid/s4u/Activity.hpp
index 83f929d,4879ad3..506cd3c
--- 1/include/simgrid/s4u/Activity.hpp
--- 2/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@@ -104,37 -105,17 +105,34 @@@ protected
  
  private:
    static xbt::signal<void(Activity&)> on_veto;
-   static xbt::signal<void(Activity const&)> on_completion;
 -  static xbt::signal<void(Activity const&)> on_suspended;
 -  static xbt::signal<void(Activity const&)> on_resumed;
 +  static xbt::signal<void(Activity const&)> on_suspend;
 +  static xbt::signal<void(Activity const&)> on_resume;
  
  public:
    /*! Add a callback fired each time that the activity fails to start because of a veto (e.g., unsolved dependency or no
     * resource assigned) */
    static void on_veto_cb(const std::function<void(Activity&)>& cb) { on_veto.connect(cb); }
-   /*! Add a callback fired when the activity completes (either normally, cancelled or failed) */
-   static void on_completion_cb(const std::function<void(Activity const&)>& cb) { on_completion.connect(cb); }
    /*! Add a callback fired when the activity is suspended */
 -  static void on_suspended_cb(const std::function<void(Activity const&)>& cb) { on_suspended.connect(cb); }
 +  static void on_suspend_cb(const std::function<void(Activity const&)>& cb)
 +  {
 +    on_suspend.connect(cb);
 +  }
    /*! Add a callback fired when the activity is resumed after being suspended */
 -  static void on_resumed_cb(const std::function<void(Activity const&)>& cb) { on_resumed.connect(cb); }
 +  static void on_resume_cb(const std::function<void(Activity const&)>& cb)
 +  {
 +    on_resume.connect(cb);
 +  }
 +
 +  XBT_ATTRIB_DEPRECATED_v334("Please use on_suspend_cb() instead") static void on_suspended_cb(
 +      const std::function<void(Activity const&)>& cb)
 +  {
 +    on_suspend.connect(cb);
 +  }
 +  XBT_ATTRIB_DEPRECATED_v334("Please use on_resume_cb() instead") static void on_resumed_cb(
 +      const std::function<void(Activity const&)>& cb)
 +  {
 +    on_resume.connect(cb);
 +  }
  
    XBT_ATTRIB_DEPRECATED_v334("All start() are vetoable now. Please use start() ") void vetoable_start()
    {

diff --cc src/instr/instr_platform.cpp
Simple merge

diff --cc src/kernel/resource/VirtualMachineImpl.cpp
index ea2fa1c,2cd0949..dab4cad
--- 1/src/kernel/resource/VirtualMachineImpl.cpp
--- 2/src/kernel/resource/VirtualMachineImpl.cpp
+++ b/src/kernel/resource/VirtualMachineImpl.cpp
@@@ -125,9 -122,9 +122,9 @@@ VMModel::VMModel(const std::string& nam
  {
    s4u::Host::on_state_change_cb(host_state_change);
    s4u::Exec::on_start_cb(add_active_exec);
-   s4u::Activity::on_completion_cb(remove_active_exec);
+   s4u::Exec::on_completion_cb(remove_active_exec);
 -  s4u::Activity::on_resumed_cb(add_active_activity);
 -  s4u::Activity::on_suspended_cb(remove_active_activity);
 +  s4u::Activity::on_resume_cb(add_active_activity);
 +  s4u::Activity::on_suspend_cb(remove_active_activity);
  }
  
  double VMModel::next_occurring_event(double now)

diff --cc src/s4u/s4u_Activity.cpp
index 90ddcf7,4b59387..78768d3
--- 1/src/s4u/s4u_Activity.cpp
--- 2/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@@ -25,9 -25,8 +25,8 @@@ template class xbt::Extendable<s4u::Act
  namespace s4u {
  
  xbt::signal<void(Activity&)> Activity::on_veto;
- xbt::signal<void(Activity const&)> Activity::on_completion;
 -xbt::signal<void(Activity const&)> Activity::on_suspended;
 -xbt::signal<void(Activity const&)> Activity::on_resumed;
 +xbt::signal<void(Activity const&)> Activity::on_suspend;
 +xbt::signal<void(Activity const&)> Activity::on_resume;
  
  std::set<Activity*>* Activity::vetoed_activities_ = nullptr;