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

[simgrid.git] / src / msg / msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 213315d..65d91fc 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -62,12 +62,12 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
     if (simdata->host_nb > 0) {
       simdata->compute =
           boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(simcall_execution_parallel_start(
-              task->name, simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount,
+              task->name ?: "", simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount,
               simdata->bytes_parallel_amount, -1.0, timeout));
       XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get());
     } else {
       simdata->compute = boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(
-          simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound,
+          simcall_execution_start(task->name ?: "", simdata->flops_amount, simdata->priority, simdata->bound,
                                   MSG_process_get_host(MSG_process_self())));
     }
     simcall_set_category(simdata->compute, task->category);
@@ -113,11 +113,8 @@ msg_error_t MSG_process_sleep(double nb_sec)
 {
   msg_error_t status = MSG_OK;
 
-  if (TRACE_actor_is_enabled())
-    simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("sleep");
-
   try {
-    simcall_process_sleep(nb_sec);
+    simgrid::s4u::this_actor::sleep_for(nb_sec);
   }
   catch(xbt_ex& e) {
     if (e.category == cancel_error) {
@@ -133,9 +130,6 @@ msg_error_t MSG_process_sleep(double nb_sec)
       throw;
   }
 
-  if (TRACE_actor_is_enabled())
-    simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event();
-
   return status;
 }