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

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 69105c9..31d822a 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -227,7 +227,7 @@ void SIMIX_process_create(smx_process_t *process,
 
   if (kill_time > SIMIX_get_clock()) {
     if (simix_global->kill_process_function) {
-      XBT_INFO("Process %s(%s) will be kill at time %f", (*process)->name,
+      XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
           (*process)->smx_host->name, kill_time);
       SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
     }
@@ -263,7 +263,7 @@ void SIMIX_process_runall(void)
  */
 void SIMIX_process_kill(smx_process_t process) {
 
-  XBT_INFO("Killing process %s on %s", process->name, process->smx_host->name);
+  XBT_DEBUG("Killing process %s on %s", process->name, process->smx_host->name);
 
   process->context->iwannadie = 1;
   process->blocked = 0;
@@ -384,13 +384,17 @@ smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
           SIMIX_process_sleep_suspend(process->waiting_action);
           break;
 
+        case SIMIX_ACTION_SYNCHRO:
+          /* Suspension is delayed to when the process is rescheduled. */
+          break;
+
         default:
           xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
               (int)process->waiting_action->type);
       }
       return NULL;
     } else {
-      DIE_IMPOSSIBLE;
+      /* Suspension is delayed to when the process is rescheduled. */
       return NULL;
     }
   } else {
@@ -402,9 +406,12 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
+  XBT_IN("process = %p, issuer = %p", process, issuer);
+
   if(process->context->iwannadie)
     return;
 
+  if(!process->suspended) return;
   process->suspended = 0;
 
   /* If we are resuming another process, resume the action it was waiting for
@@ -428,17 +435,19 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
           SIMIX_process_sleep_resume(process->waiting_action);
           break;
 
+        case SIMIX_ACTION_SYNCHRO:
+          /* I cannot resume it now. This is delayed to when the process is rescheduled at
+           * the end of the synchro. */
+          break;
+
         default:
           xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d",
               (int)process->waiting_action->type);
       }
     }
-    else {
-      DIE_IMPOSSIBLE;
-//      if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
-//        xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
-    }
-  }
+  } else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
+
+  XBT_OUT();
 }
 
 int SIMIX_process_get_maxpid(void) {
@@ -630,6 +639,12 @@ void SIMIX_process_yield(smx_process_t self)
     SIMIX_context_stop(self->context);
   }
 
+  if(self->suspended) {
+    xbt_assert(!self->doexception, "Gloups! This exception may be lost by subsequent calls.");
+    self->suspended = 0;
+    SIMIX_process_suspend(self,self);
+  }
+
   if (self->doexception) {
     XBT_DEBUG("Wait, maestro left me an exception");
     self->doexception = 0;