From: cherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 14 Mar 2007 21:25:34 +0000 (+0000)
Subject: xbt_thread_join() function is now implemented
X-Git-Tag: v3.3~2085
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b4d4da7d43fb917b14ab7b7d1b9538ad65569844?ds=sidebyside

xbt_thread_join() function is now implemented


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3274 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/xbt/context.c b/src/xbt/context.c
index 4289178e4e..9b3dd1111a 100644
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -14,7 +14,7 @@
 #include "xbt/log.h"
 #include "xbt/dynar.h"
 #include "xbt/xbt_thread.h"
-#include <pthread.h> // I need pthread_join that is not yet available in xbt_thread.
+/*#include <pthread.h>*/ /* I need pthread_join that is not yet available in xbt_thread.*/
 
 #ifdef CONTEXT_THREADS
  /* This file (context.c) is only loaded in libsimgrid, not libgras.
@@ -107,8 +107,10 @@ static void xbt_context_free(xbt_context_t context)
 	if (!context) return;
 	DEBUG1("Freeing %p",context);
 #ifdef CONTEXT_THREADS
-	DEBUG1("\t joining %p",(void *)context->thread->t);
-	pthread_join(context->thread->t,NULL);
+	/*DEBUG1("\t joining %p",(void *)context->thread->t);*/
+	DEBUG1("\t joining %p",(void *)context->thread);
+	/*pthread_join(context->thread->t,NULL);*/
+	xbt_thread_join(context->thread,NULL);
 	DEBUG1("\t xbt_free %p",(void *)context->thread);
 	xbt_free(context->thread);
 	DEBUG1("\t mutex_destroy %p",(void *)context->mutex);