A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
efd9a01
..
377cf13
100644
(file)
--- a/
src/simix/smx_context_lua.c
+++ b/
src/simix/smx_context_lua.c
@@
-7,10
+7,7
@@
/* 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>
#include <lua5.1/lauxlib.h>
#include <lua5.1/lualib.h>
@@
-24,7
+21,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 */
@@
-63,7
+61,7
@@
void SIMIX_ctx_lua_factory_set_state(void* 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)->create_context = smx_ctx_lua_create_context;
(*factory)->finalize = smx_ctx_lua_factory_finalize;
@@
-79,9
+77,7
@@
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);
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
}
static smx_context_t
@@
-93,12
+89,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
+102,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");
@@
-125,44
+121,31
@@
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;
+static void smx_ctx_lua_free(smx_context_t context) {
if (context){
DEBUG1("smx_ctx_lua_free_context(%p)",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 */
/* 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;
}
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
+159,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;
}