* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lauxlib.h>
+#include <lualib.h>
#include "msg/msg.h"
#include "xbt.h"
/* helper functions */
/* ********************************************************************************* */
-static void stackDump (lua_State *L) {
+static void stackDump (const char *msg, lua_State *L) {
char buff[2048];
char *p=buff;
int i;
}
p+=sprintf(p," "); /* put a separator */
}
- INFO1("%s",buff);
+ INFO2("%s%s",msg,buff);
}
/** @brief ensures that a userdata on the stack is a task and returns the pointer inside the userdata */
luaL_checktype(L,index,LUA_TUSERDATA);
pi = (m_task_t*)luaL_checkudata(L,index,TASK_MODULE_NAME);
if(pi == NULL)
- luaL_typerror(L,index,TASK_MODULE_NAME);
+ luaL_typerror(L,index,TASK_MODULE_NAME);
tk = *pi;
if(!tk)
- luaL_error(L,"null Task");
+ luaL_error(L,"null Task");
return tk;
}
/** @brief leaves a new userdata on top of the stack, sets its metatable, and sets the Task pointer inside the userdata */
static m_task_t *pushTask (lua_State *L,m_task_t tk) {
- m_task_t *pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
+
+ m_task_t *pi = NULL;
+ pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
*pi=tk;
+
+ DEBUG1("push lua task with Name : %s \n",MSG_task_get_name(*pi));
luaL_getmetatable(L,TASK_MODULE_NAME);
lua_setmetatable(L,-2);
return pi;
}
-
/* ********************************************************************************* */
/* wrapper functions */
/* ********************************************************************************* */
const char *name=luaL_checkstring(L,1);
int comp_size = luaL_checkint(L,2);
int msg_size = luaL_checkint(L,3);
- // FIXME: data shouldn't be NULL I guess
- pushTask(L,MSG_task_create(name,comp_size,msg_size,NULL));
+ m_task_t msg_task = MSG_task_create(name,comp_size,msg_size,NULL);
+ m_task_t *lua_task = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
+ *lua_task = msg_task;
+ MSG_task_set_data(msg_task,lua_task);
+ pushTask(L,msg_task);
INFO0("Created task");
return 1;
}
static int Task_send(lua_State *L) {
m_task_t tk = checkTask(L,1);
const char *mailbox = luaL_checkstring(L,2);
- stackDump(L);fflush(stdout);fflush(stderr);
- int res = MSG_task_send(tk,mailbox);
- res++;//FIXME: check it instead of avoiding the warning
- stackDump(L);
+ lua_pop(L,1); // remove the string so that the task is on top of it
+ MSG_task_set_data(tk,L); // Copy my stack into the task, so that the receiver can copy the lua task directly
+ MSG_error_t res = MSG_task_send(tk,mailbox);
+ while (MSG_task_has_data(tk)) // Don't mess up with my stack: the receiver didn't copy the data yet
+ MSG_process_sleep(0); // yield
+
+ if (res != MSG_OK) switch(res) {
+ case MSG_TIMEOUT :
+ ERROR0("MSG_task_send failed : Timeout");
+ break;
+ case MSG_TRANSFER_FAILURE :
+ ERROR0("MSG_task_send failed : Transfer Failure");
+ break;
+ case MSG_HOST_FAILURE :
+ ERROR0("MSG_task_send failed : Host Failure ");
+ break;
+ default :
+ ERROR0("MSG_task_send failed : Unexpected error , please report this bug");
+ break;
+ }
return 0;
}
static int Task_recv(lua_State *L) {
m_task_t tk = NULL;
- //stackDump(L);
const char *mailbox = luaL_checkstring(L,1);
- int res = MSG_task_receive(&tk,mailbox);
- res++;//FIXME: check it instead of avoiding the warning
- INFO1("Task Name : >>>%s",MSG_task_get_name(tk));
- pushTask(L,tk);
- // stackDump(L);
+ MSG_error_t res = MSG_task_receive(&tk,mailbox);
+
+ lua_State *sender_stack = MSG_task_get_data(tk);
+ lua_xmove(sender_stack,L,1); // copy the data directly from sender's stack
+ MSG_task_set_data(tk,NULL);
+
+ if(res != MSG_OK) switch(res){
+ case MSG_TIMEOUT :
+ ERROR0("MSG_task_receive failed : Timeout");
+ break;
+ case MSG_TRANSFER_FAILURE :
+ ERROR0("MSG_task_receive failed : Transfer Failure");
+ break;
+ case MSG_HOST_FAILURE :
+ ERROR0("MSG_task_receive failed : Host Failure ");
+ break;
+ default :
+ ERROR0("MSG_task_receive failed : Unexpected error , please report this bug");
+ break;
+ }
+
return 1;
}
/*
* Environment related
*/
+extern lua_State *simgrid_lua_state;
+
+static int run_lua_code(int argc,char **argv) {
+ DEBUG1("Run lua code %s",argv[0]);
+// fprintf(stderr,"Run lua code %s\n", (argv ? argv[0] : "(null)"));
+ lua_State *L = lua_newthread(simgrid_lua_state);
+ int ref = luaL_ref(simgrid_lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
+ int res = 1;
+
+ /* Start the co-routine */
+ lua_getglobal(L,argv[0]);
+ xbt_assert1(lua_isfunction(L,-1),
+ "The lua function %s does not seem to exist",argv[0]);
+
+ // push arguments onto the stack
+ int i;
+ for(i=1;i<argc;i++)
+ lua_pushstring(L,argv[i]);
+
+ // Call the function (in resume)
+ xbt_assert2(lua_pcall(L, argc-1, 1, 0) == 0,
+ "error running function `%s': %s",argv[0], lua_tostring(L, -1));
+
+ /* retrieve result */
+ if (lua_isnumber(L, -1)) {
+ res = lua_tonumber(L, -1);
+ lua_pop(L, 1); /* pop returned value */
+ }
+
+ // cleanups
+ luaL_unref(simgrid_lua_state,LUA_REGISTRYINDEX,ref );
+ DEBUG1("Execution of lua code %s is over", (argv ? argv[0] : "(null)"));
+ return res;
+}
static int launch_application(lua_State *L) {
const char * file = luaL_checkstring(L,1);
+ MSG_function_register_default(run_lua_code);
MSG_launch_application(file);
return 0;
}
#include "simix/simix.h" //FIXME: KILLME when debugging on simix internals become useless
static int create_environment(lua_State *L) {
const char *file = luaL_checkstring(L,1);
- INFO1("Loading environment file %s",file);
+ DEBUG1("Loading environment file %s",file);
MSG_create_environment(file);
smx_host_t *hosts = SIMIX_host_get_table();
int i;
for (i=0;i<SIMIX_host_get_number();i++) {
- INFO1("We have an host %s", SIMIX_host_get_name(hosts[i]));
+ DEBUG1("We have an host %s", SIMIX_host_get_name(hosts[i]));
}
return 0;
/* module management functions */
/* ********************************************************************************* */
-void SIMIX_ctx_lua_factory_set_state(void *state);/* Hack: pass the L to our factory */
extern const char*xbt_ctx_factory_to_use; /*Hack: let msg load directly the right factory */
#define LUA_MAX_ARGS_COUNT 10 /* maximum amount of arguments we can get from lua on command line */
int luaopen_simgrid(lua_State* L); // Fuck gcc: we don't need that prototype
int luaopen_simgrid(lua_State* L) {
- xbt_ctx_factory_to_use = "lua";
+ //xbt_ctx_factory_to_use = "lua";
char **argv=malloc(sizeof(char*)*LUA_MAX_ARGS_COUNT);
int argc=1;
__FILE__,LUA_MAX_ARGS_COUNT-1);
argv[argc-1] = (char*)luaL_checkstring(L,-1);
lua_pop(L,1);
- INFO1("Got command line argument %s from lua",argv[argc-1]);
+ DEBUG1("Got command line argument %s from lua",argv[argc-1]);
}
}
argv[argc--]=NULL;
/* Initialize the MSG core */
MSG_global_init(&argc,argv);
- INFO1("Still %d arguments on command line",argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+ DEBUG1("Still %d arguments on command line",argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
/* register the core C functions to lua */
luaL_register(L, "simgrid", simgrid_funcs);
lua_pop(L,1); //drop metatable
/* Keep the context mechanism informed of our lua world today */
- SIMIX_ctx_lua_factory_set_state(L);
+ simgrid_lua_state = L;
return 1;
}