X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6c8108ddea55a6c199759bac3bd4f8ca4daf2c..128ea0e762c5eb7cd5c5a4be1cb7f745592be979:/src/simix/smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 9147633f9f..b7ff8a58c8 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -91,9 +91,8 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
       smx_actor_t process = nullptr;
       xbt_swag_foreach(process, host->process_list) {
         SIMIX_process_kill(process, issuer);
-        XBT_DEBUG("Killing %s on %s by %s",
-          process->name.c_str(),  sg_host_get_name(process->host),
-          issuer->name.c_str());
+        XBT_DEBUG("Killing %s@%s on behalf of %s", process->name.c_str(), sg_host_get_name(process->host),
+                  issuer->name.c_str());
       }
     }
   } else {
@@ -191,8 +190,9 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl
   return exec;
 }
 
-smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_host_t *host_list, double *flops_amount,
-                                             double *bytes_amount, double amount, double rate){
+smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
+                                              double* bytes_amount, double amount, double rate, double timeout)
+{
 
   /* alloc structures and initialize */
   simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr);
@@ -213,6 +213,10 @@ smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_
   if (!MC_is_active() && !MC_record_replay_is_active()) {
     exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
     exec->surf_exec->setData(exec);
+    if (timeout > 0) {
+      exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
+      exec->timeoutDetector->setData(exec);
+    }
   }
   XBT_DEBUG("Create parallel execute synchro %p", exec);
 
@@ -284,6 +288,11 @@ void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec)
         SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
         break;
 
+      case SIMIX_TIMEOUT:
+        XBT_DEBUG("SIMIX_execution_finished: execution timeouted");
+        SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Timeouted");
+        break;
+
       default:
         xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d",
             (int)exec->state);