Use a fifo instead of a swag of sleeping processes on a semaphore (so that waitany...

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 677a375..3d080f2 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -1,6 +1,5 @@
-//*     $Id$     */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */

 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */


@@ -165,7 +164,7 @@ void SIMIX_process_kill(smx_process_t process)
     }
 
     if (process->sem) {
     }
 
     if (process->sem) {

-      xbt_swag_remove(process, process->sem->sleeping);
+      xbt_fifo_remove(process->sem->sleeping, process);

 
       if (process->waiting_action) {
         SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
 
       if (process->waiting_action) {
         SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);


@@ -176,7 +175,7 @@ void SIMIX_process_kill(smx_process_t process)
     SIMIX_context_stop(process->context);
 
   } else {
     SIMIX_context_stop(process->context);
 
   } else {

-    DEBUG4("%s(%p) here! killing %s(%p) %s",
+    DEBUG4("%s(%p) here! killing %s(%p)",

         simix_global->current_process->name,simix_global->current_process,
         process->name,process);
 
         simix_global->current_process->name,simix_global->current_process,
         process->name,process);
 


@@ -197,7 +196,7 @@ void SIMIX_process_kill(smx_process_t process)
     }
 
     if (process->sem) {
     }
 
     if (process->sem) {

-       xbt_swag_remove(process, process->sem->sleeping);
+      xbt_fifo_remove(process->sem->sleeping, process);

 
       if (process->waiting_action) {
        SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
 
       if (process->waiting_action) {
        SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);


@@ -298,7 +297,9 @@ XBT_INLINE xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
  */
 XBT_INLINE smx_process_t SIMIX_process_self(void)
 {
  */
 XBT_INLINE smx_process_t SIMIX_process_self(void)
 {

-  return simix_global ? simix_global->current_process : NULL;
+ if(simix_global)
+        return simix_global->current_process;
+ return NULL;

 }
 
 /**
 }
 
 /**


@@ -316,7 +317,7 @@ void SIMIX_process_suspend(smx_process_t process)
   if (process != SIMIX_process_self()) {
 
     if (process->mutex) {
   if (process != SIMIX_process_self()) {
 
     if (process->mutex) {

-      /* process blocked on a mutex, only set suspend=1 */
+      /* process blocked on a mutex or sem, only set suspend=1 */

       process->suspended = 1;
     } else if (process->cond) {
       /* process blocked cond, suspend all actions */
       process->suspended = 1;
     } else if (process->cond) {
       /* process blocked cond, suspend all actions */


@@ -329,7 +330,17 @@ void SIMIX_process_suspend(smx_process_t process)
       process->suspended = 1;
       c = process->cond;
       xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
       process->suspended = 1;
       c = process->cond;
       xbt_fifo_foreach(c->actions, i, act, smx_action_t) {

-        surf_workstation_model->suspend(act->surf_action);
+        SIMIX_action_suspend(act);
+      }
+    } else if (process->sem) {
+      smx_sem_t s;
+      xbt_fifo_item_t i;
+      smx_action_t act;
+
+      process->suspended = 1;
+      s = process->sem;
+      xbt_fifo_foreach(s->actions, i, act, smx_action_t) {
+        SIMIX_action_suspend(act);

       }
     } else {
       process->suspended = 1;
       }
     } else {
       process->suspended = 1;


@@ -344,7 +355,7 @@ void SIMIX_process_suspend(smx_process_t process)
     cond = SIMIX_cond_init();
     dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
     SIMIX_process_self()->waiting_action = dummy;
     cond = SIMIX_cond_init();
     dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
     SIMIX_process_self()->waiting_action = dummy;

-    surf_workstation_model->suspend(dummy->surf_action);
+    SIMIX_action_suspend(dummy);

     SIMIX_register_action_to_condition(dummy, cond);
     __SIMIX_cond_wait(cond);
     SIMIX_process_self()->waiting_action = NULL;
     SIMIX_register_action_to_condition(dummy, cond);
     __SIMIX_cond_wait(cond);
     SIMIX_process_self()->waiting_action = NULL;


@@ -370,7 +381,7 @@ void SIMIX_process_resume(smx_process_t process)
     return;
 
   if (process->mutex) {
     return;
 
   if (process->mutex) {

-    DEBUG0("Resume process blocked on a mutex");
+    DEBUG0("Resume process blocked on a mutex or semaphore");

     process->suspended = 0;     /* It'll wake up by itself when mutex releases */
     return;
   } else if (process->cond) {
     process->suspended = 0;     /* It'll wake up by itself when mutex releases */
     return;
   } else if (process->cond) {


@@ -382,10 +393,22 @@ void SIMIX_process_resume(smx_process_t process)
     process->suspended = 0;
     c = process->cond;
     xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
     process->suspended = 0;
     c = process->cond;
     xbt_fifo_foreach(c->actions, i, act, smx_action_t) {

-      surf_workstation_model->resume(act->surf_action);
+      SIMIX_action_resume(act);

     }
     SIMIX_cond_signal(c);
     return;
     }
     SIMIX_cond_signal(c);
     return;

+  } else if (process->sem) {
+    /* temporaries variables */
+    smx_sem_t s;
+    xbt_fifo_item_t i;
+    smx_action_t act;
+    DEBUG0("Resume process blocked on a semaphore");
+    process->suspended = 0;
+    s = process->sem;
+    xbt_fifo_foreach(s->actions, i, act, smx_action_t) {
+      SIMIX_action_resume(act);
+    }
+    return;

   } else {
     process->suspended = 0;
     xbt_swag_insert(process, simix_global->process_to_run);
   } else {
     process->suspended = 0;
     xbt_swag_insert(process, simix_global->process_to_run);


@@ -400,9 +423,11 @@ void SIMIX_process_resume(smx_process_t process)
 void SIMIX_process_change_host(smx_process_t process, char *source,
                                char *dest)
 {
 void SIMIX_process_change_host(smx_process_t process, char *source,
                                char *dest)
 {

+  smx_host_t h1 = NULL;
+  smx_host_t h2 = NULL;

   xbt_assert0((process != NULL), "Invalid parameters");
   xbt_assert0((process != NULL), "Invalid parameters");

-  smx_host_t h1 = SIMIX_host_get_by_name(source);
-  smx_host_t h2 = SIMIX_host_get_by_name(dest);
+  h1 = SIMIX_host_get_by_name(source);
+  h2 = SIMIX_host_get_by_name(dest);

   process->smx_host = h2;
   xbt_swag_remove(process, h1->process_list);
   xbt_swag_insert(process, h2->process_list);
   process->smx_host = h2;
   xbt_swag_remove(process, h1->process_list);
   xbt_swag_insert(process, h2->process_list);


@@ -466,7 +491,7 @@ void SIMIX_process_schedule(smx_process_t new_process)
   simix_global->current_process = new_process;
 
   /* schedule the context */
   simix_global->current_process = new_process;
 
   /* schedule the context */

-  SIMIX_context_resume(simix_global->maestro_process->context,new_process->context);
+  SIMIX_context_resume(new_process->context);

   DEBUG1("Resumed from scheduling context: '%s'", new_process->name);
 
   /* restore the current process to the previously saved process */
   DEBUG1("Resumed from scheduling context: '%s'", new_process->name);
 
   /* restore the current process to the previously saved process */