X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc061ae1d3507d0e3b7d3569553b31cb6709702e..ba58c8b937ee08fc2b46be62a50b0b3ff0b0104f:/src/simix/smx_context_lua.c

diff --git a/src/simix/smx_context_lua.c b/src/simix/smx_context_lua.c
index efd9a01028..dc2b4412ae 100644
--- a/src/simix/smx_context_lua.c
+++ b/src/simix/smx_context_lua.c
@@ -1,39 +1,21 @@
-/* $Id$ */
-
 /* context_lua - implementation of context switching with lua coroutines */
 
-/* Copyright (c) 2004-2008 the SimGrid team. All right reserved */
+/* Copyright (c) 2010 the SimGrid team. All right reserved */
 
 /* 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  */
 //#define STACK_SIZE 128*1024
 
-//#ifdef HAVE_VALGRIND_VALGRIND_H
-//#  include <valgrind/valgrind.h>
-//#endif /* HAVE_VALGRIND_VALGRIND_H */
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(lua);
 
-typedef struct s_smx_ctx_sysv {
-  SMX_CTX_BASE_T;
-#ifdef KILLME
-  /* Ucontext info */
-  ucontext_t uc;                /* the thread that execute the code */
-  char stack[STACK_SIZE];       /* the thread stack size */
-  struct s_smx_ctx_sysv *prev;           /* the previous process */
-#ifdef HAVE_VALGRIND_VALGRIND_H
-  unsigned int valgrind_stack_id;       /* the valgrind stack id */
-#endif
-#endif /* KILLME */
+typedef struct s_smx_ctx_lua {
+  s_smx_ctx_sysv_t super;  /* Fields of super implementation */
 
   /* lua state info */
   lua_State *state;
@@ -63,7 +45,7 @@ void SIMIX_ctx_lua_factory_set_state(void* state) {
 }
 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;
@@ -79,26 +61,20 @@ void SIMIX_ctx_lua_factory_init(smx_context_factory_t *factory) {
 static int smx_ctx_lua_factory_finalize(smx_context_factory_t * factory) {
   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, 
     void_f_pvoid_t cleanup_func, void* cleanup_arg) {
 
-  smx_ctx_lua_t context = xbt_new0(s_smx_ctx_lua_t, 1);
+  smx_ctx_lua_t context = (smx_ctx_lua_t)smx_ctx_sysv_create_context_sized
+      (sizeof(s_smx_ctx_lua_t), code,argc,argv,cleanup_func,cleanup_arg);
+
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if (code){
-    context->code = code;
-
-    context->argc = argc;
-    context->argv = argv;
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
     INFO1("Created context for function %s",argv[0]);
 
     /* start the coroutine in charge of running that code */
@@ -106,17 +82,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 */
-    lua_getglobal(context->state,context->argv[0]);
+    lua_getglobal(context->state,context->super.super.argv[0]);
     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.super.argv[0]);
 
     // 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.super.argc;i++)
+      lua_pushstring(context->state,context->super.super.argv[i]);
 
     // Call the function (in resume)
-    context->nargs = context->argc-1;
+    context->nargs = context->super.super.argc-1;
 
   } else {
     INFO0("Created context for maestro");
@@ -125,44 +101,31 @@ smx_ctx_lua_create_context(xbt_main_func_t code, int argc, char** argv,
   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;
+static void smx_ctx_lua_free(smx_context_t context) {
 
   if (context){
     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]);
-
-      free(context->argv);
-    }
-
     /* let the lua garbage collector reclaim the thread used for the coroutine */
-    luaL_unref(lua_state,LUA_REGISTRYINDEX,context->ref );
-
-    free(context);
-    context = NULL;
+    luaL_unref(lua_state,LUA_REGISTRYINDEX,((smx_ctx_lua_t)context)->ref );
   }
+
+  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;
 
-  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.super.argv[0]);
+  if (context->super.super.cleanup_func)
+    (*context->super.super.cleanup_func) (context->super.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;
-  DEBUG1("Suspending '%s' (calling lua_yield)",context->argv[0]);
+  DEBUG1("Suspending '%s' (calling lua_yield)",context->super.super.argv[0]);
   //lua_yield(context->state,0);
 
   lua_getglobal(context->state,"doyield");
@@ -176,10 +139,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;
-  DEBUG1("Resuming %s",context->argv[0]);
+  DEBUG1("Resuming %s",context->super.super.argv[0]);
   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.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->argv[0],luaL_checkstring(context->state,-1));
+    INFO2("Result of %s seem to be '%s'",context->super.super.argv[0],luaL_checkstring(context->state,-1));
   context->nargs=0;
 }