Kill MSG_WARNING and MSG_FATAL return codes

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

diff --git a/src/bindings/ruby_bindings.h b/src/bindings/ruby_bindings.h
index 04b93c2..77e6637 100644 (file)
--- a/src/bindings/ruby_bindings.h
+++ b/src/bindings/ruby_bindings.h
@@ -41,7 +41,7 @@
  * Context related stuff *
  * ********************* */
 typedef struct s_smx_ctx_ruby {
  * Context related stuff *
  * ********************* */
 typedef struct s_smx_ctx_ruby {

-  SMX_CTX_BASE_T;
+  s_smx_ctx_base_t super;  /* Fields of super implementation */

   VALUE process;   // The  Ruby Process Instance
   //...
 }s_smx_ctx_ruby_t,*smx_ctx_ruby_t;
   VALUE process;   // The  Ruby Process Instance
   //...
 }s_smx_ctx_ruby_t,*smx_ctx_ruby_t;

diff --git a/src/simix/private.h b/src/simix/private.h
index d58d6e5..bca6453 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -213,19 +213,16 @@ void SIMIX_context_mod_exit(void);
 /* the following function pointers types describe the interface that all context
    concepts must implement */
 
 /* the following function pointers types describe the interface that all context
    concepts must implement */
 

-/* each context type must contain this macro at its begining -- OOP in C :/ */
-#define SMX_CTX_BASE_T \
-  s_xbt_swag_hookup_t hookup; \
-  xbt_main_func_t code; \
-  int argc; \
-  char **argv; \
-  void_f_pvoid_t cleanup_func; \
-  void *cleanup_arg; \
-
-/* all other context types derive from this structure */
+/* each context type derive from this structure, so they must contain this structure
+ * at their begining -- OOP in C :/ */

 typedef struct s_smx_context {
 typedef struct s_smx_context {

-  SMX_CTX_BASE_T;
-} s_smx_context_t;
+  s_xbt_swag_hookup_t hookup;
+  xbt_main_func_t code;
+  int argc;
+  char **argv;
+  void_f_pvoid_t cleanup_func;
+  void *cleanup_arg;
+} s_smx_ctx_base_t;

 
 /* *********************** */
 /* factory type definition */
 
 /* *********************** */
 /* factory type definition */

diff --git a/src/simix/smx_context_java.c b/src/simix/smx_context_java.c
index d2f9ddb..5a59f78 100644 (file)
--- a/src/simix/smx_context_java.c
+++ b/src/simix/smx_context_java.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-

 /* context_java - implementation of context switching for java threads */
 
 /* Copyright (c) 2007-2008 the SimGrid team. All right reserved */
 /* context_java - implementation of context switching for java threads */
 
 /* Copyright (c) 2007-2008 the SimGrid team. All right reserved */


@@ -12,7 +10,7 @@
 #include "private.h"
 #include "smx_context_java.h"
 
 #include "private.h"
 #include "smx_context_java.h"
 

-XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)");

 
 static smx_context_t
 smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
 
 static smx_context_t
 smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv, 


