Python: Add Comm.wait_any

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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 35c0c03..c29102b 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -8,7 +8,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-#define EPSILON 0.000000001
+constexpr double EPSILON = 0.000000001;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
 
@@ -400,7 +400,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value)
 
   } else if (event == state_event_) {
     if (value > 0) {
-      if (is_off()) {
+      if (not is_on()) {
         XBT_VERB("Restart processes on host %s", get_host()->get_cname());
         get_host()->turn_on();
       }
@@ -463,18 +463,18 @@ void CpuTi::update_actions_finish_time(double now)
 
       action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
       /* verify which event will happen before (max_duration or finish time) */
-      if (action.get_max_duration() > NO_MAX_DURATION &&
+      if (action.get_max_duration() != NO_MAX_DURATION &&
           action.get_start_time() + action.get_max_duration() < action.get_finish_time())
         min_finish = action.get_start_time() + action.get_max_duration();
       else
         min_finish = action.get_finish_time();
     } else {
       /* put the max duration time on heap */
-      if (action.get_max_duration() > NO_MAX_DURATION)
+      if (action.get_max_duration() != NO_MAX_DURATION)
         min_finish = action.get_start_time() + action.get_max_duration();
     }
     /* add in action heap */
-    if (min_finish > NO_MAX_DURATION)
+    if (min_finish != NO_MAX_DURATION)
       get_model()->get_action_heap().update(&action, min_finish, kernel::resource::ActionHeap::Type::unset);
     else
       get_model()->get_action_heap().remove(&action);
@@ -557,7 +557,7 @@ CpuAction *CpuTi::sleep(double duration)
 
   action->set_max_duration(duration);
   action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
-  if (duration < 0) // NO_MAX_DURATION
+  if (duration == NO_MAX_DURATION)
     action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
 
   action_set_.push_back(*action);
@@ -583,7 +583,7 @@ void CpuTi::set_modified(bool modified)
  * Action *
  **********/
 
-CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, cpu->is_off()), cpu_(cpu)
+CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, not cpu->is_on()), cpu_(cpu)
 {
   cpu_->set_modified(true);
 }