X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68bbe0a999c4d78d2ac27ed0b4bb325f4e6a3b03..8af3cb11bfe73e4813ebeed796e74445b5b2207d:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 607f0bbee0..eff7ab721b 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -246,7 +246,7 @@ void SIMIX_process_killall(void)
     SIMIX_process_kill(p, SIMIX_process_self());
 
   SIMIX_context_runall(simix_global->process_to_run);
-  SIMIX_context_runall(simix_global->process_to_run);
+
   SIMIX_process_empty_trash();
 }
 
@@ -403,14 +403,6 @@ int SIMIX_process_is_suspended(smx_process_t process)
   return process->suspended;
 }
 
-int SIMIX_process_is_enabled(smx_process_t process)
-{
-  if (process->request.call != REQ_NO_REQ && SIMIX_request_is_enabled(&process->request))
-    return TRUE;
-
-  return FALSE;
-}
-
 xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
 {
   return process->properties;
@@ -419,8 +411,10 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
 void SIMIX_pre_process_sleep(smx_req_t req)
 {
   if (MC_IS_ENABLED) {
+    MC_process_clock_add(req->issuer, req->process_sleep.duration);
     req->process_sleep.result = SIMIX_DONE;
     SIMIX_request_answer(req);
+    return;
   }
   smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration);
   xbt_fifo_push(action->request_list, req);
@@ -511,8 +505,10 @@ void SIMIX_process_yield(void)
   /* Ok, maestro returned control to us */
   DEBUG1("Maestro returned control to me: '%s'", self->name);
 
-  if (self->context->iwannadie)
+  if (self->context->iwannadie){
+    DEBUG0("I wanna die!");
     SIMIX_context_stop(self->context);
+  }
 
   if (self->doexception) {
     DEBUG0("Wait, maestro left me an exception");