X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f42885d1fe3c944178e9cbceb2074ca069b3959..d74bb413a4b25a580d7cfc96065b638292a2e679:/src/bindings/lua/simgrid_lua.c diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index f162819757..7e442ff138 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -15,20 +15,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings"); #define TASK_MODULE_NAME "simgrid.Task" +#define HOST_MODULE_NAME "simgrid.Host" /* ********************************************************************************* */ /* 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; int top = lua_gettop(L); - void *ptr; + fflush(stdout); p+=sprintf(p,"STACK(top=%d): ",top); + for (i = 1; i <= top; i++) { /* repeat for each level */ + int t = lua_type(L, i); switch (t) { @@ -44,116 +47,155 @@ static void stackDump (lua_State *L) { p+=sprintf(p,"%g", lua_tonumber(L, i)); break; + case LUA_TTABLE: + p+=sprintf(p, "Table"); + break; + default: /* other values */ - if ((ptr = luaL_checkudata(L,i,TASK_MODULE_NAME))) { + p+=sprintf(p, "???"); +/* if ((ptr = luaL_checkudata(L,i,TASK_MODULE_NAME))) { p+=sprintf(p,"task"); } else { p+=printf(p,"%s", lua_typename(L, t)); - } + }*/ break; } p+=sprintf(p," "); /* put a separator */ } - DEBUG1("%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 */ static m_task_t checkTask (lua_State *L,int index) { m_task_t *pi,tk; - luaL_checktype(L,index,LUA_TUSERDATA); - pi = (m_task_t*)luaL_checkudata(L,index,TASK_MODULE_NAME); + luaL_checktype(L,index,LUA_TTABLE); + lua_getfield(L,index,"__simgrid_task"); + pi = (m_task_t*)luaL_checkudata(L,-1,TASK_MODULE_NAME); if(pi == NULL) luaL_typerror(L,index,TASK_MODULE_NAME); tk = *pi; if(!tk) luaL_error(L,"null Task"); + lua_pop(L,1); 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,int flag) { - +// NOT USED +/*static m_task_t *pushTask (lua_State *L,m_task_t tk) { m_task_t *pi = NULL; - if ( flag == 0) - pi = (m_task_t*)MSG_task_get_data(tk);//(m_task_t*)lua_newuserdata(L,sizeof(m_task_t)); - else if ( flag == 1) - { - pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t)); - *pi=tk; - - } - - //*pi=tk; - printf("push lua task with Name : %s \n",MSG_task_get_name(*pi)); + 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 */ /* ********************************************************************************* */ +/** + * Task + */ + static int Task_new(lua_State* L) { 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)); + INFO0("Creating task"); m_task_t msg_task = MSG_task_create(name,comp_size,msg_size,NULL); + lua_newtable (L); /* create a table, put the userdata on top of it */ 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,0); - INFO0("Created task"); + luaL_getmetatable(L,TASK_MODULE_NAME); + lua_setmetatable(L,-2); + lua_setfield (L, -2, "__simgrid_task"); /* put the userdata as field of the table */ + /* remove the args from the stack */ + lua_remove(L,1); + lua_remove(L,1); + lua_remove(L,1); return 1; } static int Task_get_name(lua_State *L) { - m_task_t tk = checkTask(L,1); + m_task_t tk = checkTask(L,-1); lua_pushstring(L,MSG_task_get_name(tk)); return 1; } static int Task_computation_duration(lua_State *L){ - m_task_t tk = checkTask(L,1); + m_task_t tk = checkTask(L,-1); lua_pushnumber(L,MSG_task_get_compute_duration (tk)); return 1; } static int Task_execute(lua_State *L){ - m_task_t tk = checkTask(L,1); + m_task_t tk = checkTask(L,-1); int res = MSG_task_execute(tk); lua_pushnumber(L,res); return 1; } static int Task_destroy(lua_State *L) { - m_task_t tk = checkTask(L,1); + m_task_t tk = checkTask(L,-1); int res = MSG_task_destroy(tk); lua_pushnumber(L,res); return 1; } static int Task_send(lua_State *L) { - m_task_t tk = checkTask(L,1); - const char *mailbox = luaL_checkstring(L,2); - int res = MSG_task_send(tk,mailbox); - res++;//FIXME: check it instead of avoiding the warning + //stackDump("send ",L); + m_task_t tk = checkTask(L,-2); + const char *mailbox = luaL_checkstring(L,-1); + 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_get_data(tk)!=NULL) // 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; - const char *mailbox = luaL_checkstring(L,1); - int res = MSG_task_receive(&tk,mailbox); - if (MSG_task_has_data(tk)) printf("Receive The Task with Name : %s \n",MSG_task_get_name(tk)); - MSG_task_ref(tk); //FIXME: kill it once a ctask cannot be in more than one luatask anymore - res++;//FIXME: check it instead of avoiding the warning - DEBUG1("Task Name : >>>%s",MSG_task_get_name(tk)); - //lua_pushlightuserdata(L,MSG_task_get_data(tk)); - pushTask(L,tk,1); + const char *mailbox = luaL_checkstring(L,-1); + 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; } @@ -168,9 +210,8 @@ static const luaL_reg Task_methods[] = { {0,0} }; static int Task_gc(lua_State *L) { - m_task_t tk=checkTask(L,1); + m_task_t tk=checkTask(L,-1); if (tk) MSG_task_destroy(tk); - //printf("GoodBye Task(%p)\n",lua_touserdata(L,1)); return 0; } @@ -179,13 +220,89 @@ static int Task_tostring(lua_State *L) { return 1; } - static const luaL_reg Task_meta[] = { {"__gc", Task_gc}, {"__tostring", Task_tostring}, {0,0} }; +/** + * Host + */ +static m_host_t checkHost (lua_State *L,int index) { + m_host_t *pi,ht; + luaL_checktype(L,index,LUA_TTABLE); + lua_getfield(L,index,"__simgrid_host"); + pi = (m_host_t*)luaL_checkudata(L,-1,HOST_MODULE_NAME); + if(pi == NULL) + luaL_typerror(L,index,HOST_MODULE_NAME); + ht = *pi; + if(!ht) + luaL_error(L,"null Host"); + lua_pop(L,1); + return ht; +} + + +static int Host_get_by_name(lua_State *L) +{ + const char *name=luaL_checkstring(L,1); + DEBUG0("Getting Host from name..."); + m_host_t msg_host = MSG_get_host_by_name(name); + if (!msg_host) + { + luaL_error(L,"null Host : MSG_get_host_by_name failled"); + } + lua_newtable (L); /* create a table, put the userdata on top of it */ + m_host_t *lua_host = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t)); + *lua_host = msg_host; + luaL_getmetatable(L,HOST_MODULE_NAME); + lua_setmetatable(L,-2); + lua_setfield (L, -2, "__simgrid_host"); /* put the userdata as field of the table */ + /* remove the args from the stack */ + lua_remove(L,1); + return 1; +} + + +static int Host_get_name(lua_State *L) { + m_host_t ht = checkHost(L,-1); + lua_pushstring(L,MSG_host_get_name(ht)); + return 1; +} + +static int Host_number(lua_State *L) { + lua_pushnumber(L,MSG_get_host_number()); + return 1; +} + + +static const luaL_reg Host_methods[] = { + {"getByName", Host_get_by_name}, + {"name", Host_get_name}, + {"number", Host_number}, + {0,0} +}; + +static int Host_gc(lua_State *L) +{ + m_host_t ht = checkHost(L,-1); + if (ht) ht = NULL; + return 0; +} + +static int Host_tostring(lua_State *L) +{ + lua_pushfstring(L,"Host :%p",lua_touserdata(L,1)); + return 1; +} + +static const luaL_reg Host_meta[] = { + {"__gc", Host_gc}, + {"__tostring", Host_tostring}, + {0,0} +}; + /* * Environment related */ @@ -193,7 +310,6 @@ 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; @@ -316,7 +432,7 @@ int luaopen_simgrid(lua_State* L) { /* register the core C functions to lua */ luaL_register(L, "simgrid", simgrid_funcs); - /* register the tasks to lua */ + /* register the task methods to lua */ luaL_openlib(L,TASK_MODULE_NAME,Task_methods,0); //create methods table,add it to the globals luaL_newmetatable(L,TASK_MODULE_NAME); //create metatable for Task,add it to the Lua registry luaL_openlib(L,0,Task_meta,0);// fill metatable @@ -328,6 +444,18 @@ int luaopen_simgrid(lua_State* L) { lua_rawset(L,-3); //hide metatable:metatable.__metatable = methods lua_pop(L,1); //drop metatable + /* register the hosts methods to lua*/ + luaL_openlib(L,HOST_MODULE_NAME,Host_methods,0); + luaL_newmetatable(L,HOST_MODULE_NAME); + luaL_openlib(L,0,Host_meta,0); + lua_pushliteral(L,"__index"); + lua_pushvalue(L,-3); + lua_rawset(L,-3); + lua_pushliteral(L,"__metatable"); + lua_pushvalue(L,-3); + lua_rawset(L,-3); + lua_pop(L,1); + /* Keep the context mechanism informed of our lua world today */ simgrid_lua_state = L;