src/surf/simgrid_dtd.l
src/xbt/graphxml.l
+:e a
################################################
### Jedule
examples/simdag/scheduling/simgrid.jed
examples/msg/mc/bugged3
examples/msg/mc/random_test
examples/msg/chord/chord
+examples/msg/chord/chord_stateful
+examples/msg/chord/deployments
+examples/msg/chord/exp_*
examples/msg/token_ring/token_ring
examples/simdag/ex_sd_seq_access
examples/simdag/sd_seq_access
examples/msg/masterslave/masterslave_failure
examples/msg/masterslave/masterslave_forwarder
examples/msg/masterslave/masterslave_mailbox
+examples/msg/masterslave/masterslave_kill
+examples/msg/masterslave/masterslave_arg
examples/msg/migration/migration
examples/msg/parallel_task/parallel_task
examples/msg/parallel_task/test_ptask
examples/smpi/alltoallv
examples/smpi/sendrecv
examples/smpi/smpi_sendrecv
+examples/smpi/dsend
examples/smpi/mc_bugged1
examples/smpi/mc_bugged2
src/replay/replay
teshsuite/simdag/network/test_reinit_costs
teshsuite/simdag/platforms/basic_parsing_test
teshsuite/simdag/platforms/flatifier
+teshsuite/simdag/platforms/basic_tracing
+teshsuite/simdag/platforms/evaluate_get_route_time
+teshsuite/simdag/platforms/evaluate_parse_time
teshsuite/simdag/partask/test_comp_only_par
teshsuite/simdag/partask/test_comp_only_seq
teshsuite/xbt/log_large_test
set(IS_WINDOWS 1)
ENDIF(WIN32)
ELSE(CMAKE_CROSSCOMPILING)
+ file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+ file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
exec_program(
"${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
OUTPUT_VARIABLE COMPILE_mcsc_VAR)
- file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
if(NOT COMPILE_mcsc_VAR)
+ message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil)
+ else(NOT COMPILE_mcsc_VAR)
+ message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
endif(NOT COMPILE_mcsc_VAR)
file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
if(WIN32)
if(ARCH_32_BITS)
- set(makecontext_CPPFLAGS "-DTEST_makecontext")
+ set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
else(ARCH_32_BITS)
set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
endif(ARCH_32_BITS)
set(LUA_SRC
src/bindings/lua/simgrid_lua.c
- src/bindings/lua/lua_stub_generator.c
- src/bindings/lua/lua_console.c
+ src/bindings/lua/lua_task.c
+ src/bindings/lua/lua_comm.c
+ src/bindings/lua/lua_host.c
+ src/bindings/lua/lua_process.c
+ src/bindings/lua/lua_platf.c
src/bindings/lua/lua_utils.c
src/bindings/lua/lua_state_cloner.c
+ src/bindings/lua/lua_stub_generator.c
)
set(TRACING_SRC
if(NSIS_PATH)
ADD_CUSTOM_TARGET(nsis
COMMENT "Generating the SimGrid installor for Windows..."
- DEPENDS simgrid gras graphicator gras_stub_generator tesh simgrid-colorizer simgrid_update_xml
+ DEPENDS simgrid simgrid_shared gras graphicator gras_stub_generator tesh simgrid-colorizer simgrid_update_xml
COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
)
### Make Libs\r
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 \r
add_library(simgrid STATIC ${simgrid_sources})\r
+add_library(simgrid_shared SHARED ${simgrid_sources})\r
add_library(gras STATIC ${gras_sources})\r
\r
-set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"\r
- OUTPUT_NAME "gras")\r
-set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC" OUTPUT_NAME "simgrid")\r
+set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libgras_version} OUTPUT_NAME "gras")\r
+set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
+set_target_properties(simgrid_shared PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
\r
set(GRAS_DEP "ws2_32 -lpthread")\r
set(SIMGRID_DEP "ws2_32 -lpcre -lpthread")\r
+set(SIMGRID_SHARED_DEP "ws2_32 -lpthread")\r
\r
if(ARCH_32_BITS)\r
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")\r
message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")\r
endif(ARCH_32_BITS)\r
\r
+target_link_libraries(gras ${GRAS_DEP})\r
target_link_libraries(simgrid ${SIMGRID_DEP})\r
-target_link_libraries(gras ${GRAS_DEP})
\ No newline at end of file
+target_link_libraries(simgrid_shared ${SIMGRID_SHARED_DEP} ${PATH_PCRE_LIB})\r
+\r
+find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)\r
+message(STATUS "pexports: ${PEXPORTS_PATH}")\r
+if(PEXPORTS_PATH)\r
+add_custom_command(TARGET simgrid_shared POST_BUILD\r
+COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.ref)\r
+endif(PEXPORTS_PATH)
\ No newline at end of file
/* Set somes variables for Windows compilation */
#ifdef _XBT_DLL_EXPORT
- #define DLL_EXPORT
+ #ifndef DLL_EXPORT
+ #define DLL_EXPORT
+ #endif
#else
#ifdef _XBT_DLL_STATIC
- #define DLL_STATIC
+ #ifndef DLL_STATIC
+ #define DLL_STATIC
+ #endif
#else
- #define DLL_IMPORT
+ #ifndef DLL_EXPORT
+ #define DLL_IMPORT
+ #endif
#endif
#endif
setOutPath $INSTDIR\lib\r
file lib\libgras.@LIB_EXE@\r
file lib\libsimgrid.@LIB_EXE@\r
+ file /nonfatal lib\libsimgrid.dll\r
+ file /nonfatal lib\libsimgrid.dll.a\r
+ file /nonfatal lib\libsimgrid.ref\r
\r
#install headers\r
CreateDirectory $INSTDIR\include\r
check_predecessor_delay = 120
lookup_delay = 10
--- current node (don't worry, globals are duplicated in each process)
+-- current node (don't worry, globals are duplicated in each simulated process)
my_node = {
id = my_id,
next_finger_to_fix = 1,
-- - the id of a guy I know in the system (except for the first node)
function node(...)
- -- TODO simplify the parameters
+ -- TODO simplify the deployment file
local known_id
local args = {...}
my_node.id = tonumber(args[1])
local next_check_predecessor_date = now + check_predecessor_delay
local next_lookup_date = now + lookup_delay
- local task, success
+ local task, err
while now < max_simulation_time do
- task, success = simgrid.comm.test(my_node.comm_recv)
+ task, err = simgrid.comm.test(my_node.comm_recv)
if task then
-- I received a task: answer it
my_node.comm_recv = simgrid.task.irecv(my_node.id)
handle_task(task)
- elseif failed then
+ elseif err then
-- the communication has failed: nevermind
my_node.comm_recv = simgrid.task.irecv(my_node.id)
else
elseif now >= next_check_predecessor_date then
check_predecessor()
next_check_predecessor_date = simgrid.get_clock() + check_predecessor_delay
+
elseif now >= next_lookup_date then
random_lookup()
next_lookup_date = simgrid.get_clock() + lookup_delay
/* take care of DLL usage madness */
#ifdef _XBT_DLL_EXPORT
- #define DLL_EXPORT
+ #ifndef DLL_EXPORT
+ #define DLL_EXPORT
+ #endif
#else
#ifdef _XBT_DLL_STATIC
- #define DLL_STATIC
+ #ifndef DLL_STATIC
+ #define DLL_STATIC
+ #endif
#else
- #define DLL_IMPORT
+ #ifndef DLL_EXPORT
+ #define DLL_IMPORT
+ #endif
#endif
#endif
} s_smx_ctx_base_t;
/* methods of this class */
-void smx_ctx_base_factory_init(smx_context_factory_t *factory);
-int smx_ctx_base_factory_finalize(smx_context_factory_t *factory);
+XBT_PUBLIC(void) smx_ctx_base_factory_init(smx_context_factory_t *factory);
+XBT_PUBLIC(int) smx_ctx_base_factory_finalize(smx_context_factory_t *factory);
-smx_context_t
+XBT_PUBLIC(smx_context_t)
smx_ctx_base_factory_create_context_sized(size_t size,
xbt_main_func_t code, int argc,
char **argv,
void_pfn_smxprocess_t cleanup,
void* data);
-void smx_ctx_base_free(smx_context_t context);
-void smx_ctx_base_stop(smx_context_t context);
-smx_context_t smx_ctx_base_self(void);
-void *smx_ctx_base_get_data(smx_context_t context);
+XBT_PUBLIC(void) smx_ctx_base_free(smx_context_t context);
+XBT_PUBLIC(void) smx_ctx_base_stop(smx_context_t context);
+XBT_PUBLIC(smx_context_t) smx_ctx_base_self(void);
+XBT_PUBLIC(void) *smx_ctx_base_get_data(smx_context_t context);
-XBT_INLINE xbt_dynar_t SIMIX_process_get_runnable(void);
+XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void);
/* parallelism */
XBT_INLINE int SIMIX_context_is_parallel(void);
--- /dev/null
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights 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 "lua_private.h"
+#include <lauxlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_comm, bindings, "Lua bindings (comm module)");
+
+#define COMM_MODULE_NAME "simgrid.comm"
+
+/* ********************************************************************************* */
+/* simgrid.comm API */
+/* ********************************************************************************* */
+
+/**
+ * \brief Ensures that a value in the stack is a comm and returns it.
+ * \param L a Lua state
+ * \param index an index in the Lua stack
+ * \return the C comm
+ */
+msg_comm_t sglua_check_comm(lua_State* L, int index)
+{
+ msg_comm_t comm = *((msg_comm_t*) luaL_checkudata(L, index, COMM_MODULE_NAME));
+ return comm;
+}
+
+/**
+ * \brief Pushes a comm onto the stack.
+ * \param L a Lua state
+ * \param comm a comm
+ */
+void sglua_push_comm(lua_State* L, msg_comm_t comm)
+{
+ msg_comm_t* userdata = (msg_comm_t*) lua_newuserdata(L, sizeof(msg_comm_t));
+ /* comm */
+ *userdata = comm;
+ luaL_getmetatable(L, COMM_MODULE_NAME);
+ /* comm mt */
+ lua_setmetatable(L, -2);
+ /* comm */
+}
+
+/**
+ * \brief Blocks the current process until a communication is finished.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (comm): a comm (previously created by isend or irecv)
+ * - Argument 2 (number, optional): timeout (default is no timeout)
+ * - Return values (task or nil + string): in case of success, returns the task
+ * received if you are the receiver and nil if you are the sender. In case of
+ * failure, returns nil plus an error string.
+ */
+static int l_comm_wait(lua_State* L) {
+
+ msg_comm_t comm = sglua_check_comm(L, 1);
+ double timeout = -1;
+ if (lua_gettop(L) >= 2) {
+ timeout = luaL_checknumber(L, 2);
+ }
+ /* comm ... */
+ MSG_error_t res = MSG_comm_wait(comm, timeout);
+
+ if (res == MSG_OK) {
+ m_task_t task = MSG_comm_get_task(comm);
+ if (MSG_task_get_sender(task) == MSG_process_self()) {
+ /* I'm the sender */
+ return 0;
+ }
+ else {
+ /* I'm the receiver: find the Lua task from the C task */
+ sglua_task_unregister(L, task);
+ /* comm ... task */
+ return 1;
+ }
+ }
+ else {
+ /* the communication has failed */
+ lua_pushnil(L);
+ /* comm ... nil */
+ lua_pushstring(L, sglua_get_msg_error(res));
+ /* comm ... nil error */
+ return 2;
+ }
+}
+
+/**
+ * @brief Returns whether a communication is finished.
+ *
+ * Unlike wait(), This function always returns immediately.
+ *
+ * - Argument 1 (comm): a comm (previously created by isend or irecv)
+ * - Return values (task/boolean or nil + string): if the communication is not
+ * finished, return false. If the communication is finished and was successful,
+ * returns the task received if you are the receiver or true if you are the
+ * sender. If the communication is finished and has failed, returns nil
+ * plus an error string.
+ */
+static int l_comm_test(lua_State* L) {
+
+ msg_comm_t comm = sglua_check_comm(L, 1);
+ /* comm ... */
+ if (!MSG_comm_test(comm)) {
+ /* not finished yet */
+ lua_pushboolean(L, 0);
+ /* comm ... false */
+ return 1;
+ }
+ else {
+ /* finished but may have failed */
+ MSG_error_t res = MSG_comm_get_status(comm);
+
+ if (res == MSG_OK) {
+ m_task_t task = MSG_comm_get_task(comm);
+ if (MSG_task_get_sender(task) == MSG_process_self()) {
+ /* I'm the sender */
+ lua_pushboolean(L, 1);
+ /* comm ... true */
+ return 1;
+ }
+ else {
+ /* I'm the receiver: find the Lua task from the C task*/
+ sglua_task_unregister(L, task);
+ /* comm ... task */
+ return 1;
+ }
+ }
+ else {
+ /* the communication has failed */
+ lua_pushnil(L);
+ /* comm ... nil */
+ lua_pushstring(L, sglua_get_msg_error(res));
+ /* comm ... nil error */
+ return 2;
+ }
+ }
+}
+
+static const luaL_reg comm_functions[] = {
+ {"wait", l_comm_wait},
+ {"test", l_comm_test},
+ /* TODO waitany, testany */
+ {NULL, NULL}
+};
+
+/**
+ * \brief Finalizes a comm userdata.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (userdata): a comm
+ */
+static int l_comm_gc(lua_State* L)
+{
+ /* ctask */
+ msg_comm_t comm = *((msg_comm_t*) luaL_checkudata(L, 1, COMM_MODULE_NAME));
+ MSG_comm_destroy(comm);
+ return 0;
+}
+
+/**
+ * \brief Metamethods of the comm userdata.
+ */
+static const luaL_reg comm_meta[] = {
+ {"__gc", l_comm_gc},
+ {NULL, NULL}
+};
+
+/**
+ * \brief Registers the comm functions into the table simgrid.comm.
+ *
+ * Also initialize the metatable of the comm userdata type.
+ *
+ * \param L a lua state
+ */
+void sglua_register_comm_functions(lua_State* L)
+{
+ /* create a table simgrid.com and fill it with com functions */
+ luaL_openlib(L, COMM_MODULE_NAME, comm_functions, 0);
+ /* simgrid.comm */
+
+ /* create the metatable for comms, add it to the Lua registry */
+ luaL_newmetatable(L, COMM_MODULE_NAME);
+ /* simgrid.comm mt */
+ /* fill the metatable */
+ luaL_openlib(L, NULL, comm_meta, 0);
+ /* simgrid.comm mt */
+ lua_pushvalue(L, -2);
+ /* simgrid.comm mt simgrid.comm */
+ /* metatable.__index = simgrid.comm
+ * we put the comm functions inside the comm itself:
+ * this allows to write my_comm:method(args) for
+ * simgrid.comm.method(my_comm, args) */
+ lua_setfield(L, -2, "__index");
+ /* simgrid.comm mt */
+ lua_pop(L, 2);
+ /* -- */
+}
+
--- /dev/null
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights 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. */
+
+/* SimGrid Lua bindings */
+
+#include "lua_private.h"
+#include <lauxlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_host, bindings, "Lua bindings (host module)");
+
+#define HOST_MODULE_NAME "simgrid.host"
+
+/* ********************************************************************************* */
+/* simgrid.host API */
+/* ********************************************************************************* */
+
+/**
+ * \brief Ensures that a value in the stack is a host and returns it.
+ * \param L a Lua state
+ * \param index an index in the Lua stack
+ * \return the C host corresponding to this Lua host
+ */
+m_host_t sglua_check_host(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, lua_gettop(L), 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;
+}
+
+/**
+ * \brief Returns a host given its name.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (string): name of a host
+ * - Return value (host): the corresponding host
+ */
+static int l_host_get_by_name(lua_State * L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ XBT_DEBUG("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 failed");
+ }
+ 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;
+}
+
+/**
+ * \brief Returns the name of a host.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (host): a host
+ * - Return value (string): name of this host
+ */
+static int l_host_get_name(lua_State * L)
+{
+ m_host_t ht = sglua_check_host(L, 1);
+ lua_pushstring(L, MSG_host_get_name(ht));
+ return 1;
+}
+
+/**
+ * \brief Returns the number of existing hosts.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Return value (number): number of hosts
+ */
+static int l_host_number(lua_State * L)
+{
+ lua_pushnumber(L, MSG_get_host_number());
+ return 1;
+}
+
+/**
+ * \brief Returns the host given its index.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (number): an index (1 is the first)
+ * - Return value (host): the host at this index
+ */
+static int l_host_at(lua_State * L)
+{
+ int index = luaL_checkinteger(L, 1);
+ m_host_t host = MSG_get_host_table()[index - 1]; // lua indexing start by 1 (lua[1] <=> C[0])
+ 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 = 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 */
+ return 1;
+}
+
+/**
+ * \brief Returns the host where the current process is located.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Return value (host): the current host
+ */
+static int l_host_self(lua_State * L)
+{
+ /* -- */
+ m_host_t host = MSG_host_self();
+ lua_newtable(L);
+ /* table */
+ m_host_t* lua_host = (m_host_t*) lua_newuserdata(L, sizeof(m_host_t));
+ /* table ud */
+ *lua_host = host;
+ luaL_getmetatable(L, HOST_MODULE_NAME);
+ /* table ud mt */
+ lua_setmetatable(L, -2);
+ /* table ud */
+ lua_setfield(L, -2, "__simgrid_host");
+ /* table */
+ return 1;
+}
+
+/**
+ * \brief Returns the value of a host property.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (host): a host
+ * - Argument 2 (string): name of the property to get
+ * - Return value (string): the value of this property
+ */
+static int l_host_get_property_value(lua_State * L)
+{
+ m_host_t ht = sglua_check_host(L, 1);
+ const char *prop = luaL_checkstring(L, 2);
+ lua_pushstring(L,MSG_host_get_property_value(ht,prop));
+ return 1;
+}
+
+/**
+ * \brief Makes the current process sleep for a while.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (number): duration of the sleep
+ */
+static int l_host_sleep(lua_State *L)
+{
+ int time = luaL_checknumber(L, 1);
+ MSG_process_sleep(time);
+ return 0;
+}
+
+/**
+ * \brief Destroys a host.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (host): the host to destroy
+ */
+static int l_host_destroy(lua_State *L)
+{
+ m_host_t ht = sglua_check_host(L, 1);
+ __MSG_host_destroy(ht);
+ return 0;
+}
+
+static const luaL_reg host_functions[] = {
+ {"get_by_name", l_host_get_by_name},
+ {"name", l_host_get_name},
+ {"number", l_host_number},
+ {"at", l_host_at},
+ {"self", l_host_self},
+ {"get_prop_value", l_host_get_property_value},
+ {"sleep", l_host_sleep},
+ {"destroy", l_host_destroy},
+ // Bypass XML Methods
+ {"set_function", console_set_function},
+ {"set_property", console_host_set_property},
+ {NULL, NULL}
+};
+
+/**
+ * \brief Returns a string representation of a host.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (userdata): a host
+ * - Return value (string): a string describing this host
+ */
+static int l_host_tostring(lua_State * L)
+{
+ lua_pushfstring(L, "Host :%p", lua_touserdata(L, 1));
+ return 1;
+}
+
+static const luaL_reg host_meta[] = {
+ {"__tostring", l_host_tostring},
+ {0, 0}
+};
+
+/**
+ * \brief Registers the host functions into the table simgrid.host.
+ *
+ * Also initialize the metatable of the host userdata type.
+ *
+ * \param L a lua state
+ */
+void sglua_register_host_functions(lua_State* L)
+{
+ /* create a table simgrid.host and fill it with host functions */
+ luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);
+ /* simgrid.host */
+
+ /* create the metatable for host, add it to the Lua registry */
+ luaL_newmetatable(L, HOST_MODULE_NAME);
+ /* simgrid.host mt */
+ /* fill the metatable */
+ luaL_openlib(L, NULL, host_meta, 0);
+ /* simgrid.host mt */
+ lua_pushvalue(L, -2);
+ /* simgrid.host mt simgrid.host */
+ /* metatable.__index = simgrid.host
+ * we put the host functions inside the host userdata itself:
+ * this allows to write my_host:method(args) for
+ * simgrid.host.method(my_host, args) */
+ lua_setfield(L, -2, "__index");
+ /* simgrid.host mt */
+ lua_pop(L, 2);
+ /* -- */
+}
+
-/* SimGrid Lua Console */
-
/* Copyright (c) 2010. The SimGrid Team.
* All rights 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 "simgrid_lua.h"
-#include "simgrid/platf.h"
+/* SimGrid Lua bindings */
+
+#include "lua_private.h"
+#include "simgrid/platf_interface.h"
+#include "surf/surfxml_parse.h"
+#include "surf/surf_routing.h"
#include <string.h>
#include <ctype.h>
+#include <lauxlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)");
+
+#define PLATF_MODULE_NAME "simgrid.platf"
+
+/* ********************************************************************************* */
+/* simgrid.platf API */
+/* ********************************************************************************* */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_console, bindings, "Lua Bindings");
+static const luaL_reg platf_functions[] = {
+ {"open", console_open},
+ {"close", console_close},
+ {"AS_open", console_AS_open},
+ {"AS_close", console_AS_close},
+ {"host_new", console_add_host},
+ {"link_new", console_add_link},
+ {"router_new", console_add_router},
+ {"route_new", console_add_route},
+ {NULL, NULL}
+};
int console_open(lua_State *L) {
sg_platf_init();
return 0;
}
+/**
+ * \brief Registers the platform functions into the table simgrid.platf.
+ * \param L a lua state
+ */
+void sglua_register_platf_functions(lua_State* L)
+{
+ luaL_openlib(L, PLATF_MODULE_NAME, platf_functions, 0);
+ /* simgrid.platf */
+ lua_pop(L, 1);
+}
+
--- /dev/null
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights 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. */
+
+/* SimGrid Lua bindings */
+
+#include "simgrid_lua.h"
+#include "msg/msg.h"
+
+void sglua_register_task_functions(lua_State* L);
+m_task_t sglua_check_task(lua_State* L, int index);
+void sglua_task_register(lua_State* L);
+void sglua_task_unregister(lua_State* L, m_task_t task);
+
+void sglua_register_comm_functions(lua_State* L);
+msg_comm_t sglua_check_comm(lua_State* L, int index);
+void sglua_push_comm(lua_State* L, msg_comm_t comm);
+
+void sglua_register_host_functions(lua_State* L);
+m_host_t sglua_check_host(lua_State* L, int index);
+
+void sglua_register_process_functions(lua_State* L);
+
+void sglua_register_platf_functions(lua_State* L);
+
+const char* sglua_get_msg_error(MSG_error_t err);
--- /dev/null
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights 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. */
+
+/* SimGrid Lua bindings */
+
+#include "lua_private.h"
+#include <lauxlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_process, bindings, "Lua Bindings (process module)");
+
+#define PROCESS_MODULE_NAME "simgrid.process"
+
+/* ********************************************************************************* */
+/* simgrid.process API */
+/* ********************************************************************************* */
+
+/**
+ * \brief Makes the current process sleep for a while.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (number): duration of the sleep
+ * - Return value (nil or string): nil in everything went ok, or a string error
+ * if case of failure ("host failure")
+ */
+static int l_process_sleep(lua_State* L)
+{
+ double duration = luaL_checknumber(L, 1);
+ MSG_error_t res = MSG_process_sleep(duration);
+
+ switch (res) {
+
+ case MSG_OK:
+ return 0;
+
+ case MSG_HOST_FAILURE:
+ lua_pushliteral(L, "host failure");
+ return 1;
+
+ default:
+ xbt_die("Unexpected result of MSG_process_sleep: %d, please report this bug", res);
+ }
+}
+
+static const luaL_reg process_functions[] = {
+ {"sleep", l_process_sleep},
+ /* TODO: self, create, kill, suspend, is_suspended, resume, get_name,
+ * get_pid, get_ppid, migrate
+ */
+ {NULL, NULL}
+};
+
+/**
+ * \brief Registers the process functions into the table simgrid.process.
+ * \param L a lua state
+ */
+void sglua_register_process_functions(lua_State* L)
+{
+ luaL_openlib(L, PROCESS_MODULE_NAME, process_functions, 0);
+ /* simgrid.process */
+ lua_pop(L, 1);
+}
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_state_cloner, bindings, "Lua state management");
static void sglua_add_maestro_table(lua_State* L, int index, void* maestro_table_ptr);
+static void sglua_remove_maestro_table(lua_State* L, int index, void* maestro_table_ptr);
static void* sglua_get_maestro_table_ptr(lua_State* L, int index);
static void sglua_get_table_by_ptr(lua_State* L, void* table_ptr);
static int l_get_from_maestro(lua_State* L);
* @param index index of the copy of the maestro table in the stack of L
* @param maestro_table_ptr pointer to the original table in maestro's world
*/
-void sglua_add_maestro_table(lua_State* L, int index, void* maestro_table_ptr) {
+static void sglua_add_maestro_table(lua_State* L, int index, void* maestro_table_ptr) {
/* we will set both [ptr] -> table and [table] -> ptr */
/* ... */
}
+/**
+ * @brief Removes a reference to a maestro table to the list of known maestro
+ * tables of a state.
+ *
+ * @param L a state (can be maestro itself)
+ * @param index index of the copy of the maestro table in the stack of L
+ * @param maestro_table_ptr pointer to the original table in maestro's world
+ */
+static void sglua_remove_maestro_table(lua_State* L, int index, void* maestro_table_ptr) {
+
+ /* we will unset both [ptr] -> table and [table] -> ptr */
+
+ /* ... */
+ lua_pushvalue(L, index);
+ /* ... table */
+ lua_pushstring(L, "simgrid.maestro_tables");
+ /* ... table "simgrid.maestro_tables" */
+ lua_rawget(L, LUA_REGISTRYINDEX);
+ /* ... table maestrotbs */
+ lua_pushvalue(L, -2);
+ /* ... table maestrotbs table */
+ lua_pushnil(L);
+ /* ... table maestrotbs table nil */
+ lua_pushlightuserdata(L, maestro_table_ptr);
+ /* ... table maestrotbs table nil tableptr */
+ lua_pushnil(L);
+ /* ... table maestrotbs table nil tableptr nil*/
+ lua_settable(L, -5);
+ /* ... table maestrotbs table nil */
+ lua_settable(L, -3);
+ /* ... table maestrotbs */
+ lua_pop(L, 2);
+ /* ... */
+}
+
/**
* @brief For a table in the stack of L, returns a pointer that identifies the
* same table in in maestro's world.
}
/**
- * @brief Copies the table value on the top of src to the top of dst.
+ * @brief Copies the table value on top of src to the top of dst.
*
* A deep copy of the table is made. If the table has a metatable, the
* metatable is also copied.
- * If the table is already known by the destination state, it is not copied
- * again.
+ * If the table comes from maestro and is already known by the destination
+ * state, it is not copied again.
*
* @param src source state
* @param dst destination state
/* get from maestro the pointer that identifies this table */
void* table_ptr = sglua_get_maestro_table_ptr(src, -1);
- if (table_ptr == NULL) {
+ int known_by_maestro = (table_ptr != NULL);
+
+ if (!known_by_maestro) {
/* the table didn't come from maestro: nevermind, use the pointer of src */
table_ptr = (void*) lua_topointer(src, -1);
-
- if (!sglua_is_maestro(src)) {
- XBT_DEBUG("%sMaestro does not know this table",
- sglua_get_spaces(indent));
- }
+ XBT_DEBUG("%sMaestro does not know this table",
+ sglua_get_spaces(indent));
}
if (sglua_is_maestro(src)) {
XBT_DEBUG("%sKeeping track of this table in maestro itself",
sglua_get_spaces(indent));
sglua_add_maestro_table(src, -1, table_ptr);
+ known_by_maestro = 1;
xbt_assert(sglua_get_maestro_table_ptr(src, -1) == table_ptr);
}
/* mark the table as known right now to avoid infinite recursion */
sglua_add_maestro_table(dst, -1, table_ptr);
- /* FIXME: we may have added a table with a non-maestro pointer, is this a
- problem? */
+ /* we may have added a table with a non-maestro pointer, but if it was the
+ * case, we will remove it later */
XBT_DEBUG("%sTable marked as known", sglua_get_spaces(indent));
xbt_assert(sglua_get_maestro_table_ptr(dst, -1) == table_ptr);
}
XBT_DEBUG("%sFinished traversing the table", sglua_get_spaces(indent));
}
+
+ if (!known_by_maestro) {
+ /* actually,it was not a maestro table: forget the pointer */
+ sglua_remove_maestro_table(dst, -1, table_ptr);
+ }
}
/**
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid_lua.h"
+#include "xbt.h"
+#include <stdio.h>
+#include <string.h>
#define WARN "/***********\n * DO NOT EDIT! THIS FILE HAS BEEN AUTOMATICALLY GENERATED FROM %s BY gras_stub_generator\n ***********/\n"
#define SIM_SOURCENAME "_%s_simulator.c"
--- /dev/null
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights 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 "lua_private.h"
+#include "lua_utils.h"
+#include "lua_state_cloner.h"
+#include <lauxlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_task, bindings, "Lua bindings (task module)");
+
+#define TASK_MODULE_NAME "simgrid.task"
+
+/* ********************************************************************************* */
+/* simgrid.task API */
+/* ********************************************************************************* */
+
+/**
+ * \brief Ensures that a value in the stack is a valid task and returns it.
+ * \param L a Lua state
+ * \param index an index in the Lua stack
+ * \return the C task corresponding to this Lua task
+ */
+m_task_t sglua_check_task(lua_State* L, int index)
+{
+ sglua_stack_dump("check task: ", L);
+ luaL_checktype(L, index, LUA_TTABLE);
+ /* ... task ... */
+ lua_getfield(L, index, "__simgrid_task");
+ /* ... task ... ctask */
+ m_task_t task = *((m_task_t*) luaL_checkudata(L, -1, TASK_MODULE_NAME));
+ lua_pop(L, 1);
+ /* ... task ... */
+
+ if (task == NULL) {
+ luaL_error(L, "This task was sent to someone else, you cannot access it anymore");
+ }
+
+ return task;
+}
+
+/**
+ * \brief Creates a new task and leaves it onto the stack.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (string): name of the task
+ * - Argument 2 (number): computation size
+ * - Argument 3 (number): communication size
+ * - Return value (task): the task created
+ *
+ * A Lua task is a regular table with a full userdata inside, and both share
+ * the same metatable. For the regular table, the metatable allows OO-style
+ * writing such as your_task:send(someone).
+ * For the userdata, the metatable is used to check its type.
+ * TODO: make the task name an optional last parameter
+ */
+static int l_task_new(lua_State* L)
+{
+ XBT_DEBUG("Task new");
+ const char* name = luaL_checkstring(L, 1);
+ int comp_size = luaL_checkint(L, 2);
+ int msg_size = luaL_checkint(L, 3);
+ /* name comp comm */
+ lua_settop(L, 0);
+ /* -- */
+ m_task_t msg_task = MSG_task_create(name, comp_size, msg_size, NULL);
+
+ lua_newtable(L);
+ /* task */
+ luaL_getmetatable(L, TASK_MODULE_NAME);
+ /* task mt */
+ lua_setmetatable(L, -2);
+ /* task */
+ m_task_t* lua_task = (m_task_t*) lua_newuserdata(L, sizeof(m_task_t));
+ /* task ctask */
+ *lua_task = msg_task;
+ luaL_getmetatable(L, TASK_MODULE_NAME);
+ /* task ctask mt */
+ lua_setmetatable(L, -2);
+ /* task ctask */
+ lua_setfield(L, -2, "__simgrid_task");
+ /* task */
+ return 1;
+}
+
+/**
+ * \brief Returns the name of a task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (task): a task
+ * - Return value (string): name of the task
+ */
+static int l_task_get_name(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ lua_pushstring(L, MSG_task_get_name(task));
+ return 1;
+}
+
+/**
+ * \brief Returns the computation duration of a task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (task): a task
+ * - Return value (number): computation duration of this task
+ */
+static int l_task_get_computation_duration(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ lua_pushnumber(L, MSG_task_get_compute_duration(task));
+ return 1;
+}
+
+/**
+ * \brief Executes a task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (task): the task to execute
+ * - Return value (nil or string): nil if the task was successfully executed,
+ * or an error string in case of failure, which may be "task canceled" or
+ * "host failure"
+ */
+static int l_task_execute(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ MSG_error_t res = MSG_task_execute(task);
+
+ if (res == MSG_OK) {
+ return 0;
+ }
+ else {
+ lua_pushstring(L, sglua_get_msg_error(res));
+ return 1;
+ }
+}
+
+/**
+ * \brief Pops the Lua task from the stack and registers it so that the
+ * process can retrieve it later knowing the C task.
+ * \param L a lua state
+ */
+void sglua_task_register(lua_State* L) {
+
+ m_task_t task = sglua_check_task(L, -1);
+ /* ... task */
+ /* put in the C task a ref to the lua task so that the receiver finds it */
+ unsigned long ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ /* ... */
+ MSG_task_set_data(task, (void*) ref);
+}
+
+/**
+ * \brief Pushes onto the stack the Lua task corresponding to a C task.
+ *
+ * The Lua task must have been previously registered with task_register so
+ * that it can be retrieved knowing the C task.
+ *
+ * \param L a lua state
+ * \param task a C task
+ */
+void sglua_task_unregister(lua_State* L, m_task_t task) {
+
+ /* ... */
+ /* the task is in my registry, put it onto my stack */
+ unsigned long ref = (unsigned long) MSG_task_get_data(task);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
+ /* ... task */
+ luaL_unref(L, LUA_REGISTRYINDEX, ref);
+ MSG_task_set_data(task, NULL);
+}
+
+/**
+ * \brief This function is called when a C task has just been copied.
+ *
+ * This callback is used to move the corresponding Lua task from the sender
+ * process to the receiver process.
+ * It is executed in SIMIX kernel mode when the communication finishes,
+ * before both processes are awaken. Thus, this function is thread-safe when
+ * user processes are executed in parallel, though it modifies the Lua
+ * stack of both processes to move the task.
+ * After this function, both Lua stacks are restored in their previous state.
+ * The task is moved from the registry of the sender to the registry of the
+ * receiver.
+ *
+ * \param task the task copied
+ * \param src_process the sender
+ * \param dst_process the receiver
+ */
+static void task_copy_callback(m_task_t task, m_process_t src_process,
+ m_process_t dst_process) {
+
+ lua_State* src = MSG_process_get_data(src_process);
+ lua_State* dst = MSG_process_get_data(dst_process);
+
+ /* src: ...
+ dst: ... */
+ sglua_task_unregister(src, task);
+ /* src: ... task */
+ sglua_copy_value(src, dst);
+ /* src: ... task
+ dst: ... task */
+ sglua_task_register(dst); /* dst: ... */
+
+ /* the receiver is now the owner of the task and may destroy it:
+ * make the sender forget the C task so that it doesn't garbage */
+ lua_getfield(src, -1, "__simgrid_task");
+ /* src: ... task ctask */
+ m_task_t* udata = (m_task_t*) luaL_checkudata(src, -1, TASK_MODULE_NAME);
+ *udata = NULL;
+ lua_pop(src, 2);
+ /* src: ... */
+}
+
+/**
+ * \brief Sends a task to a mailbox and waits for its completion.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (task): the task to send
+ * - Argument 2 (string or compatible): mailbox name, as a real string or any
+ * type convertible to string (numbers always are)
+ * - Return values (boolean + string): true if the communication was successful,
+ * or false plus an error string in case of failure, which may be "timeout",
+ * "host failure" or "transfer failure"
+ */
+static int l_task_send(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ const char* mailbox = luaL_checkstring(L, 2);
+ /* task mailbox ... */
+ lua_settop(L, 1);
+ /* task */
+ sglua_task_register(L);
+ /* -- */
+ MSG_error_t res = MSG_task_send(task, mailbox);
+
+ if (res == MSG_OK) {
+ lua_pushboolean(L, 1);
+ /* true */
+ return 1;
+ }
+ else {
+ /* the communication has failed, I'm still the owner of the task */
+ sglua_task_unregister(L, task);
+ /* task */
+ lua_pushboolean(L, 0);
+ /* task false */
+ lua_pushstring(L, sglua_get_msg_error(res));
+ /* task false error */
+ return 2;
+ }
+}
+
+/**
+ * \brief Sends a task on a mailbox.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * This is a non-blocking function: use simgrid.comm.wait() or
+ * simgrid.comm.test() to end the communication.
+ *
+ * - Argument 1 (task): the task to send
+ * - Argument 2 (string or compatible): mailbox name, as a real string or any
+ * type convertible to string (numbers always are)
+ * - Return value (comm): a communication object to be used later with wait or test
+ */
+static int l_task_isend(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ const char* mailbox = luaL_checkstring(L, 2);
+ /* task mailbox ... */
+ lua_settop(L, 1);
+ /* task */
+ sglua_task_register(L);
+ /* -- */
+ msg_comm_t comm = MSG_task_isend(task, mailbox);
+
+ sglua_push_comm(L, comm);
+ /* comm */
+ return 1;
+}
+
+/**
+ * \brief Sends a task on a mailbox on a best effort way (detached send).
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * Like simgrid.task.isend, this is a non-blocking function.
+ * You can use this function if you don't care about when the communication
+ * ends and whether it succeeds.
+ * FIXME: isn't this equivalent to calling simgrid.task.isend() and ignoring
+ * the result?
+ *
+ * - Argument 1 (task): the task to send
+ * - Argument 2 (string or compatible): mailbox name, as a real string or any
+ * type convertible to string (numbers always are)
+ */
+static int l_task_dsend(lua_State* L)
+{
+ m_task_t task = sglua_check_task(L, 1);
+ const char* mailbox = luaL_checkstring(L, 2);
+ /* task mailbox ... */
+ lua_settop(L, 1);
+ /* task */
+ sglua_task_register(L);
+ /* -- */
+ MSG_task_dsend(task, mailbox, NULL);
+ return 0;
+}
+
+/**
+ * \brief Receives a task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (string or compatible): mailbox name, as a real string or any
+ * type convertible to string (numbers always are)
+ * - Argument 2 (number, optional): timeout (default is no timeout)
+ * - Return values (task or nil + string): the task received, or nil plus an
+ * error message if the communication has failed
+ */
+static int l_task_recv(lua_State* L)
+{
+ m_task_t task = NULL;
+ const char* mailbox = luaL_checkstring(L, 1);
+ int timeout;
+ if (lua_gettop(L) >= 2) {
+ /* mailbox timeout ... */
+ timeout = luaL_checknumber(L, 2);
+ }
+ else {
+ /* mailbox */
+ timeout = -1;
+ /* no timeout by default */
+ }
+ /* mailbox ... */
+ MSG_error_t res = MSG_task_receive_with_timeout(&task, mailbox, timeout);
+
+ if (res == MSG_OK) {
+ sglua_task_unregister(L, task);
+ /* mailbox ... task */
+ return 1;
+ }
+ else {
+ lua_pushnil(L);
+ /* mailbox ... nil */
+ lua_pushstring(L, sglua_get_msg_error(res));
+ /* mailbox ... nil error */
+ return 2;
+ }
+}
+
+/**
+ * \brief Asynchronously receives a task on a mailbox.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * This is a non-blocking function: use simgrid.comm.wait() or
+ * simgrid.comm.test() to end the communication and get the task in case of
+ * success.
+ *
+ * - Argument 1 (string or compatible): mailbox name, as a real string or any
+ * type convertible to string (numbers always are)
+ * - Return value (comm): a communication object to be used later with wait or test
+ */
+
+static int l_task_irecv(lua_State* L)
+{
+ const char* mailbox = luaL_checkstring(L, 1);
+ /* mailbox ... */
+ m_task_t* task = xbt_new0(m_task_t, 1); // FIXME fix this leak
+ msg_comm_t comm = MSG_task_irecv(task, mailbox);
+ sglua_push_comm(L, comm);
+ /* mailbox ... comm */
+ return 1;
+}
+
+static const luaL_reg task_functions[] = {
+ {"new", l_task_new},
+ {"get_name", l_task_get_name},
+ {"get_computation_duration", l_task_get_computation_duration},
+ {"execute", l_task_execute},
+ {"send", l_task_send},
+ {"isend", l_task_isend},
+ {"dsend", l_task_dsend},
+ {"recv", l_task_recv},
+ {"irecv", l_task_irecv},
+ {NULL, NULL}
+};
+
+/**
+ * \brief Finalizes the userdata of a task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (userdata): a C task, possibly NULL if it was sent to another
+ * Lua state
+ */
+static int l_task_gc(lua_State* L)
+{
+ /* ctask */
+ m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME));
+ /* the task is NULL if I sent it to someone else */
+ if (task != NULL) {
+ MSG_task_destroy(task);
+ }
+ return 0;
+}
+
+/**
+ * \brief Returns a string representation of a C task.
+ * \param L a Lua state
+ * \return number of values returned to Lua
+ *
+ * - Argument 1 (userdata): a task
+ * - Return value (string): a string describing this task
+ */
+static int l_task_tostring(lua_State* L)
+{
+ m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME));
+ lua_pushfstring(L, "Task: %p", task);
+ return 1;
+}
+
+/**
+ * \brief Metamethods of both a task table and the userdata inside it.
+ */
+static const luaL_reg task_meta[] = {
+ {"__gc", l_task_gc}, /* will be called only for userdata */
+ {"__tostring", l_task_tostring},
+ {NULL, NULL}
+};
+
+/**
+ * \brief Registers the task functions into the table simgrid.task.
+ *
+ * Also initialize the metatable of the task userdata type.
+ *
+ * \param L a lua state
+ */
+void sglua_register_task_functions(lua_State* L)
+{
+ /* create a table simgrid.task and fill it with task functions */
+ luaL_openlib(L, TASK_MODULE_NAME, task_functions, 0);
+ /* simgrid.task */
+
+ /* create the metatable for tasks, add it to the Lua registry */
+ luaL_newmetatable(L, TASK_MODULE_NAME);
+ /* simgrid.task mt */
+ /* fill the metatable */
+ luaL_openlib(L, NULL, task_meta, 0);
+ /* simgrid.task mt */
+ lua_pushvalue(L, -2);
+ /* simgrid.task mt simgrid.task */
+ /* metatable.__index = simgrid.task
+ * we put the task functions inside the task itself:
+ * this allows to write my_task:method(args) for
+ * simgrid.task.method(my_task, args) */
+ lua_setfield(L, -2, "__index");
+ /* simgrid.task mt */
+ lua_pop(L, 2);
+ /* -- */
+
+ /* set up MSG to copy Lua tasks between states */
+ MSG_task_set_copy_callback(task_copy_callback);
+}
+
/* SimGrid Lua bindings */
-#include "simgrid_lua.h"
+#include "lua_private.h"
#include "lua_state_cloner.h"
#include "lua_utils.h"
+#include "xbt.h"
+#include "msg/msg.h"
+#include "simdag/simdag.h"
+#include "surf/surfxml_parse.h"
+#include "gras.h"
+#include <lauxlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
-#define TASK_MODULE_NAME "simgrid.task"
-#define COMM_MODULE_NAME "simgrid.comm"
-#define HOST_MODULE_NAME "simgrid.host"
-#define PROCESS_MODULE_NAME "simgrid.process"
-// Surf (bypass XML)
-#define LINK_MODULE_NAME "simgrid.link"
-#define ROUTE_MODULE_NAME "simgrid.route"
-#define PLATF_MODULE_NAME "simgrid.platf"
-
static lua_State* sglua_maestro_state;
-static const char* msg_errors[] = {
- NULL,
- "timeout",
- "transfer failure",
- "host failure",
- "task canceled"
-};
-
int luaopen_simgrid(lua_State *L);
-static void register_c_functions(lua_State *L);
+static void sglua_register_c_functions(lua_State *L);
static int run_lua_code(int argc, char **argv);
-/* ********************************************************************************* */
-/* simgrid.task API */
-/* ********************************************************************************* */
-
-/**
- * \brief Ensures that a value in the stack is a valid task and returns it.
- * \param L a Lua state
- * \param index an index in the Lua stack
- * \return the C task corresponding to this Lua task
- */
-static m_task_t sglua_checktask(lua_State* L, int index)
-{
- sglua_stack_dump("check task: ", L);
- luaL_checktype(L, index, LUA_TTABLE);
- /* ... task ... */
- lua_getfield(L, index, "__simgrid_task");
- /* ... task ... ctask */
- m_task_t task = *((m_task_t*) luaL_checkudata(L, -1, TASK_MODULE_NAME));
- lua_pop(L, 1);
- /* ... task ... */
-
- if (task == NULL) {
- luaL_error(L, "This task was sent to someone else, you cannot access it anymore");
- }
-
- return task;
-}
-
-/**
- * \brief Creates a new task and leaves it onto the stack.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (string): name of the task
- * - Argument 2 (number): computation size
- * - Argument 3 (number): communication size
- * - Return value (task): the task created
- *
- * A Lua task is a regular table with a full userdata inside, and both share
- * the same metatable. For the regular table, the metatable allows OO-style
- * writing such as your_task:send(someone).
- * For the userdata, the metatable is used to check its type.
- * TODO: make the task name an optional last parameter
- */
-static int l_task_new(lua_State* L)
-{
- XBT_DEBUG("Task new");
- const char* name = luaL_checkstring(L, 1);
- int comp_size = luaL_checkint(L, 2);
- int msg_size = luaL_checkint(L, 3);
- /* name comp comm */
- lua_settop(L, 0);
- /* -- */
- m_task_t msg_task = MSG_task_create(name, comp_size, msg_size, NULL);
-
- lua_newtable(L);
- /* task */
- luaL_getmetatable(L, TASK_MODULE_NAME);
- /* task mt */
- lua_setmetatable(L, -2);
- /* task */
- m_task_t* lua_task = (m_task_t*) lua_newuserdata(L, sizeof(m_task_t));
- /* task ctask */
- *lua_task = msg_task;
- luaL_getmetatable(L, TASK_MODULE_NAME);
- /* task ctask mt */
- lua_setmetatable(L, -2);
- /* task ctask */
- lua_setfield(L, -2, "__simgrid_task");
- /* task */
- return 1;
-}
-
-/**
- * \brief Returns the name of a task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (task): a task
- * - Return value (string): name of the task
- */
-static int l_task_get_name(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- lua_pushstring(L, MSG_task_get_name(task));
- return 1;
-}
-
-/**
- * \brief Returns the computation duration of a task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (task): a task
- * - Return value (number): computation duration of this task
- */
-static int l_task_get_computation_duration(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- lua_pushnumber(L, MSG_task_get_compute_duration(task));
- return 1;
-}
-
-/**
- * \brief Executes a task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (task): the task to execute
- * - Return value (nil or string): nil if the task was successfully executed,
- * or an error string in case of failure, which may be "task canceled" or
- * "host failure"
- */
-static int l_task_execute(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- MSG_error_t res = MSG_task_execute(task);
-
- if (res == MSG_OK) {
- return 0;
- }
- else {
- lua_pushstring(L, msg_errors[res]);
- return 1;
- }
-}
-
-/**
- * \brief Pops the Lua task from the stack and registers it so that the
- * process can retrieve it later knowing the C task.
- * \param L a lua state
- */
-static void task_register(lua_State* L) {
-
- m_task_t task = sglua_checktask(L, -1);
- /* ... task */
- /* put in the C task a ref to the lua task so that the receiver finds it */
- unsigned long ref = luaL_ref(L, LUA_REGISTRYINDEX);
- /* ... */
- MSG_task_set_data(task, (void*) ref);
-}
-
-/**
- * \brief Pushes onto the stack the Lua task corresponding to a C task.
- *
- * The Lua task must have been previously registered with task_register so
- * that it can be retrieved knowing the C task.
- *
- * \param L a lua state
- * \param task a C task
- */
-static void task_unregister(lua_State* L, m_task_t task) {
-
- /* ... */
- /* the task is in my registry, put it onto my stack */
- unsigned long ref = (unsigned long) MSG_task_get_data(task);
- lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
- /* ... task */
- luaL_unref(L, LUA_REGISTRYINDEX, ref);
- MSG_task_set_data(task, NULL);
-}
-
-/**
- * \brief This function is called when a C task has just been copied.
- *
- * This callback is used to copy the corresponding Lua task.
- *
- * \param task the task copied
- * \param src_process the sender
- * \param dst_process the receiver
- */
-static void task_copy_callback(m_task_t task, m_process_t src_process,
- m_process_t dst_process) {
-
- lua_State* src = MSG_process_get_data(src_process);
- lua_State* dst = MSG_process_get_data(dst_process);
-
- /* src: ...
- dst: ... */
- task_unregister(src, task);
- /* src: ... task */
- sglua_copy_value(src, dst);
- /* src: ... task
- dst: ... task */
- task_register(dst); /* dst: ... */
-
- /* the receiver is now the owner of the task and may destroy it:
- * make the sender forget the C task so that it doesn't garbage */
- lua_getfield(src, -1, "__simgrid_task");
- /* src: ... task ctask */
- m_task_t* udata = (m_task_t*) luaL_checkudata(src, -1, TASK_MODULE_NAME);
- *udata = NULL;
- lua_pop(src, 2);
- /* src: ... */
-}
-
-/**
- * \brief Sends a task to a mailbox and waits for its completion.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (task): the task to send
- * - Argument 2 (string or compatible): mailbox name, as a real string or any
- * type convertible to string (numbers always are)
- * - Return values (boolean + string): true if the communication was successful,
- * or false plus an error string in case of failure, which may be "timeout",
- * "host failure" or "transfer failure"
- */
-static int l_task_send(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- const char* mailbox = luaL_checkstring(L, 2);
- /* task mailbox ... */
- lua_settop(L, 1);
- /* task */
- task_register(L);
- /* -- */
- MSG_error_t res = MSG_task_send(task, mailbox);
-
- if (res == MSG_OK) {
- lua_pushboolean(L, 1);
- /* true */
- return 1;
- }
- else {
- /* the communication has failed, I'm still the owner of the task */
- task_unregister(L, task);
- /* task */
- lua_pushboolean(L, 0);
- /* task false */
- lua_pushstring(L, msg_errors[res]);
- /* task false error */
- return 2;
- }
-}
-
-/**
- * \brief Sends a task on a mailbox.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * This is a non-blocking function: use simgrid.comm.wait() or
- * simgrid.comm.test() to end the communication.
- *
- * - Argument 1 (task): the task to send
- * - Argument 2 (string or compatible): mailbox name, as a real string or any
- * type convertible to string (numbers always are)
- * - Return value (comm): a communication object to be used later with wait or test
- */
-static int l_task_isend(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- const char* mailbox = luaL_checkstring(L, 2);
- /* task mailbox ... */
- lua_settop(L, 1);
- /* task */
- task_register(L);
- /* -- */
- msg_comm_t comm = MSG_task_isend(task, mailbox);
-
- msg_comm_t* userdata = (msg_comm_t*) lua_newuserdata(L, sizeof(msg_comm_t));
- /* comm */
- *userdata = comm;
- luaL_getmetatable(L, COMM_MODULE_NAME);
- /* comm mt */
- lua_setmetatable(L, -2);
- /* comm */
- return 1;
-}
-
-/**
- * \brief Sends a task on a mailbox on a best effort way (detached send).
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * Like simgrid.task.isend, this is a non-blocking function.
- * You can use this function if you don't care about when the communication
- * ends and whether it succeeds.
- * FIXME: isn't this equivalent to calling simgrid.task.isend() and ignoring
- * the result?
- *
- * - Argument 1 (task): the task to send
- * - Argument 2 (string or compatible): mailbox name, as a real string or any
- * type convertible to string (numbers always are)
- */
-static int l_task_dsend(lua_State* L)
-{
- m_task_t task = sglua_checktask(L, 1);
- const char* mailbox = luaL_checkstring(L, 2);
- /* task mailbox ... */
- lua_settop(L, 1);
- /* task */
- task_register(L);
- /* -- */
- MSG_task_dsend(task, mailbox, NULL);
- return 0;
-}
-
-/**
- * \brief Receives a task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (string or compatible): mailbox name, as a real string or any
- * type convertible to string (numbers always are)
- * - Argument 2 (number, optional): timeout (default is no timeout)
- * - Return values (task or nil + string): the task received, or nil plus an
- * error message if the communication has failed
- */
-static int l_task_recv(lua_State* L)
-{
- m_task_t task = NULL;
- const char* mailbox = luaL_checkstring(L, 1);
- int timeout;
- if (lua_gettop(L) >= 2) {
- /* mailbox timeout ... */
- timeout = luaL_checknumber(L, 2);
- }
- else {
- /* mailbox */
- timeout = -1;
- /* no timeout by default */
- }
- /* mailbox ... */
- MSG_error_t res = MSG_task_receive_with_timeout(&task, mailbox, timeout);
-
- if (res == MSG_OK) {
- task_unregister(L, task);
- /* mailbox ... task */
- return 1;
- }
- else {
- lua_pushnil(L);
- /* mailbox ... nil */
- lua_pushstring(L, msg_errors[res]);
- /* mailbox ... nil error */
- return 2;
- }
-}
-
-/**
- * \brief Asynchronously receives a task on a mailbox.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * This is a non-blocking function: use simgrid.comm.wait() or
- * simgrid.comm.test() to end the communication and get the task in case of
- * success.
- *
- * - Argument 1 (string or compatible): mailbox name, as a real string or any
- * type convertible to string (numbers always are)
- * - Return value (comm): a communication object to be used later with wait or test
- */
-
-static int l_task_irecv(lua_State* L)
-{
- const char* mailbox = luaL_checkstring(L, 1);
- /* mailbox ... */
- m_task_t* task = xbt_new0(m_task_t, 1); // FIXME fix this leak
- msg_comm_t comm = MSG_task_irecv(task, mailbox);
-
- msg_comm_t* userdata = (msg_comm_t*) lua_newuserdata(L, sizeof(msg_comm_t));
- /* mailbox ... comm */
- *userdata = comm;
- luaL_getmetatable(L, COMM_MODULE_NAME);
- /* mailbox ... comm mt */
- lua_setmetatable(L, -2);
- /* mailbox ... comm */
- return 1;
-}
-
-static const luaL_reg task_functions[] = {
- {"new", l_task_new},
- {"get_name", l_task_get_name},
- {"get_computation_duration", l_task_get_computation_duration},
- {"execute", l_task_execute},
- {"send", l_task_send},
- {"isend", l_task_isend},
- {"dsend", l_task_dsend},
- {"recv", l_task_recv},
- {"irecv", l_task_irecv},
- {NULL, NULL}
-};
-
-/**
- * \brief Finalizes the userdata of a task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (userdata): a C task, possibly NULL if it was sent to another
- * Lua state
- */
-static int l_task_gc(lua_State* L)
-{
- /* ctask */
- m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME));
- /* the task is NULL if I sent it to someone else */
- if (task != NULL) {
- MSG_task_destroy(task);
- }
- return 0;
-}
-
-/**
- * \brief Returns a string representation of a C task.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (userdata): a task
- * - Return value (string): a string describing this task
- */
-static int l_task_tostring(lua_State* L)
-{
- m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME));
- lua_pushfstring(L, "Task: %p", task);
- return 1;
-}
-
-/**
- * \brief Metamethods of both a task table and the userdata inside it.
- */
-static const luaL_reg task_meta[] = {
- {"__gc", l_task_gc}, /* will be called only for userdata */
- {"__tostring", l_task_tostring},
- {NULL, NULL}
-};
-
-/* ********************************************************************************* */
-/* simgrid.comm API */
-/* ********************************************************************************* */
-
-/**
- * \brief Ensures that a value in the stack is a comm and returns it.
- * \param L a Lua state
- * \param index an index in the Lua stack
- * \return the C comm
- */
-static msg_comm_t sglua_checkcomm(lua_State* L, int index)
-{
- msg_comm_t comm = *((msg_comm_t*) luaL_checkudata(L, index, COMM_MODULE_NAME));
- return comm;
-}
-
-/**
- * \brief Blocks the current process until a communication is finished.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (comm): a comm (previously created by isend or irecv)
- * - Argument 2 (number, optional): timeout (default is no timeout)
- * - Return values (task or nil + string): in case of success, returns the task
- * received if you are the receiver and nil if you are the sender. In case of
- * failure, returns nil plus an error string.
- */
-static int l_comm_wait(lua_State* L) {
-
- msg_comm_t comm = sglua_checkcomm(L, 1);
- double timeout = -1;
- if (lua_gettop(L) >= 2) {
- timeout = luaL_checknumber(L, 2);
- }
- /* comm ... */
- MSG_error_t res = MSG_comm_wait(comm, timeout);
-
- if (res == MSG_OK) {
- m_task_t task = MSG_comm_get_task(comm);
- if (MSG_task_get_sender(task) == MSG_process_self()) {
- /* I'm the sender */
- return 0;
- }
- else {
- /* I'm the receiver: find the Lua task from the C task */
- task_unregister(L, task);
- /* comm ... task */
- return 1;
- }
- }
- else {
- /* the communication has failed */
- lua_pushnil(L);
- /* comm ... nil */
- lua_pushstring(L, msg_errors[res]);
- /* comm ... nil error */
- return 2;
- }
-}
-
-/**
- * @brief Returns whether a communication is finished.
- *
- * Unlike wait(), This function always returns immediately.
- *
- * - Argument 1 (comm): a comm (previously created by isend or irecv)
- * - Return values (task/boolean or nil + string): if the communication is not
- * finished, return false. If the communication is finished and was successful,
- * returns the task received if you are the receiver or true if you are the
- * sender. If the communication is finished and has failed, returns nil
- * plus an error string.
- */
-static int l_comm_test(lua_State* L) {
-
- msg_comm_t comm = sglua_checkcomm(L, 1);
- /* comm ... */
- if (!MSG_comm_test(comm)) {
- /* not finished yet */
- lua_pushboolean(L, 0);
- /* comm ... false */
- return 1;
- }
- else {
- /* finished but may have failed */
- MSG_error_t res = MSG_comm_get_status(comm);
-
- if (res == MSG_OK) {
- m_task_t task = MSG_comm_get_task(comm);
- if (MSG_task_get_sender(task) == MSG_process_self()) {
- /* I'm the sender */
- lua_pushboolean(L, 1);
- /* comm ... true */
- return 1;
- }
- else {
- /* I'm the receiver: find the Lua task from the C task*/
- task_unregister(L, task);
- /* comm ... task */
- return 1;
- }
- }
- else {
- /* the communication has failed */
- lua_pushnil(L);
- /* comm ... nil */
- lua_pushstring(L, msg_errors[res]);
- /* comm ... nil error */
- return 2;
- }
- }
-}
-
-static const luaL_reg comm_functions[] = {
- {"wait", l_comm_wait},
- {"test", l_comm_test},
- /* TODO waitany, testany */
- {NULL, NULL}
-};
-
-/**
- * \brief Finalizes a comm userdata.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (userdata): a comm
- */
-static int l_comm_gc(lua_State* L)
-{
- /* ctask */
- msg_comm_t comm = *((msg_comm_t*) luaL_checkudata(L, 1, COMM_MODULE_NAME));
- MSG_comm_destroy(comm);
- return 0;
-}
-
-/**
- * \brief Metamethods of the comm userdata.
- */
-static const luaL_reg comm_meta[] = {
- {"__gc", l_comm_gc},
- {NULL, NULL}
-};
-
-/* ********************************************************************************* */
-/* simgrid.host API */
-/* ********************************************************************************* */
-
-/**
- * \brief Ensures that a value in the stack is a host and returns it.
- * \param L a Lua state
- * \param index an index in the Lua stack
- * \return the C host corresponding to this Lua host
- */
-static m_host_t sglua_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, lua_gettop(L), 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;
-}
-
-/**
- * \brief Returns a host given its name.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (string): name of a host
- * - Return value (host): the corresponding host
- */
-static int l_host_get_by_name(lua_State * L)
-{
- const char *name = luaL_checkstring(L, 1);
- XBT_DEBUG("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 failed");
- }
- 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;
-}
-
-/**
- * \brief Returns the name of a host.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (host): a host
- * - Return value (string): name of this host
- */
-static int l_host_get_name(lua_State * L)
-{
- m_host_t ht = sglua_checkhost(L, 1);
- lua_pushstring(L, MSG_host_get_name(ht));
- return 1;
-}
-
-/**
- * \brief Returns the number of existing hosts.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Return value (number): number of hosts
- */
-static int l_host_number(lua_State * L)
-{
- lua_pushnumber(L, MSG_get_host_number());
- return 1;
-}
-
-/**
- * \brief Returns the host given its index.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (number): an index (1 is the first)
- * - Return value (host): the host at this index
- */
-static int l_host_at(lua_State * L)
-{
- int index = luaL_checkinteger(L, 1);
- m_host_t host = MSG_get_host_table()[index - 1]; // lua indexing start by 1 (lua[1] <=> C[0])
- 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 = 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 */
- return 1;
-}
-
-/**
- * \brief Returns the host where the current process is located.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Return value (host): the current host
- */
-static int l_host_self(lua_State * L)
-{
- /* -- */
- m_host_t host = MSG_host_self();
- lua_newtable(L);
- /* table */
- m_host_t* lua_host = (m_host_t*) lua_newuserdata(L, sizeof(m_host_t));
- /* table ud */
- *lua_host = host;
- luaL_getmetatable(L, HOST_MODULE_NAME);
- /* table ud mt */
- lua_setmetatable(L, -2);
- /* table ud */
- lua_setfield(L, -2, "__simgrid_host");
- /* table */
- return 1;
-}
-
-/**
- * \brief Returns the value of a host property.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (host): a host
- * - Argument 2 (string): name of the property to get
- * - Return value (string): the value of this property
- */
-static int l_host_get_property_value(lua_State * L)
-{
- m_host_t ht = sglua_checkhost(L, 1);
- const char *prop = luaL_checkstring(L, 2);
- lua_pushstring(L,MSG_host_get_property_value(ht,prop));
- return 1;
-}
-
-/**
- * \brief Makes the current process sleep for a while.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (number): duration of the sleep
- */
-static int l_host_sleep(lua_State *L)
-{
- int time = luaL_checknumber(L, 1);
- MSG_process_sleep(time);
- return 0;
-}
-
-/**
- * \brief Destroys a host.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (host): the host to destroy
- */
-static int l_host_destroy(lua_State *L)
-{
- m_host_t ht = sglua_checkhost(L, 1);
- __MSG_host_destroy(ht);
- return 0;
-}
-
-static const luaL_reg host_functions[] = {
- {"get_by_name", l_host_get_by_name},
- {"name", l_host_get_name},
- {"number", l_host_number},
- {"at", l_host_at},
- {"self", l_host_self},
- {"get_prop_value", l_host_get_property_value},
- {"sleep", l_host_sleep},
- {"destroy", l_host_destroy},
- // Bypass XML Methods
- {"set_function", console_set_function},
- {"set_property", console_host_set_property},
- {NULL, NULL}
-};
-
-/**
- * \brief Returns a string representation of a host.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (userdata): a host
- * - Return value (string): a string describing this host
- */
-static int l_host_tostring(lua_State * L)
-{
- lua_pushfstring(L, "Host :%p", lua_touserdata(L, 1));
- return 1;
-}
-
-static const luaL_reg host_meta[] = {
- {"__tostring", l_host_tostring},
- {0, 0}
-};
-
-/* ********************************************************************************* */
-/* simgrid.process API */
-/* ********************************************************************************* */
-
-/**
- * \brief Makes the current process sleep for a while.
- * \param L a Lua state
- * \return number of values returned to Lua
- *
- * - Argument 1 (number): duration of the sleep
- * - Return value (nil or string): nil in everything went ok, or a string error
- * if case of failure ("host failure")
- */
-static int l_process_sleep(lua_State* L)
-{
- double duration = luaL_checknumber(L, 1);
- MSG_error_t res = MSG_process_sleep(duration);
-
- switch (res) {
-
- case MSG_OK:
- return 0;
-
- case MSG_HOST_FAILURE:
- lua_pushliteral(L, "host failure");
- return 1;
-
- default:
- xbt_die("Unexpected result of MSG_process_sleep: %d, please report this bug", res);
- }
-}
-
-static const luaL_reg process_functions[] = {
- {"sleep", l_process_sleep},
- /* TODO: self, create, kill, suspend, is_suspended, resume, get_name,
- * get_pid, get_ppid, migrate
- */
- {NULL, NULL}
-};
-
/* ********************************************************************************* */
/* lua_stub_generator functions */
/* ********************************************************************************* */
return 0;
}
-/* ********************************************************************************* */
-/* simgrid.platf API */
-/* ********************************************************************************* */
-
-static const luaL_reg platf_functions[] = {
- {"open", console_open},
- {"close", console_close},
- {"AS_open", console_AS_open},
- {"AS_close", console_AS_close},
- {"host_new", console_add_host},
- {"link_new", console_add_link},
- {"router_new", console_add_router},
- {"route_new", console_add_route},
- {NULL, NULL}
-};
-
/* ********************************************************************************* */
/* simgrid API */
/* ********************************************************************************* */
lua_newtable(L);
lua_setfield(L, LUA_REGISTRYINDEX, "simgrid.maestro_tables");
- register_c_functions(L);
+ sglua_register_c_functions(L);
return 1;
}
return sglua_maestro_state;
}
-/**
- * \brief Registers the task functions into the table simgrid.task.
- *
- * Also initialize the metatable of the task userdata type.
- *
- * \param L a lua state
- */
-static void register_task_functions(lua_State* L)
-{
- /* create a table simgrid.task and fill it with task functions */
- luaL_openlib(L, TASK_MODULE_NAME, task_functions, 0);
- /* simgrid.task */
-
- /* create the metatable for tasks, add it to the Lua registry */
- luaL_newmetatable(L, TASK_MODULE_NAME);
- /* simgrid.task mt */
- /* fill the metatable */
- luaL_openlib(L, NULL, task_meta, 0);
- /* simgrid.task mt */
- lua_pushvalue(L, -2);
- /* simgrid.task mt simgrid.task */
- /* metatable.__index = simgrid.task
- * we put the task functions inside the task itself:
- * this allows to write my_task:method(args) for
- * simgrid.task.method(my_task, args) */
- lua_setfield(L, -2, "__index");
- /* simgrid.task mt */
- lua_pop(L, 2);
- /* -- */
-
- /* set up MSG to copy Lua tasks between states */
- MSG_task_set_copy_callback(task_copy_callback);
-}
-
-/**
- * \brief Registers the comm functions into the table simgrid.comm.
- *
- * Also initialize the metatable of the comm userdata type.
- *
- * \param L a lua state
- */
-static void register_comm_functions(lua_State* L)
-{
- /* create a table simgrid.com and fill it with com functions */
- luaL_openlib(L, COMM_MODULE_NAME, comm_functions, 0);
- /* simgrid.comm */
-
- /* create the metatable for comms, add it to the Lua registry */
- luaL_newmetatable(L, COMM_MODULE_NAME);
- /* simgrid.comm mt */
- /* fill the metatable */
- luaL_openlib(L, NULL, comm_meta, 0);
- /* simgrid.comm mt */
- lua_pushvalue(L, -2);
- /* simgrid.comm mt simgrid.comm */
- /* metatable.__index = simgrid.comm
- * we put the comm functions inside the comm itself:
- * this allows to write my_comm:method(args) for
- * simgrid.comm.method(my_comm, args) */
- lua_setfield(L, -2, "__index");
- /* simgrid.comm mt */
- lua_pop(L, 2);
- /* -- */
-}
-
-/**
- * \brief Registers the host functions into the table simgrid.host.
- *
- * Also initialize the metatable of the host userdata type.
- *
- * \param L a lua state
- */
-static void register_host_functions(lua_State* L)
-{
- /* create a table simgrid.host and fill it with host functions */
- luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);
- /* simgrid.host */
-
- /* create the metatable for host, add it to the Lua registry */
- luaL_newmetatable(L, HOST_MODULE_NAME);
- /* simgrid.host mt */
- /* fill the metatable */
- luaL_openlib(L, NULL, host_meta, 0);
- /* simgrid.host mt */
- lua_pushvalue(L, -2);
- /* simgrid.host mt simgrid.host */
- /* metatable.__index = simgrid.host
- * we put the host functions inside the host userdata itself:
- * this allows to write my_host:method(args) for
- * simgrid.host.method(my_host, args) */
- lua_setfield(L, -2, "__index");
- /* simgrid.host mt */
- lua_pop(L, 2);
- /* -- */
-}
-
-/**
- * \brief Registers the process functions into the table simgrid.process.
- * \param L a lua state
- */
-static void register_process_functions(lua_State* L)
-{
- luaL_openlib(L, PROCESS_MODULE_NAME, process_functions, 0);
- /* simgrid.process */
- lua_pop(L, 1);
-}
-
-/**
- * \brief Registers the platform functions into the table simgrid.platf.
- * \param L a lua state
- */
-static void register_platf_functions(lua_State* L)
-{
- luaL_openlib(L, PLATF_MODULE_NAME, platf_functions, 0);
- /* simgrid.platf */
- lua_pop(L, 1);
-}
-
/**
* \brief Makes the core functions available to the Lua world.
* \param L a Lua world
*/
-static void register_core_functions(lua_State *L)
+static void sglua_register_core_functions(lua_State *L)
{
/* register the core C functions to lua */
luaL_register(L, "simgrid", simgrid_functions);
* \brief Creates the simgrid module and make it available to Lua.
* \param L a Lua world
*/
-static void register_c_functions(lua_State *L)
+static void sglua_register_c_functions(lua_State *L)
{
- register_core_functions(L);
- register_task_functions(L);
- register_comm_functions(L);
- register_host_functions(L);
- register_process_functions(L);
- register_platf_functions(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);
}
/**
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];
+}
#ifndef SIMGRID_LUA_H
#define SIMGRID_LUA_H
-#include <stdio.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#include "msg/msg.h"
-#include "simdag/simdag.h"
-#include <gras.h>
-#include "xbt.h"
-#include "xbt/dynar.h"
#include "xbt/dict.h"
-#include "xbt/sysdep.h"
-#include "xbt/function_types.h"
-#include "xbt/log.h"
-#include "surf/surfxml_parse.h"
-#include "surf/surf.h"
-#include <stdarg.h>
+#include "xbt/dynar.h"
+#include <lua.h>
extern xbt_dict_t process_function_set;
extern xbt_dynar_t process_list;
void generate_makefile_local(const char *project);
/* ********************************************************************************* */
-/* Console functions */
+/* Plaftorm functions */
/* ********************************************************************************* */
-// Public Functions
+
int console_open(lua_State *L);
int console_close(lua_State *L);
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
- SIMIX_comm_set_copy_data_callback(MSG_comm_copy_data_from_SIMIX);
}
#ifdef HAVE_TRACING
TRACE_start();
*/
void MSG_task_set_copy_callback(void (*callback)
(m_task_t task, m_process_t sender, m_process_t receiver)) {
+
msg_global->task_copy_callback = callback;
+
+ if (callback) {
+ SIMIX_comm_set_copy_data_callback(MSG_comm_copy_data_from_SIMIX);
+ }
+ else {
+ SIMIX_comm_set_copy_data_callback(SIMIX_comm_copy_pointer_callback);
+ }
}
/** \ingroup m_task_management
"Context switching mecanism");
char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
-smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
+XBT_PUBLIC(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use = NULL;
int smx_context_stack_size = 128 * 1024;
#ifdef HAVE_THREAD_LOCAL_STORAGE
/**
* \brief Returns the list of processes to run.
*/
-XBT_INLINE xbt_dynar_t SIMIX_process_get_runnable(void)
+xbt_dynar_t SIMIX_process_get_runnable(void)
{
return simix_global->process_to_run;
}
}\r
\r
/* Set the instruction and the stack pointer */\r
- #ifdef I_X86_\r
+ #ifdef _I_X86_\r
ucp->uc_mcontext.Eip = (DWORD) func;\r
ucp->uc_mcontext.Esp = (DWORD) sp - sizeof(void*);\r
#endif\r
void (*parent)(void), void (*child)(void))
{
#ifdef WIN32
- return 0; //pthread_atfork is not implemented in pthread.h on windows
+ THROW_UNIMPLEMENTED; //pthread_atfork is not implemented in pthread.h on windows
#else
return pthread_atfork(prepare, parent, child);
#endif
