X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ea82aa2fb1e9d72ee527af3570bec255f030032..2c8e75834bbb63acef15c560c3de978ab3cb6fbf:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index a6f5aeed02..3d080f26bf 100644
--- 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. */
@@ -165,7 +164,7 @@ void SIMIX_process_kill(smx_process_t process)
     }
 
     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);
@@ -197,7 +196,7 @@ void SIMIX_process_kill(smx_process_t process)
     }
 
     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);
@@ -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)
 {
-  return simix_global ? simix_global->current_process : NULL;
+ if(simix_global)
+	 return simix_global->current_process;
+ return NULL;
 }
 
 /**
@@ -332,7 +333,7 @@ void SIMIX_process_suspend(smx_process_t process)
         SIMIX_action_suspend(act);
       }
     } else if (process->sem) {
-      smx_cond_t s;
+      smx_sem_t s;
       xbt_fifo_item_t i;
       smx_action_t act;
 
@@ -422,9 +423,11 @@ void SIMIX_process_resume(smx_process_t process)
 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");
-  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);