From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 5 Mar 2019 08:46:35 +0000 (+0100)
Subject: apply agier fixes for StarPU build
X-Git-Tag: v3_22~179
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/578f8560bc178994f6d8857695b9a8f478b03f2b?ds=sidebyside

apply agier fixes for StarPU build
---

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index a003ad9b41..5b3736bc70 100644
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -35,10 +35,6 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
 
   XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
 
-  if (task->flops_amount <= 0.0 && not task->hosts_.empty()) {
-    return MSG_OK;
-  }
-
   if (TRACE_actor_is_enabled())
     simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("execute");
 
diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 3695cc0436..d3416fc5ee 100644
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -67,6 +67,8 @@ msg_error_t Task::execute()
   xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
 
   msg_error_t status = MSG_OK;
+  if (flops_amount <= 0.0)
+    return MSG_OK;
 
   set_used();
   try {
@@ -278,7 +280,7 @@ void MSG_task_set_name(msg_task_t task, const char *name)
  */
 msg_error_t MSG_task_execute(msg_task_t task)
 {
-  return task->execute();
+  return task->is_parallel() ? MSG_parallel_task_execute(task) : task->execute();
 }
 /**
  * @brief Sends a task on a mailbox.