X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95d328f9ca4dd6ccd2065c6c84aca83d43001804..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/simix/smx_synchro.c

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index 42d057bc6d..92ac1a0273 100644
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -11,7 +11,7 @@
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
-				"Logging specific to SIMIX (synchronization)");
+                                "Logging specific to SIMIX (synchronization)");
 
 
 /****************************** Synchronization *******************************/
@@ -27,9 +27,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
 smx_mutex_t SIMIX_mutex_init()
 {
   smx_mutex_t m = xbt_new0(s_smx_mutex_t, 1);
-  s_smx_process_t p;		/* useful to initialize sleeping swag */
+  s_smx_process_t p;            /* useful to initialize sleeping swag */
   /* structures initialization */
-  m->refcount  = 0;
+  m->refcount = 0;
   m->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
   return m;
 }
@@ -46,7 +46,7 @@ void SIMIX_mutex_lock(smx_mutex_t mutex)
   xbt_assert0((mutex != NULL), "Invalid parameters");
 
 
-  if (mutex->refcount ) {
+  if (mutex->refcount) {
     /* somebody using the mutex, block */
     xbt_swag_insert(self, mutex->sleeping);
     self->simdata->mutex = mutex;
@@ -59,10 +59,10 @@ void SIMIX_mutex_lock(smx_mutex_t mutex)
       xbt_context_yield();
     }
 
-    mutex->refcount  = 1;
+    mutex->refcount = 1;
   } else {
     /* mutex free */
-    mutex->refcount  = 1;
+    mutex->refcount = 1;
   }
   return;
 }
@@ -78,10 +78,10 @@ int SIMIX_mutex_trylock(smx_mutex_t mutex)
 {
   xbt_assert0((mutex != NULL), "Invalid parameters");
 
-  if (mutex->refcount )
+  if (mutex->refcount)
     return 0;
   else {
-    mutex->refcount  = 1;
+    mutex->refcount = 1;
     return 1;
   }
 }
@@ -94,17 +94,17 @@ int SIMIX_mutex_trylock(smx_mutex_t mutex)
  */
 void SIMIX_mutex_unlock(smx_mutex_t mutex)
 {
-  smx_process_t p;		/*process to wake up */
+  smx_process_t p;              /*process to wake up */
 
   xbt_assert0((mutex != NULL), "Invalid parameters");
 
   if (xbt_swag_size(mutex->sleeping) > 0) {
     p = xbt_swag_extract(mutex->sleeping);
-    mutex->refcount  = 0;
+    mutex->refcount = 0;
     xbt_swag_insert(p, simix_global->process_to_run);
   } else {
     /* nobody to wake up */
-    mutex->refcount  = 0;
+    mutex->refcount = 0;
   }
   return;
 }
@@ -153,10 +153,10 @@ smx_cond_t SIMIX_cond_init()
  */
 void SIMIX_cond_signal(smx_cond_t cond)
 {
-	smx_process_t proc = NULL;
+  smx_process_t proc = NULL;
   DEBUG1("Signal condition %p", cond);
   xbt_assert0((cond != NULL), "Invalid parameters");
- 
+
 
   if (xbt_swag_size(cond->sleeping) >= 1) {
     proc = xbt_swag_extract(cond->sleeping);
@@ -184,11 +184,11 @@ void SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
   SIMIX_mutex_unlock(mutex);
   /* always create an action null in case there is a host failure */
 /*   if (xbt_fifo_size(cond->actions) == 0) { */
-    act_sleep = SIMIX_action_sleep(SIMIX_host_self(), -1);
-    SIMIX_register_action_to_condition(act_sleep, cond);
-    __SIMIX_cond_wait(cond);
-    SIMIX_unregister_action_to_condition(act_sleep, cond);
-    SIMIX_action_destroy(act_sleep);
+  act_sleep = SIMIX_action_sleep(SIMIX_host_self(), -1);
+  SIMIX_register_action_to_condition(act_sleep, cond);
+  __SIMIX_cond_wait(cond);
+  SIMIX_unregister_action_to_condition(act_sleep, cond);
+  SIMIX_action_destroy(act_sleep);
 /*   } else { */
 /*     __SIMIX_cond_wait(cond); */
 /*   } */
@@ -231,9 +231,9 @@ void __SIMIX_cond_wait(smx_cond_t cond)
  * \param max_duration Timeout time
  */
 void SIMIX_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex,
-			     double max_duration)
+                             double max_duration)
 {
-  
+
   smx_action_t act_sleep;
   xbt_assert0((mutex != NULL), "Invalid parameters");
 
@@ -273,7 +273,7 @@ void SIMIX_cond_broadcast(smx_cond_t cond)
   smx_process_t proc = NULL;
   smx_process_t proc_next = NULL;
 
-   xbt_assert0((cond != NULL), "Invalid parameters");
+  xbt_assert0((cond != NULL), "Invalid parameters");
 
   DEBUG1("Broadcast condition %p", cond);
   xbt_swag_foreach_safe(proc, proc_next, cond->sleeping) {
@@ -300,7 +300,7 @@ void SIMIX_cond_destroy(smx_cond_t cond)
     smx_action_t action = NULL;
 
     xbt_assert0(xbt_swag_size(cond->sleeping) == 0,
-		"Cannot destroy conditional since someone is still using it");
+                "Cannot destroy conditional since someone is still using it");
     xbt_swag_free(cond->sleeping);
 
     DEBUG1("%d actions registered", xbt_fifo_size(cond->actions));
@@ -324,8 +324,9 @@ void SIMIX_cond_display_info(smx_cond_t cond)
     smx_process_t process = NULL;
 
     INFO0("Blocked process on this condition:");
-    xbt_swag_foreach(process,cond->sleeping) {
-      INFO2("\t %s running on host %s",process->name,process->simdata->smx_host->name);
+    xbt_swag_foreach(process, cond->sleeping) {
+      INFO2("\t %s running on host %s", process->name,
+            process->simdata->smx_host->name);
     }
   }
 }