Sanitize the includes of context objects declarations (was dupplicated and a bit...

[simgrid.git] / src / simix / smx_context_lua.c

diff --git a/src/simix/smx_context_lua.c b/src/simix/smx_context_lua.c
index 499a8ad..377cf13 100644 (file)
--- a/src/simix/smx_context_lua.c
+++ b/src/simix/smx_context_lua.c
@@ -7,29 +7,23 @@
 /* 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. */
 
 /* 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. */
 

-#include "private.h"
-#include "context_sysv_config.h"        /* loads context system definitions */
-#include "portable.h"
-#include <ucontext.h>           /* context relative declarations */
+#include "smx_context_private.h"

 #include <lua5.1/lauxlib.h>
 #include <lua5.1/lualib.h>
 
 /* lower this if you want to reduce the memory consumption  */
 #include <lua5.1/lauxlib.h>
 #include <lua5.1/lualib.h>
 
 /* lower this if you want to reduce the memory consumption  */

-#define STACK_SIZE 128*1024
+//#define STACK_SIZE 128*1024

 
 

-#ifdef HAVE_VALGRIND_VALGRIND_H
-#  include <valgrind/valgrind.h>
-#endif /* HAVE_VALGRIND_VALGRIND_H */
-
-
-// FIXME: better location for that
-extern void MSG_register(lua_State *L);
+//#ifdef HAVE_VALGRIND_VALGRIND_H
+//#  include <valgrind/valgrind.h>
+//#endif /* HAVE_VALGRIND_VALGRIND_H */

 
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smx_lua);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(lua);

 
 typedef struct s_smx_ctx_sysv {
 
 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 */
   char stack[STACK_SIZE];       /* the thread stack size */
   /* Ucontext info */
   ucontext_t uc;                /* the thread that execute the code */
   char stack[STACK_SIZE];       /* the thread stack size */


@@ -37,6 +31,7 @@ typedef struct s_smx_ctx_sysv {
 #ifdef HAVE_VALGRIND_VALGRIND_H
   unsigned int valgrind_stack_id;       /* the valgrind stack id */
 #endif
 #ifdef HAVE_VALGRIND_VALGRIND_H
   unsigned int valgrind_stack_id;       /* the valgrind stack id */
 #endif

+#endif /* KILLME */

 
   /* lua state info */
   lua_State *state;
 
   /* lua state info */
   lua_State *state;


@@ -53,91 +48,72 @@ smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv,
 static int smx_ctx_lua_factory_finalize(smx_context_factory_t *factory);
 
 static void smx_ctx_lua_free(smx_context_t context);
 static int smx_ctx_lua_factory_finalize(smx_context_factory_t *factory);
 
 static void smx_ctx_lua_free(smx_context_t context);

-
-static void smx_ctx_lua_start(smx_context_t context);
-

 static void smx_ctx_lua_stop(smx_context_t context);
 static void smx_ctx_lua_stop(smx_context_t context);

-

 static void smx_ctx_lua_suspend(smx_context_t context);
 static void smx_ctx_lua_suspend(smx_context_t context);

-
-static void 
-smx_ctx_lua_resume(smx_context_t old_context, smx_context_t new_context);
+static void smx_ctx_lua_resume(smx_context_t new_context);

 
 static void smx_ctx_sysv_wrapper(void);
 
 
 static void smx_ctx_sysv_wrapper(void);
 

-void SIMIX_ctx_lua_factory_loadfile(const char *file) {
-  if (luaL_loadfile(lua_state, file) || lua_pcall(lua_state, 0, 0, 0))
-    THROW2(unknown_error,0,"error while parsing %s: %s", file, lua_tostring(lua_state, -1));
-  INFO1("File %s loaded",file);
+/* Actually, the parameter is a lua_State*, but it got anonymized because that function
+ * is defined in a global header where lua may not be defined */
+void SIMIX_ctx_lua_factory_set_state(void* state) {
+  lua_state = state;

 }
 void SIMIX_ctx_lua_factory_init(smx_context_factory_t *factory) {
 
 }
 void SIMIX_ctx_lua_factory_init(smx_context_factory_t *factory) {
 

-  *factory = xbt_new0(s_smx_context_factory_t, 1);
+  smx_ctx_base_factory_init(factory);

 
   (*factory)->create_context = smx_ctx_lua_create_context;
   (*factory)->finalize = smx_ctx_lua_factory_finalize;
   (*factory)->free = smx_ctx_lua_free;
 
   (*factory)->create_context = smx_ctx_lua_create_context;
   (*factory)->finalize = smx_ctx_lua_factory_finalize;
   (*factory)->free = smx_ctx_lua_free;

-  (*factory)->start = smx_ctx_lua_start;

   (*factory)->stop = smx_ctx_lua_stop;
   (*factory)->suspend = smx_ctx_lua_suspend;
   (*factory)->resume = smx_ctx_lua_resume;
   (*factory)->name = "smx_lua_context_factory";
 
   (*factory)->stop = smx_ctx_lua_stop;
   (*factory)->suspend = smx_ctx_lua_suspend;
   (*factory)->resume = smx_ctx_lua_resume;
   (*factory)->name = "smx_lua_context_factory";
 

-  lua_state = lua_open();
-  luaL_openlibs(lua_state);
-  MSG_register(lua_state);

   INFO0("Lua Factory created");
 }
 
   INFO0("Lua Factory created");
 }
 

-static int smx_ctx_lua_factory_finalize(smx_context_factory_t * factory)
-{
+static int smx_ctx_lua_factory_finalize(smx_context_factory_t * factory) {

   lua_close(lua_state);
 
   lua_close(lua_state);
 

-  free(*factory);
-  *factory = NULL;
-  return 0;
+  return smx_ctx_base_factory_finalize(factory);

 }
 
 static smx_context_t 
 smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv, 
 }
 
 static smx_context_t 
 smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv, 

-    void_f_pvoid_t cleanup_func, void* cleanup_arg)
-{
+    void_f_pvoid_t cleanup_func, void* cleanup_arg) {
+

   smx_ctx_lua_t context = xbt_new0(s_smx_ctx_lua_t, 1);
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   smx_ctx_lua_t context = xbt_new0(s_smx_ctx_lua_t, 1);
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */

-  if(code){
-    context->code = code;
-
-    xbt_assert2(getcontext(&(context->uc)) == 0,
-        "Error in context saving: %d (%s)", errno, strerror(errno));
-
-    context->uc.uc_link = NULL;
+  if (code){
+    context->super.code = code;

 
 

-    context->uc.uc_stack.ss_sp =
-        pth_skaddr_makecontext(context->stack, STACK_SIZE);
-
-    context->uc.uc_stack.ss_size =
-        pth_sksize_makecontext(context->stack, STACK_SIZE);
+    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]);

 
 

-#ifdef HAVE_VALGRIND_VALGRIND_H
-    context->valgrind_stack_id =
-        VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp,
-            ((char *) context->uc.uc_stack.ss_sp) +
-            context->uc.uc_stack.ss_size);
-#endif /* HAVE_VALGRIND_VALGRIND_H */
+    /* start the coroutine in charge of running that code */
+    context->state = lua_newthread(lua_state);
+    context->ref = luaL_ref(lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected

 
 

+    /* Start the co-routine */
+    lua_getglobal(context->state,context->super.argv[0]);
+    xbt_assert1(lua_isfunction(context->state,-1),
+        "The lua function %s does not seem to exist",context->super.argv[0]);

 
 

-    context->state = lua_newthread(lua_state);
+    // push arguments onto the stack
+    int i;
+    for(i=1;i<context->super.argc;i++)
+      lua_pushstring(context->state,context->super.argv[i]);

 
 

-    context->ref = luaL_ref(lua_state, LUA_REGISTRYINDEX);
-    //lua_pop(lua_state,1);
+    // Call the function (in resume)
+    context->nargs = context->super.argc-1;

 
 

-    context->argc = argc;
-    context->argv = argv;
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
-    INFO1("Created context for function %s",argv[0]);

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


@@ -145,112 +121,48 @@ smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv,
   return (smx_context_t)context;
 }
 
   return (smx_context_t)context;
 }
 

