/* SimGrid Lua bindings */
#include "lua_private.h"
-#include "lua_state_cloner.h"
#include "lua_utils.h"
#include "xbt.h"
#include "simgrid/msg.h"
#include "surf/surfxml_parse.h"
#include <lauxlib.h>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
static lua_State* sglua_maestro_state;
int luaopen_simgrid(lua_State *L);
static void sglua_register_c_functions(lua_State *L);
-static int run_lua_code(int argc, char **argv);
/* ********************************************************************************* */
/* simgrid API */
/* ********************************************************************************* */
-/**
- * \brief Deploys your application.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (string): name of the deployment file to load
- */
-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;
-}
-
-/**
- * \brief Creates the platform.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (string): name of the platform file to load
- */
-static int create_environment(lua_State* L) {
-
- const char* file = luaL_checkstring(L, 1);
- XBT_DEBUG("Loading environment file %s", file);
- MSG_create_environment(file);
- return 0;
-}
-
/**
* \brief Prints a log string with debug level.
* \param L a Lua state
return 0;
}
-/**
- * \brief Runs your application.
- * \param L a Lua state
- * \return number of values returned to Lua
- */
-static int run(lua_State* L) {
-
- MSG_main();
- return 0;
-}
-
-/**
- * \brief Returns the current simulated time.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Return value (number): the simulated time
- */
-static int get_clock(lua_State* L) {
-
- lua_pushnumber(L, MSG_get_clock());
- return 1;
-}
-
-/**
- * \brief Cleans the simulation.
- * \param L a Lua state
- * \return number of values returned to Lua
- */
-static int simgrid_gc(lua_State * L)
-{
- // There is no need to cleanup the C world anymore, as it gets cleaned at system process closing automatically
- // Maybe at some point we'll want to reintroduce this, for example when encapsulating the simulation properly
- //if (sglua_is_maestro(L)) {
- // MSG_clean();
- //}
- return 0;
-}
-
-/*
- * Register platform for MSG
- */
-static int msg_register_platform(lua_State * L)
-{
- /* Tell Simgrid we don't wanna use its parser */
- //surf_parse = console_parse_platform;
- surf_parse_reset_callbacks();
- MSG_create_environment(NULL);
- return 0;
-}
+static int error(lua_State* L) {
-/*
- * Register platform for Simdag
- */
-static int sd_register_platform(lua_State * L)
-{
- //surf_parse = console_parse_platform_wsL07;
- surf_parse_reset_callbacks();
- SD_create_environment(NULL);
+ const char* str = luaL_checkstring(L, 1);
+ XBT_ERROR("%s", str);
return 0;
}
-/**
- * Register application for MSG
- */
-static int msg_register_application(lua_State * L)
-{
- MSG_function_register_default(run_lua_code);
- //surf_parse = console_parse_application;
- MSG_launch_application(NULL);
- return 0;
-}
+static int critical(lua_State* L) {
-static int console_init_application(lua_State *L) {
- MSG_function_register_default(run_lua_code);
- SIMIX_init_application();
+ const char* str = luaL_checkstring(L, 1);
+ XBT_CRITICAL("%s", str);
return 0;
}
-
static const luaL_Reg simgrid_functions[] = {
- {"create_environment", create_environment},
- {"launch_application", launch_application},
{"debug", debug},
{"info", info},
- {"run", run},
- {"get_clock", get_clock},
+ {"critical", critical},
+ {"error", error},
/* short names */
- {"platform", create_environment},
- {"application", launch_application},
/* methods to bypass XML parser */
- {"msg_register_platform", msg_register_platform},
- {"sd_register_platform", sd_register_platform},
- {"msg_register_application", msg_register_application},
- {"init_application", console_init_application},
{NULL, NULL}
};
*
* \param L the Lua state
*/
+
int luaopen_simgrid(lua_State *L)
{
XBT_DEBUG("luaopen_simgrid *****");
argv[argc--] = NULL;
/* Initialize the MSG core */
- MSG_init(&argc, argv);
- MSG_process_set_data_cleanup((void_f_pvoid_t) lua_close);
XBT_DEBUG("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
}
+ MSG_init(&argc, argv);
+ MSG_process_set_data_cleanup((void_f_pvoid_t) lua_close);
/* Keep the context mechanism informed of our lua world today */
sglua_maestro_state = L;
return 1;
}
-/**
- * \brief Returns whether a Lua state is the maestro state.
- * \param L a Lua state
- * \return true if this is maestro
- */
-int sglua_is_maestro(lua_State* L) {
- return L == sglua_maestro_state;
-}
-
-/**
- * \brief Returns the maestro state.
- * \return the maestro Lua state
- */
-lua_State* sglua_get_maestro(void) {
- return sglua_maestro_state;
-}
/**
* \brief Makes the core functions available to the Lua world.
static void sglua_register_core_functions(lua_State *L)
{
/* register the core C functions to lua */
- luaL_register(L, "simgrid", simgrid_functions);
- /* simgrid */
-
- /* set a finalizer that cleans simgrid, by adding to the simgrid module a
- * dummy userdata whose __gc metamethod calls MSG_clean() */
- lua_newuserdata(L, sizeof(void*));
- /* simgrid udata */
- lua_newtable(L);
- /* simgrid udata mt */
- lua_pushcfunction(L, simgrid_gc);
- /* simgrid udata mt simgrid_gc */
- lua_setfield(L, -2, "__gc");
- /* simgrid udata mt */
- lua_setmetatable(L, -2);
- /* simgrid udata */
- lua_setfield(L, -2, "__simgrid_loaded");
- /* simgrid */
- lua_pop(L, 1);
- /* -- */
+ luaL_newlib(L, simgrid_functions); /* simgrid */
+ lua_pushvalue(L, -1); /* simgrid simgrid */
+ lua_setglobal(L, "simgrid"); /* simgrid */
}
/**
static void sglua_register_c_functions(lua_State *L)
{
sglua_register_core_functions(L);
- sglua_register_task_functions(L);
- sglua_register_comm_functions(L);
sglua_register_host_functions(L);
- sglua_register_process_functions(L);
sglua_register_platf_functions(L);
}
-
-/**
- * \brief Runs a Lua function as a new simulated process.
- * \param argc number of arguments of the function
- * \param argv name of the Lua function and array of its arguments
- * \return result of the function
- */
-static int run_lua_code(int argc, char **argv)
-{
- XBT_DEBUG("Run lua code %s", argv[0]);
-
- /* create a new state, getting globals from maestro */
- lua_State *L = sglua_clone_maestro();
- MSG_process_set_data(MSG_process_self(), L);
-
- /* start the function */
- lua_getglobal(L, argv[0]);
- xbt_assert(lua_isfunction(L, -1),
- "There is no Lua function with name `%s'", argv[0]);
-
- /* push arguments onto the stack */
- int i;
- for (i = 1; i < argc; i++)
- lua_pushstring(L, argv[i]);
-
- /* call the function */
- XBT_ATTRIB_UNUSED int err;
- err = lua_pcall(L, argc - 1, 1, 0);
- xbt_assert(err == 0, "Error running function `%s': %s", argv[0],
- lua_tostring(L, -1));
-
- /* retrieve result */
- int res = 1;
- if (lua_isnumber(L, -1)) {
- res = lua_tonumber(L, -1);
- lua_pop(L, 1); /* pop returned value */
- }
-
- XBT_DEBUG("Execution of Lua code %s is over", (argv ? argv[0] : "(null)"));
-
- return res;
-}
-
-/**
- * \brief Returns a string corresponding to an MSG error code.
- * \param err an MSG error code
- * \return a string describing this error
- */
-const char* sglua_get_msg_error(msg_error_t err) {
-
- static const char* msg_errors[] = {
- NULL,
- "timeout",
- "transfer failure",
- "host failure",
- "task canceled"
- };
-
- return msg_errors[err];
-}
