X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a201b7ceece70d2bc461ac48c8b746a36d07243..db76b8c2bb3acf20452613ccac46a9bee673f1b6:/src/xbt/xbt_sg_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index 518d19a01f..a46072effe 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -3,8 +3,8 @@
 
 /* This is the simulation implementation, using simix.                      */
 
-/* Copyright 2006,2007 Malek Cherier, Martin Quinson
- * All right 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. */
@@ -22,13 +22,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
 /* the implementation would be cleaner (and faster) with ELF symbol aliasing */
 
 typedef struct s_xbt_thread_ {
+  smx_process_t s_process; /* keep this first, gras_socket_im_the_server() does funky transtyping in sg_msg.c */
   char *name;
-  smx_process_t s_process;
   void_f_pvoid_t code;
   void *userparam;
   void *father_data;
   /* stuff to allow other people to wait on me with xbt_thread_join */
-  int joinable:1,done:1;
+  int joinable:1, done:1;
   xbt_cond_t cond;
   xbt_mutex_t mutex;
 } s_xbt_thread_t;
@@ -36,11 +36,11 @@ typedef struct s_xbt_thread_ {
 static int xbt_thread_create_wrapper(int argc, char *argv[])
 {
   xbt_thread_t t =
-    (xbt_thread_t) SIMIX_process_get_data(SIMIX_process_self());
+      (xbt_thread_t) SIMIX_process_get_data(SIMIX_process_self());
   SIMIX_process_set_data(SIMIX_process_self(), t->father_data);
   (*t->code) (t->userparam);
   if (t->joinable) {
-    t->done=1;
+    t->done = 1;
     xbt_mutex_acquire(t->mutex);
     xbt_cond_broadcast(t->cond);
     xbt_mutex_release(t->mutex);
@@ -54,7 +54,7 @@ static int xbt_thread_create_wrapper(int argc, char *argv[])
 }
 
 xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
-                               void *param,int joinable)
+                               void *param, int joinable)
 {
   xbt_thread_t res = xbt_new0(s_xbt_thread_t, 1);
   res->name = xbt_strdup(name);
@@ -90,9 +90,10 @@ const char *xbt_thread_self_name(void)
 void xbt_thread_join(xbt_thread_t thread)
 {
   xbt_mutex_acquire(thread->mutex);
-  xbt_assert1(thread->joinable,"Cannot join on %p: wasn't created joinable",thread);
+  xbt_assert1(thread->joinable,
+              "Cannot join on %p: wasn't created joinable", thread);
   if (!thread->done) {
-    xbt_cond_wait(thread->cond,thread->mutex);
+    xbt_cond_wait(thread->cond, thread->mutex);
     xbt_mutex_release(thread->mutex);
   }
 
@@ -121,18 +122,14 @@ xbt_thread_t xbt_thread_self(void)
   return p ? SIMIX_process_get_data(p) : NULL;
 }
 
-void xbt_thread_yield(void) {
+void xbt_thread_yield(void)
+{
   SIMIX_process_yield();
 }
 
 /****** mutex related functions ******/
 struct s_xbt_mutex_ {
-
-  /* KEEP IT IN SYNC WITH src/simix/private.h::struct s_smx_mutex */
-  xbt_swag_t sleeping;          /* list of sleeping process */
-  int refcount;
-  /* KEEP IT IN SYNC WITH src/simix/private.h::struct s_smx_mutex */
-
+  s_smx_mutex_t mutex;
 };
 
 xbt_mutex_t xbt_mutex_init(void)
@@ -157,13 +154,7 @@ void xbt_mutex_destroy(xbt_mutex_t mutex)
 
 /***** condition related functions *****/
 struct s_xbt_cond_ {
-
-  /* KEEP IT IN SYNC WITH src/simix/private.h::struct s_smx_cond */
-  xbt_swag_t sleeping;          /* list of sleeping process */
-  smx_mutex_t mutex;
-  xbt_fifo_t actions;           /* list of actions */
-  /* KEEP IT IN SYNC WITH src/simix/private.h::struct s_smx_cond */
-
+  s_smx_cond_t cond;
 };
 
 xbt_cond_t xbt_cond_init(void)