-static void smx_ctx_lua_free(smx_context_t pcontext)
-{
-  int i;
-  smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;
-  if (context){
-#ifdef HAVE_VALGRIND_VALGRIND_H
-    VALGRIND_STACK_DEREGISTER(((smx_ctx_lua_t) context)->valgrind_stack_id);
-#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]);
-
-      free(context->argv);
-    }
+static void smx_ctx_lua_free(smx_context_t context) {

 
 

+  if (context){
+    DEBUG1("smx_ctx_lua_free_context(%p)",context);

 
 

-    /* destroy the context */
-    luaL_unref(lua_state,LUA_REGISTRYINDEX,context->ref );
-    free(context);
-  }
-}
-
-static void smx_ctx_lua_start(smx_context_t pcontext) {
-  smx_ctx_lua_t context = (smx_ctx_lua_t)pcontext;
-
-  makecontext(&context->uc, smx_ctx_sysv_wrapper, 0);
-
-  INFO1("Starting '%s'",context->argv[0]);
-
-  lua_getglobal(context->state,context->argv[0]);
-  if(!lua_isfunction(context->state,-1)) {
-    lua_pop(context->state,1);
-    THROW1(arg_error,0,"The lua function %s does not seem to exist",context->argv[0]);
+    /* let the lua garbage collector reclaim the thread used for the coroutine */
+    luaL_unref(lua_state,LUA_REGISTRYINDEX,((smx_ctx_lua_t)context)->ref );

   }
 
   }
 

-  // push arguments onto the stack
-  int i;
-  for(i=1;i<context->argc;i++)
-    lua_pushstring(context->state,context->argv[i]);
-
-  // Call the function
-  context->nargs = context->argc-1;
+  smx_ctx_base_free(context);

 }
 
 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;
 

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

 
 

