X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/34c6518ab6cdb0b402cca01ac045561cba9bd009..b77b6baea7aa7e0d4e2fe4772a850af6dbf233d7:/src/xbt/xbt_context_thread.c

diff --git a/src/xbt/xbt_context_thread.c b/src/xbt/xbt_context_thread.c
index 8e54725e3b..bc29e1c572 100644
--- a/src/xbt/xbt_context_thread.c
+++ b/src/xbt/xbt_context_thread.c
@@ -14,6 +14,7 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_context);
 
 typedef struct s_xbt_ctx_thread {
   XBT_CTX_BASE_T;
@@ -35,29 +36,17 @@ static int
 xbt_ctx_thread_factory_create_master_context(xbt_context_t * maestro);
 
 static int xbt_ctx_thread_factory_finalize(xbt_context_factory_t * factory);
-
 static void xbt_ctx_thread_free(xbt_context_t context);
-
 static void xbt_ctx_thread_kill(xbt_context_t context);
-
 static void xbt_ctx_thread_schedule(xbt_context_t context);
-
 static void xbt_ctx_thread_yield(void);
-
 static void xbt_ctx_thread_start(xbt_context_t context);
-
 static void xbt_ctx_thread_stop(int exit_code);
-
 static void xbt_ctx_thread_swap(xbt_context_t context);
-
 static void xbt_ctx_thread_schedule(xbt_context_t context);
-
 static void xbt_ctx_thread_yield(void);
-
 static void xbt_ctx_thread_suspend(xbt_context_t context);
-
 static void xbt_ctx_thread_resume(xbt_context_t context);
-
 static void *xbt_ctx_thread_wrapper(void *param);
 
 void xbt_ctx_thread_factory_init(xbt_context_factory_t * factory)
@@ -75,6 +64,7 @@ static int
 xbt_ctx_thread_factory_create_master_context(xbt_context_t * maestro)
 {
   *maestro = (xbt_context_t) xbt_new0(s_xbt_ctx_thread_t, 1);
+  (*maestro)->name = (char*)"maestro";
   return 0;
 }
 
@@ -95,6 +85,7 @@ xbt_ctx_thread_factory_create_context(const char *name, xbt_main_func_t code,
 {
   xbt_ctx_thread_t context = xbt_new0(s_xbt_ctx_thread_t, 1);
 
+  VERB1("Create context %s",name);
   context->code = code;
   context->name = xbt_strdup(name);
   context->begin = xbt_os_sem_init(0);
@@ -148,6 +139,7 @@ static void xbt_ctx_thread_free(xbt_context_t context)
 
 static void xbt_ctx_thread_kill(xbt_context_t context)
 {
+  DEBUG1("Kill context '%s'",context->name);
   context->iwannadie = 1;
   xbt_ctx_thread_swap(context);
 }
@@ -163,6 +155,7 @@ static void xbt_ctx_thread_kill(xbt_context_t context)
  */
 static void xbt_ctx_thread_schedule(xbt_context_t context)
 {
+  DEBUG1("Schedule context '%s'",context->name);
   xbt_assert0((current_context == maestro_context),
               "You are not supposed to run this function here!");
   xbt_ctx_thread_swap(context);
@@ -178,6 +171,7 @@ static void xbt_ctx_thread_schedule(xbt_context_t context)
  */
 static void xbt_ctx_thread_yield(void)
 {
+  DEBUG1("Yield context '%s'",current_context->name);
   xbt_assert0((current_context != maestro_context),
               "You are not supposed to run this function here!");
   xbt_ctx_thread_swap(current_context);
@@ -187,6 +181,7 @@ static void xbt_ctx_thread_start(xbt_context_t context)
 {
   xbt_ctx_thread_t ctx_thread = (xbt_ctx_thread_t) context;
 
+  DEBUG1("Start context '%s'",context->name);
   /* create and start the process */
   ctx_thread->thread =
     xbt_os_thread_create(ctx_thread->name, xbt_ctx_thread_wrapper,
@@ -198,6 +193,7 @@ static void xbt_ctx_thread_start(xbt_context_t context)
 
 static void xbt_ctx_thread_stop(int exit_code)
 {
+  /* please no debug here: our procdata was already free'd */
   if (current_context->cleanup_func)
     ((*current_context->cleanup_func)) (current_context->cleanup_arg);
 
@@ -212,7 +208,8 @@ static void xbt_ctx_thread_stop(int exit_code)
 }
 
 static void xbt_ctx_thread_swap(xbt_context_t context)
-{
+{ 
+  DEBUG2("Swap context: '%s' -> '%s'",current_context->name,context->name);
   if ((current_context != maestro_context) && !context->iwannadie) {
     /* (0) it's not the scheduler and the process doesn't want to die, it just wants to yield */
 
@@ -270,6 +267,7 @@ static void *xbt_ctx_thread_wrapper(void *param)
 
 static void xbt_ctx_thread_suspend(xbt_context_t context)
 {
+  DEBUG1("Suspend context '%s'",context->name);
   /* save the current context */
   xbt_context_t self = current_context;
 
@@ -285,6 +283,7 @@ static void xbt_ctx_thread_suspend(xbt_context_t context)
 
 static void xbt_ctx_thread_resume(xbt_context_t context)
 {
+  DEBUG1("Resume context '%s'",context->name);
   /* save the current context */
   xbt_context_t self = current_context;