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

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index 2befd04ab7..0dcca4cbe2 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -1,12 +1,10 @@
-/* $Id$ */
-
 /* xbt_synchro -- Synchronization virtualized depending on whether we are   */
 /*                in simulation or real life (act on simulated processes)   */
 
 /* 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. */
@@ -30,7 +28,7 @@ typedef struct s_xbt_thread_ {
   void *userparam;
   void *father_data;
   /* stuff to allow other people to wait on me with xbt_thread_join */
-  int joinable;
+  int joinable:1,done:1;
   xbt_cond_t cond;
   xbt_mutex_t mutex;
 } s_xbt_thread_t;
@@ -42,6 +40,7 @@ static int xbt_thread_create_wrapper(int argc, char *argv[])
   SIMIX_process_set_data(SIMIX_process_self(), t->father_data);
   (*t->code) (t->userparam);
   if (t->joinable) {
+    t->done=1;
     xbt_mutex_acquire(t->mutex);
     xbt_cond_broadcast(t->cond);
     xbt_mutex_release(t->mutex);
@@ -69,6 +68,7 @@ xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
                                                             ()), 0, NULL,
                                         /*props */ NULL);
   res->joinable = joinable;
+  res->done = 0;
   res->cond = xbt_cond_init();
   res->mutex = xbt_mutex_init();
   //   free(name);
@@ -91,8 +91,10 @@ 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_cond_wait(thread->cond,thread->mutex);
-  xbt_mutex_release(thread->mutex);
+  if (!thread->done) {
+    xbt_cond_wait(thread->cond,thread->mutex);
+    xbt_mutex_release(thread->mutex);
+  }
 
   xbt_mutex_destroy(thread->mutex);
   xbt_cond_destroy(thread->cond);