X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0b1cd463d680c1690999e7066fcc75b2c903752..169edc40a9d6aac50da8647a98df1e2b7cd92727:/src/xbt/context.c

diff --git a/src/xbt/context.c b/src/xbt/context.c
index a4f1096b65..6ea5172a88 100644
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -11,11 +11,11 @@
 
 #include "portable.h"
 #include "context_private.h"
-#include "xbt/error.h"
+#include "xbt/log.h"
 #include "xbt/dynar.h"
 #include "gras_config.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(context, xbt, "Context");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ctx, xbt, "Context");
 
 #define VOIRP(expr) DEBUG1("  {" #expr " = %p }", expr)
 
@@ -35,8 +35,6 @@ static xbt_swag_t context_living = NULL;
 
 static void __xbt_context_yield(xbt_context_t context)
 {
-  int return_value = 0;
-
   xbt_assert0(current_context,"You have to call context_init() first.");
   
   DEBUG2("--------- current_context (%p) is yielding to context(%p) ---------",
@@ -65,6 +63,9 @@ static void __xbt_context_yield(xbt_context_t context)
   VOIRP(context);
   if(context) VOIRP(context->save);
   if (context) {
+
+    int return_value = 0;
+
     if(context->save==NULL) {
       DEBUG0("**** Yielding to somebody else ****");
       DEBUG2("Saving current_context value (%p) to context(%p)->save",current_context,context);
@@ -99,44 +100,68 @@ static void xbt_context_destroy(xbt_context_t context)
   pthread_mutex_destroy(&(context->mutex));
   pthread_cond_destroy(&(context->cond));
 #endif
+  if(context->exception) free(context->exception);
   free(context);
   return;
 }
 
-static void *__context_wrapper(void *c)
+static void __context_exit(xbt_context_t context ,int value)
 {
-  xbt_context_t context = c;
   int i;
+  DEBUG0("Freeing arguments");
+  for(i=0;i<context->argc; i++) 
+    if(context->argv[i]) free(context->argv[i]);
+  if(context->argv) free(context->argv);
+
+  if(context->cleanup_func) {
+    DEBUG0("Calling cleanup function");
+    context->cleanup_func(context->cleanup_arg);
+  }
 
+  DEBUG0("Putting context in the to_destroy set");
+  xbt_swag_remove(context, context_living);
+  xbt_swag_insert(context, context_to_destroy);
+  DEBUG0("Context put in the to_destroy set");
+
+  DEBUG0("Yielding");
 #ifdef USE_PTHREADS
-  DEBUG0("**** Lock ****");
+  DEBUG0("**** Locking ****");
   pthread_mutex_lock(&(context->mutex));
+  DEBUG0("**** Updating current_context ****");
+  current_context = context;
   DEBUG0("**** Releasing the prisonner ****");
+  pthread_cond_signal(&(context->cond));  
+  DEBUG0("**** Unlocking ****");
+  pthread_mutex_unlock(&(context->mutex));
+  DEBUG0("**** Exiting ****");
+  pthread_exit(0);
+#else
+  __xbt_context_yield(context);
+#endif
+  xbt_assert0(0,"You can't be here!");
+}
+
+static void *__context_wrapper(void *c)
+{
+  xbt_context_t context = c;
+
+#ifdef USE_PTHREADS
+  DEBUG2("**[%p:%p]** Lock ****",context,(void*)pthread_self());
+  pthread_mutex_lock(&(context->mutex));
+  DEBUG2("**[%p:%p]** Releasing the prisonner ****",context,(void*)pthread_self());
   pthread_cond_signal(&(context->cond));
-  DEBUG0("**** Going to Jail ****");
+  DEBUG2("**[%p:%p]** Going to Jail ****",context,(void*)pthread_self());
   pthread_cond_wait(&(context->cond), &(context->mutex));
-  DEBUG0("**** Unlocking ****");
+  DEBUG2("**[%p:%p]** Unlocking ****",context,(void*)pthread_self());
   pthread_mutex_unlock(&(context->mutex));
 #endif
 
   if(context->startup_func)
     context->startup_func(context->startup_arg);
 
-   DEBUG0("Calling the main function");
-  (context->code) (context->argc,context->argv);
-
-  for(i=0;i<context->argc; i++) 
-    if(context->argv[i]) free(context->argv[i]);
-  if(context->argv) free(context->argv);
-
-  if(context->cleanup_func)
-    context->cleanup_func(context->cleanup_arg);
-
-  xbt_swag_remove(context, context_living);
-  xbt_swag_insert(context, context_to_destroy);
+  DEBUG0("Calling the main function");
 
-  __xbt_context_yield(context);
-  xbt_assert0(0,"You're cannot be here!");
+  __context_exit(context, (context->code) (context->argc,context->argv));
   return NULL;
 }
 
@@ -147,9 +172,16 @@ static ex_ctx_t *__context_ex_ctx(void)
 }
 
 /* callback: termination */
-static void __context_ex_terminate(ex_t *e)
-{
-  exit(e->value);
+static void __context_ex_terminate(xbt_ex_t *e) {
+  xbt_ex_display(e);
+
+  abort();
+   /* FIXME: there should be a configuration variable to choose this
+  if(current_context!=init_context) 
+    __context_exit(current_context, e->value);
+  else
+    abort();
+    */
 }
 
 /** \name Functions 
@@ -197,14 +229,15 @@ void xbt_context_start(xbt_context_t context)
 {
 #ifdef USE_PTHREADS
   /* Launch the thread */
-  DEBUG0("**** Locking ****");
+  DEBUG1("**[%p]** Locking ****",context);
   pthread_mutex_lock(&(context->mutex));
-  DEBUG0("**** Pthread create ****");
+  DEBUG1("**[%p]** Pthread create ****",context);
   xbt_assert0(!pthread_create(context->thread, NULL, __context_wrapper, context),
 	      "Unable to create a thread.");
-  DEBUG0("**** Going to jail ****");
+  DEBUG2("**[%p]** Pthread created : %p ****",context,(void*)(*(context->thread)));
+  DEBUG1("**[%p]** Going to jail ****",context);
   pthread_cond_wait(&(context->cond), &(context->mutex));
-  DEBUG0("**** Unlocking ****");
+  DEBUG1("**[%p]** Unlocking ****",context);
   pthread_mutex_unlock(&(context->mutex));  
 #else
   makecontext (&(context->uc), (void (*) (void)) __context_wrapper,
@@ -284,6 +317,7 @@ void xbt_context_yield(void)
  */
 void xbt_context_schedule(xbt_context_t context)
 {
+  DEBUG1("Scheduling %p",context);
   xbt_assert0((current_context==init_context),
 	      "You are not supposed to run this function here!");
   __xbt_context_yield(context);
@@ -320,7 +354,6 @@ void xbt_context_free(xbt_context_t context)
   for(i=0;i<context->argc; i++) 
     if(context->argv[i]) free(context->argv[i]);
   if(context->argv) free(context->argv);
-  if(context->exception) free(context->exception);
   
   if(context->cleanup_func)
     context->cleanup_func(context->cleanup_arg);