@@ -57,8 +55,8 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){

-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
+    context->super.cleanup_func = cleanup_func;
+    context->super.cleanup_arg = cleanup_arg;

     context->jprocess = (jobject) code;
     context->jenv = get_current_thread_env();
     jprocess_start(((smx_ctx_java_t) context)->jprocess,
     context->jprocess = (jobject) code;
     context->jenv = get_current_thread_env();
     jprocess_start(((smx_ctx_java_t) context)->jprocess,

diff --git a/src/simix/smx_context_java.h b/src/simix/smx_context_java.h
index f646036..5e8e8ab 100644 (file)
--- a/src/simix/smx_context_java.h
+++ b/src/simix/smx_context_java.h
@@ -10,11 +10,11 @@
 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

-     typedef struct s_smx_ctx_java {
-       SMX_CTX_BASE_T;
-       jobject jprocess;        /* the java process instance binded with the msg process structure                                                      */
-       JNIEnv *jenv;            /* jni interface pointer associated to this thread                                                                                      */
-     } s_smx_ctx_java_t, *smx_ctx_java_t;
+typedef struct s_smx_ctx_java {
+  s_smx_ctx_base_t super;  /* Fields of super implementation */
+  jobject jprocess;        /* the java process instance binded with the msg process structure                                                      */
+  JNIEnv *jenv;            /* jni interface pointer associated to this thread                                                                                      */
+} s_smx_ctx_java_t, *smx_ctx_java_t;

 
 SG_END_DECL()
 #endif /* !_XBT_CONTEXT_JAVA_H */
 
 SG_END_DECL()
 #endif /* !_XBT_CONTEXT_JAVA_H */

diff --git a/src/simix/smx_context_lua.c b/src/simix/smx_context_lua.c
index efd9a01..5c3c3e9 100644 (file)
--- a/src/simix/smx_context_lua.c
+++ b/src/simix/smx_context_lua.c
@@ -24,7 +24,8 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(lua);
 
 typedef struct s_smx_ctx_sysv {
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(lua);
 
 typedef struct s_smx_ctx_sysv {

-  SMX_CTX_BASE_T;
+  s_smx_ctx_base_t super;  /* Fields of super implementation */
+

 #ifdef KILLME
   /* Ucontext info */
   ucontext_t uc;                /* the thread that execute the code */
 #ifdef KILLME
   /* Ucontext info */
   ucontext_t uc;                /* the thread that execute the code */


@@ -93,12 +94,12 @@ smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if (code){
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if (code){

-    context->code = code;
+    context->super.code = code;

 
 

-    context->argc = argc;
-    context->argv = argv;
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
+    context->super.argc = argc;
+    context->super.argv = argv;
+    context->super.cleanup_func = cleanup_func;
+    context->super.cleanup_arg = cleanup_arg;

     INFO1("Created context for function %s",argv[0]);
 
     /* start the coroutine in charge of running that code */
     INFO1("Created context for function %s",argv[0]);
 
     /* start the coroutine in charge of running that code */


@@ -106,17 +107,17 @@ smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv,
     context->ref = luaL_ref(lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
 
     /* Start the co-routine */
     context->ref = luaL_ref(lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
 
     /* Start the co-routine */

-    lua_getglobal(context->state,context->argv[0]);
+    lua_getglobal(context->state,context->super.argv[0]);

     xbt_assert1(lua_isfunction(context->state,-1),
     xbt_assert1(lua_isfunction(context->state,-1),

-        "The lua function %s does not seem to exist",context->argv[0]);
+        "The lua function %s does not seem to exist",context->super.argv[0]);

 
     // push arguments onto the stack
     int i;
 
     // push arguments onto the stack
     int i;

-    for(i=1;i<context->argc;i++)
-      lua_pushstring(context->state,context->argv[i]);
+    for(i=1;i<context->super.argc;i++)
+      lua_pushstring(context->state,context->super.argv[i]);

 
     // Call the function (in resume)
 
     // Call the function (in resume)

-    context->nargs = context->argc-1;
+    context->nargs = context->super.argc-1;

 
   } else {
     INFO0("Created context for maestro");
 
   } else {
     INFO0("Created context for maestro");


@@ -134,12 +135,12 @@ static void smx_ctx_lua_free(smx_context_t pcontext)
     DEBUG1("smx_ctx_lua_free_context(%p)",context);
 
     /* free argv */
     DEBUG1("smx_ctx_lua_free_context(%p)",context);
 
     /* free argv */

-    if (context->argv) {
-      for (i = 0; i < context->argc; i++)
-        if (context->argv[i])
-          free(context->argv[i]);
+    if (context->super.argv) {
+      for (i = 0; i < context->super.argc; i++)
+        if (context->super.argv[i])
+          free(context->super.argv[i]);

 
 

-      free(context->argv);
+      free(context->super.argv);

     }
 
     /* let the lua garbage collector reclaim the thread used for the coroutine */
     }
 
     /* let the lua garbage collector reclaim the thread used for the coroutine */


@@ -153,16 +154,16 @@ static void smx_ctx_lua_free(smx_context_t pcontext)
 static void smx_ctx_lua_stop(smx_context_t pcontext) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;
 
 static void smx_ctx_lua_stop(smx_context_t pcontext) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;
 

-  INFO1("Stopping '%s' (nothing to do)",context->argv[0]);
-  if (context->cleanup_func)
-    (*context->cleanup_func) (context->cleanup_arg);
+  INFO1("Stopping '%s' (nothing to do)",context->super.argv[0]);
+  if (context->super.cleanup_func)
+    (*context->super.cleanup_func) (context->super.cleanup_arg);

 
 //  smx_ctx_lua_suspend(pcontext);
 }
 
 static void smx_ctx_lua_suspend(smx_context_t pcontext) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;
 
 //  smx_ctx_lua_suspend(pcontext);
 }
 
 static void smx_ctx_lua_suspend(smx_context_t pcontext) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;

-  DEBUG1("Suspending '%s' (calling lua_yield)",context->argv[0]);
+  DEBUG1("Suspending '%s' (calling lua_yield)",context->super.argv[0]);

   //lua_yield(context->state,0);
 
   lua_getglobal(context->state,"doyield");
   //lua_yield(context->state,0);
 
   lua_getglobal(context->state,"doyield");


@@ -176,10 +177,10 @@ static void smx_ctx_lua_suspend(smx_context_t pcontext) {
 static void 
 smx_ctx_lua_resume(smx_context_t new_context) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)new_context;
 static void 
 smx_ctx_lua_resume(smx_context_t new_context) {
   smx_ctx_lua_t context = (smx_ctx_lua_t)new_context;

-  DEBUG1("Resuming %s",context->argv[0]);
+  DEBUG1("Resuming %s",context->super.argv[0]);

   int ret = lua_resume(context->state,context->nargs);
   int ret = lua_resume(context->state,context->nargs);

-  INFO3("Function %s yielded back with value %d %s",context->argv[0],ret,(ret==LUA_YIELD?"(ie, LUA_YIELD)":""));
+  INFO3("Function %s yielded back with value %d %s",context->super.argv[0],ret,(ret==LUA_YIELD?"(ie, LUA_YIELD)":""));

   if (lua_isstring(context->state,-1))
   if (lua_isstring(context->state,-1))

-    INFO2("Result of %s seem to be '%s'",context->argv[0],luaL_checkstring(context->state,-1));
+    INFO2("Result of %s seem to be '%s'",context->super.argv[0],luaL_checkstring(context->state,-1));

   context->nargs=0;
 }
   context->nargs=0;
 }

diff --git a/src/simix/smx_context_ruby.c b/src/simix/smx_context_ruby.c
index 8295eb3..3427d87 100644 (file)
--- a/src/simix/smx_context_ruby.c
+++ b/src/simix/smx_context_ruby.c
@@ -56,11 +56,11 @@ smx_ctx_ruby_create_context(xbt_main_func_t code,int argc,char** argv,
   /* if the user provided a function for the process , then use it
      Otherwise it's the context for maestro */
   if (code) {
   /* if the user provided a function for the process , then use it
      Otherwise it's the context for maestro */
   if (code) {

-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
+    context->super.cleanup_func = cleanup_func;
+    context->super.cleanup_arg = cleanup_arg;

     context->process = (VALUE)code;
     context->process = (VALUE)code;

-    context->argc=argc;
-    context->argv=argv;
+    context->super.argc=argc;
+    context->super.argv=argv;

 
     DEBUG1("smx_ctx_ruby_create_context(%s)...Done",argv[0]);
   }
 
     DEBUG1("smx_ctx_ruby_create_context(%s)...Done",argv[0]);
   }

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index fe0f7ac..242a962 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -22,7 +22,7 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 typedef struct s_smx_ctx_sysv {
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 typedef struct s_smx_ctx_sysv {

-  SMX_CTX_BASE_T;
+  s_smx_ctx_base_t super;       /* Fields of super implementation */

   ucontext_t uc;                /* the thread that execute the code */
   char stack[STACK_SIZE];       /* the thread stack size */
 #ifdef HAVE_VALGRIND_VALGRIND_H
   ucontext_t uc;                /* the thread that execute the code */
   char stack[STACK_SIZE];       /* the thread stack size */
 #ifdef HAVE_VALGRIND_VALGRIND_H


@@ -72,7 +72,7 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){

-    context->code = code;
+    context->super.code = code;

 
     xbt_assert2(getcontext(&(context->uc)) == 0,
         "Error in context saving: %d (%s)", errno, strerror(errno));
 
     xbt_assert2(getcontext(&(context->uc)) == 0,
         "Error in context saving: %d (%s)", errno, strerror(errno));


@@ -92,10 +92,10 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
             context->uc.uc_stack.ss_size);
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 
             context->uc.uc_stack.ss_size);
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 

-    context->argc = argc;
-    context->argv = argv;
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
+    context->super.argc = argc;
+    context->super.argv = argv;
+    context->super.cleanup_func = cleanup_func;
+    context->super.cleanup_arg = cleanup_arg;

 
     makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
   }
 
     makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
   }


@@ -114,12 +114,12 @@ static void smx_ctx_sysv_free(smx_context_t pcontext)
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 
     /* free argv */
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 
     /* free argv */

-    if (context->argv) {
-      for (i = 0; i < context->argc; i++)
-        if (context->argv[i])
-          free(context->argv[i]);
+    if (context->super.argv) {
+      for (i = 0; i < context->super.argc; i++)
+        if (context->super.argv[i])
+          free(context->super.argv[i]);

 
 

-      free(context->argv);
+      free(context->super.argv);

     }
 
     /* destroy the context */
     }
 
     /* destroy the context */


@@ -131,8 +131,8 @@ static void smx_ctx_sysv_stop(smx_context_t pcontext)
 {
   smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;
 
 {
   smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;
 

-  if (context->cleanup_func)
-    (*context->cleanup_func) (context->cleanup_arg);
+  if (context->super.cleanup_func)
+    (*context->super.cleanup_func) (context->super.cleanup_arg);

 
   smx_ctx_sysv_suspend(pcontext);
 }
 
   smx_ctx_sysv_suspend(pcontext);
 }


@@ -149,7 +149,7 @@ static void smx_ctx_sysv_wrapper()
   smx_ctx_sysv_t context = 
       (smx_ctx_sysv_t)simix_global->current_process->context;
 
   smx_ctx_sysv_t context = 
       (smx_ctx_sysv_t)simix_global->current_process->context;
 

-  (context->code) (context->argc, context->argv);
+  (context->super.code) (context->super.argc, context->super.argv);

 
   smx_ctx_sysv_stop((smx_context_t)context);
 }
 
   smx_ctx_sysv_stop((smx_context_t)context);
 }