Fix test tesh-s4u-trace-integration.

Overriding CpuTiAction::set_max_duration() was wrongly inserting an action with min_finish = -1.0.
Simply use the parent Action::set_max_duration() instead.

The action will be inserted in action_heap by update_action_finish_time() when needed.

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index a24b853..0f98f52 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -590,26 +590,6 @@ void CpuTiAction::resume()
   XBT_OUT();
 }
 
-void CpuTiAction::set_max_duration(double duration)
-{
-  double min_finish;
-
-  XBT_IN("(%p,%g)", this, duration);
-
-  Action::set_max_duration(duration);
-
-  if (duration >= 0)
-    min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
-                                                                             : get_finish_time();
-  else
-    min_finish = get_finish_time();
-
-  /* add in action heap */
-  get_model()->get_action_heap().update(this, min_finish, ActionHeap::Type::unset);
-
-  XBT_OUT();
-}
-
 void CpuTiAction::set_sharing_penalty(double sharing_penalty)
 {
   XBT_IN("(%p,%g)", this, sharing_penalty);

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 6997bfe..25644f9 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -82,7 +82,6 @@ public:
   void cancel() override;
   void suspend() override;
   void resume() override;
-  void set_max_duration(double duration) override;
   void set_sharing_penalty(double sharing_penalty) override;
   double get_remains() override;