-static void smx_ctx_sysv_wrapper()
-{
-  /*FIXME: I would like to avoid accesing simix_global to get the current
-    context by passing it as an argument of the wrapper function. The problem
-    is that this function is called from smx_ctx_sysv_start, and uses
-    makecontext for calling it, and the stupid posix specification states that
-    all the arguments of the function should be int(32 bits), making it useless
-    in 64-bit architectures where pointers are 64 bit long.
-   */
-  smx_ctx_lua_t context =
-      (smx_ctx_lua_t)simix_global->current_process->context;
-
-  (context->code) (context->argc, context->argv);
-
-  smx_ctx_lua_stop((smx_context_t)context);
+//  smx_ctx_lua_suspend(pcontext);

 }
 
 }
 

-
-static void smx_ctx_lua_suspend(smx_context_t context)
-{
-  int rv;
-  INFO1("Suspending %s",context->argv[0]);
-  lua_yield(((smx_ctx_lua_t)context)->state,0); // Should be the last line of the function
-  smx_ctx_lua_t prev_context = ((smx_ctx_lua_t) context)->prev;
-
-  ((smx_ctx_lua_t) context)->prev = NULL;
-
-  rv = swapcontext(&((smx_ctx_lua_t) context)->uc, &prev_context->uc);
-
-  xbt_assert0((rv == 0), "Context swapping failure");
-  //  INFO1("Suspended %s",context->argv[0]);
+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->super.argv[0]);
+  //lua_yield(context->state,0);
+
+  lua_getglobal(context->state,"doyield");
+  xbt_assert0(lua_isfunction(context->state,-1),
+      "Cannot find the coroutine.yield function...");
+  INFO0("Call coroutine.yield");
+  lua_call(context->state,0,0);
+  INFO0("Back from call to coroutine.yield");

 }
 
 static void 
 }
 
 static void 

-smx_ctx_lua_resume(smx_context_t old_context, smx_context_t new_context) {
-  int rv;
+smx_ctx_lua_resume(smx_context_t new_context) {

   smx_ctx_lua_t context = (smx_ctx_lua_t)new_context;
   smx_ctx_lua_t context = (smx_ctx_lua_t)new_context;

-
-  INFO1("Resuming %s",context->argv[0]);
-  lua_resume(context->state,context->nargs);
-  context->nargs = 0;
-  INFO1("Resumed %s",context->argv[0]);
-
-  ((smx_ctx_lua_t) new_context)->prev = (smx_ctx_lua_t)old_context;
-
-  rv = swapcontext(&((smx_ctx_lua_t)old_context)->uc,
-      &((smx_ctx_lua_t)new_context)->uc);
-
-  xbt_assert0((rv == 0), "Context swapping failure");
-
-  //  INFO1("Process %s done ?",context->argv[0]);
-  //  lua_resume(((smx_ctx_lua_t)new_context)->state,0);
+  DEBUG1("Resuming %s",context->super.argv[0]);
+  int ret = lua_resume(context->state,context->nargs);
+  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))
+    INFO2("Result of %s seem to be '%s'",context->super.argv[0],luaL_checkstring(context->state,-1));
+  context->nargs=0;

 }
 }