X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28fd49f9900e7a8424f38cafd21682f8c732ed42..e51ea751d20f2437b9b350a3bab1db3c257fb54f:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 048f5c3ec7..326f0ae87f 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -56,7 +56,7 @@ void SIMIX_process_cleanup(smx_process_t process)
 
     if (action->comm.src_proc == process) {
       XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
-          action, action->comm.detached, action->state, action->comm.src_proc, action->comm.dst_proc);
+          action, action->comm.detached, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
       action->comm.src_proc = NULL;
 
       if (action->comm.detached) {
@@ -76,7 +76,7 @@ void SIMIX_process_cleanup(smx_process_t process)
     }
     else if (action->comm.dst_proc == process){
       XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
-          action, action->state, action->comm.src_proc, action->comm.dst_proc);
+          action, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
       action->comm.dst_proc = NULL;
 
       if (action->comm.detached && action->comm.refcount == 1
@@ -96,6 +96,7 @@ void SIMIX_process_cleanup(smx_process_t process)
   xbt_swag_remove(process, simix_global->process_list);
   xbt_swag_remove(process, process->smx_host->process_list);
   xbt_swag_insert(process, simix_global->process_to_destroy);
+  process->context->iwannadie = 0;
 }
 
 /** 
@@ -288,8 +289,8 @@ void SIMIX_process_kill(smx_process_t process) {
         break;
     }
   }
-
-  xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+  if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+    xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
 }
 
 /**
@@ -306,7 +307,7 @@ void SIMIX_process_killall(smx_process_t issuer)
     }
   }
 
-  SIMIX_context_runall(simix_global->process_to_run);
+  SIMIX_context_runall();
 
   SIMIX_process_empty_trash();
 }
@@ -328,21 +329,26 @@ void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest)
 void SIMIX_pre_process_suspend(smx_simcall_t simcall)
 {
   smx_process_t process = simcall->process_suspend.process;
-  SIMIX_process_suspend(process, simcall->issuer);
+  smx_action_t action_suspend =
+      SIMIX_process_suspend(process, simcall->issuer);
 
   if (process != simcall->issuer) {
     SIMIX_simcall_answer(simcall);
+  } else {
+    xbt_fifo_push(action_suspend->simcalls, simcall);
+    process->waiting_action = action_suspend;
+    SIMIX_host_execution_suspend(process->waiting_action);
   }
   /* If we are suspending ourselves, then just do not finish the simcall now */
 }
 
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
   if (process->suspended) {
     XBT_DEBUG("Process '%s' is already suspended", process->name);
-    return;
+    return NULL;
   }
 
   process->suspended = 1;
@@ -370,9 +376,15 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 
         default:
           xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
-              process->waiting_action->type);
+              (int)process->waiting_action->type);
       }
+      return NULL;
+    } else {
+      DIE_IMPOSSIBLE;
+      return NULL;
     }
+  } else {
+    return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
   }
 }
 
@@ -380,10 +392,8 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
-  if (!process->suspended) {
-    XBT_DEBUG("Process '%s' is not suspended", process->name);
+  if(process->context->iwannadie)
     return;
-  }
 
   process->suspended = 0;
 
@@ -410,11 +420,13 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 
         default:
           xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d",
-              process->waiting_action->type);
+              (int)process->waiting_action->type);
       }
     }
     else {
-      xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+      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);
     }
   }
 }
@@ -662,3 +674,13 @@ smx_process_t SIMIX_process_from_PID(int PID)
 	}
 	return NULL;
 }
+
+/** @brief returns a dynar containg all currently existing processes */
+xbt_dynar_t SIMIX_processes_as_dynar(void) {
+  smx_process_t proc;
+  xbt_dynar_t res = xbt_dynar_new(sizeof(smx_process_t),NULL);
+  xbt_swag_foreach(proc, simix_global->process_list) {
+    xbt_dynar_push(res,&proc);
+  }
+  return res;
+}