#include <lauxlib.h>
#include <lualib.h>
#include "msg/msg.h"
+#include "simdag/simdag.h"
+#include <gras.h>
#include "xbt.h"
+#include "lua_stub_generator.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings");
// Surf ( bypass XML )
#define LINK_MODULE_NAME "simgrid.Link"
#define ROUTE_MODULE_NAME "simgrid.Route"
-#undef BYPASS_MODEL
/* ********************************************************************************* */
/* helper functions */
/* ********************************************************************************* */
-
static void stackDump (const char *msg, lua_State *L) {
char buff[2048];
char *p=buff;
const char *name=luaL_checkstring(L,1);
int comp_size = luaL_checkint(L,2);
int msg_size = luaL_checkint(L,3);
- 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));
typedef struct t_host_attr
{
//platform attribute
+ // Mandatory attributes
const char* id;
- double power;
+ double power_peak;
+ // Optional attributes
+ double power_scale;
+ const char *power_trace;
+ int state_initial;
+ const char *state_trace;
//deployment attribute
const char* function;
xbt_dynar_t args_list;
typedef struct t_link_attr
{
+ //mandatory attributes
const char* id;
double bandwidth;
double latency;
+ // Optional attributes
+ const char* bandwidth_trace;
+ const char* latency_trace;
+ const char* state_trace;
+ int state_initial;
+ int policy;
}link_attr,*p_link_attr;
typedef struct t_route_attr
static xbt_dynar_t link_list_d ;
static xbt_dynar_t route_list_d ;
-static int Host_new(lua_State *L) //(id,power)
+
+/**
+ * create host resource via CPU model [for MSG]
+ */
+
+static void create_host(const char* id,double power_peak,double power_sc,
+ const char* power_tr,int state_init,
+ const char* state_tr)
{
- // if it's the first time ,instanciate the dynar
+
+ double power_scale = 1.0;
+ tmgr_trace_t power_trace = NULL;
+ e_surf_resource_state_t state_initial;
+ tmgr_trace_t state_trace;
+ if(power_sc) // !=0
+ power_scale = power_sc;
+ if (state_init == -1)
+ state_initial = SURF_RESOURCE_OFF;
+ else
+ state_initial = SURF_RESOURCE_ON;
+ if(power_tr)
+ power_trace = tmgr_trace_new(power_tr);
+ else
+ power_trace = tmgr_trace_new("");
+ if(state_tr)
+ state_trace = tmgr_trace_new(state_tr);
+ else
+ state_trace = tmgr_trace_new("");
+ current_property_set = xbt_dict_new();
+ surf_host_create_resource(xbt_strdup(id), power_peak, power_scale,
+ power_trace, state_initial, state_trace, current_property_set);
+
+}
+
+/**
+ * create link resource via network model
+ */
+static void create_link(const char *name,
+ double bw_initial,const char *trace,double lat_initial,
+ const char* latency_trace,int state_init, const char* state_trace,int policy)
+{
+ tmgr_trace_t bw_trace;
+ tmgr_trace_t lat_trace;
+ e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
+ e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
+ tmgr_trace_t st_trace;
+ if(trace)
+ bw_trace = tmgr_trace_new(trace);
+ else
+ bw_trace = tmgr_trace_new("");
+
+ if(latency_trace)
+ lat_trace = tmgr_trace_new(latency_trace);
+ else
+ lat_trace = tmgr_trace_new("");
+
+ if(state_trace)
+ st_trace = tmgr_trace_new(state_trace);
+ else
+ st_trace = tmgr_trace_new("");
+
+ if(state_init == -1)
+ state_initial_link = SURF_RESOURCE_OFF;
+ if(policy == -1)
+ policy_initial_link = SURF_LINK_FATPIPE;
+
+ surf_link_create_resource(xbt_strdup(name), bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial_link, st_trace,
+ policy_initial_link, xbt_dict_new());
+}
+
+
+/*
+ *create host resource via workstation_ptask_L07 model [for SimDag]
+ */
+static void create_host_wsL07(const char* id,double power_peak,double power_sc,
+ const char* power_tr,int state_init,
+ const char* state_tr)
+{
+ double power_scale = 1.0;
+ tmgr_trace_t power_trace = NULL;
+ e_surf_resource_state_t state_initial;
+ tmgr_trace_t state_trace;
+ if(power_sc) // !=0
+ power_scale = power_sc;
+ if (state_init == -1)
+ state_initial = SURF_RESOURCE_OFF;
+ else
+ state_initial = SURF_RESOURCE_ON;
+ if(power_tr)
+ power_trace = tmgr_trace_new(power_tr);
+ else
+ power_trace = tmgr_trace_new("");
+ if(state_tr)
+ state_trace = tmgr_trace_new(state_tr);
+ else
+ state_trace = tmgr_trace_new("");
+ current_property_set = xbt_dict_new();
+ surf_wsL07_host_create_resource(xbt_strdup(id), power_peak, power_scale,
+ power_trace, state_initial, state_trace, current_property_set);
+
+}
+/*
+ * add new host to platform hosts list
+ */
+static int Host_new(lua_State *L)
+{
+
if(xbt_dynar_is_empty(host_list_d))
host_list_d = xbt_dynar_new(sizeof(p_host_attr), &xbt_free_ref);
- p_host_attr host = malloc(sizeof(host_attr));
- host->id = luaL_checkstring(L,1);
- host->power = luaL_checknumber(L,2);
- host->function = NULL;
- xbt_dynar_push(host_list_d, &host);
- return 0;
+ p_host_attr host;
+ const char * id;
+ const char *power_trace;
+ const char *state_trace;
+ double power,power_scale;
+ int state_initial;
+ //get values from the table passed as argument
+ if (lua_istable(L,-1)) {
+
+ // get Id Value
+ lua_pushstring(L,"id");
+ lua_gettable(L, -2 );
+ id = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ // get power value
+ lua_pushstring(L,"power");
+ lua_gettable(L, -2 );
+ power = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ //get power_scale
+ lua_pushstring(L,"power_scale");
+ lua_gettable(L, -2 );
+ power_scale = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ //get power_trace
+ lua_pushstring(L,"power_trace");
+ lua_gettable(L, -2 );
+ power_trace = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ //get state initial
+ lua_pushstring(L,"state_initial");
+ lua_gettable(L, -2 );
+ state_initial = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ //get trace state
+ lua_pushstring(L,"state_trace");
+ lua_gettable(L, -2 );
+ state_trace = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ } else {
+ ERROR0("Bad Arguments to create host, Should be a table with named arguments");
+ return -1;
+ }
+
+ host = malloc(sizeof(host_attr));
+ host->id = id;
+ host->power_peak = power;
+ host->power_scale = power_scale;
+ host->power_trace = power_trace;
+ host->state_initial = state_initial;
+ host->state_trace = state_trace;
+ host->function = NULL;
+ xbt_dynar_push(host_list_d, &host);
+
+ return 0;
}
+/**
+ * add link to platform links list
+ */
static int Link_new(lua_State *L) // (id,bandwidth,latency)
{
if(xbt_dynar_is_empty(link_list_d))
link_list_d = xbt_dynar_new(sizeof(p_link_attr), &xbt_free_ref);
+ const char* id;
+ double bandwidth,latency;
+ const char* bandwidth_trace;
+ const char* latency_trace;
+ const char* state_trace;
+ int state_initial,policy;
+
+ //get values from the table passed as argument
+ if (lua_istable(L,-1)) {
+ // get Id Value
+ lua_pushstring(L,"id");
+ lua_gettable(L, -2 );
+ id = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ // get bandwidth value
+ lua_pushstring(L,"bandwidth");
+ lua_gettable(L, -2 );
+ bandwidth = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ //get latency value
+ lua_pushstring(L,"latency");
+ lua_gettable(L, -2 );
+ latency = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ /*Optional Arguments */
+
+ //get bandwidth_trace value
+ lua_pushstring(L,"bandwidth_trace");
+ lua_gettable(L, -2 );
+ bandwidth_trace = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ //get latency_trace value
+ lua_pushstring(L,"latency_trace");
+ lua_gettable(L, -2 );
+ latency_trace = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ //get state_trace value
+ lua_pushstring(L,"state_trace");
+ lua_gettable(L, -2 );
+ state_trace = lua_tostring(L,-1);
+ lua_pop(L,1);
+
+ //get state_initial value
+ lua_pushstring(L,"state_initial");
+ lua_gettable(L, -2 );
+ state_initial = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+
+ //get policy value
+ lua_pushstring(L,"policy");
+ lua_gettable(L, -2 );
+ policy = lua_tonumber(L,-1);
+ lua_pop(L,1);
+
+ } else {
+ ERROR0("Bad Arguments to create link, Should be a table with named arguments");
+ return -1;
+ }
+
p_link_attr link = malloc(sizeof(link_attr));
- link->id = luaL_checkstring(L,1);
- link->bandwidth = luaL_checknumber(L,2);
- link->latency = luaL_checknumber(L,3);
+ link->id = id;
+ link->bandwidth = bandwidth;
+ link->latency = latency;
+ link->bandwidth_trace = bandwidth_trace;
+ link->latency_trace = latency_trace;
+ link->state_trace = state_trace;
+ link->state_initial= state_initial;
+ link->policy = policy;
xbt_dynar_push(link_list_d,&link);
return 0;
}
+/**
+ * add route to platform routes list
+ */
static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table)
{
if(xbt_dynar_is_empty(route_list_d))
route_list_d = xbt_dynar_new(sizeof(p_route_attr), &xbt_free_ref);
- int i;
const char * link_id;
p_route_attr route = malloc(sizeof(route_attr));
route->src_id = luaL_checkstring(L,1);
return 0;
}
+/**
+ * set function to process
+ */
static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args)
{
// look for the index of host in host_list
if(p_host->id == host_id)
{
p_host->function = luaL_checkstring(L,2);
- p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- // fill the args list
- lua_pushnil(L);
- int j = 0;
- while (lua_next(L,3) != 0) {
- argument = lua_tostring(L, -1);
- xbt_dynar_push(p_host->args_list, &argument);
- DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
- j++;
- lua_pop(L, 1);
- }
+ if(lua_istable(L,3))
+ {
+ p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ // fill the args list
+ lua_pushnil(L);
+ int j = 0;
+ while (lua_next(L,3) != 0) {
+ argument = lua_tostring(L, -1);
+ xbt_dynar_push(p_host->args_list, &argument);
+ DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
+ j++;
+ lua_pop(L, 1);
+ }
+ }
lua_pop(L, 1);
return 0;
}
/*
* surf parse bypass platform
+ * through CPU/network Models
*/
+
static int surf_parse_bypass_platform()
{
- char buffer[22];
- unsigned int i,j;
- char* link_id;
-
+ unsigned int i;
p_host_attr p_host;
p_link_attr p_link;
p_route_attr p_route;
- static int AX_ptr = 0;
- static int surfxml_bufferstack_size = 2048;
-
- /* FIXME allocating memory for the buffer, I think 2kB should be enough */
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- /* <platform> */
- SURFXML_BUFFER_SET(platform_version, "2");
-#ifndef BYPASS_CPU
- SURFXML_START_TAG(platform);
-#endif
-
// Add Hosts
xbt_dynar_foreach(host_list_d,i,p_host)
{
-
-#ifdef BYPASS_MODEL
- INFO0("Bypass_Cpu");
- surf_cpu_model_init_bypass_im(p_host->id,p_host->power);
-#else
-
- SURFXML_BUFFER_SET(host_id,p_host->id);
- sprintf(buffer,"%f",p_host->power);
- SURFXML_BUFFER_SET(host_power,buffer);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
- SURFXML_BUFFER_SET(host_interference_send, "1.0");
- SURFXML_BUFFER_SET(host_interference_recv, "1.0");
- SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
-#endif
+ create_host(p_host->id,p_host->power_peak,p_host->power_scale,p_host->power_trace,
+ p_host->state_initial,p_host->state_trace);
+ //add to routing model host list
+ surf_route_add_host((char*)p_host->id);
}
//add Links
- INFO0("Start Adding Links");
xbt_dynar_foreach(link_list_d,i,p_link)
{
-#ifdef BYPASS_MODEL
-
- INFO0("Bypass_Network");
- surf_network_model_init_bypass(p_link->id,p_link->bandwidth,p_link->latency);
-#else
-
- SURFXML_BUFFER_SET(link_id,p_link->id);
- sprintf(buffer,"%f",p_link->bandwidth);
- SURFXML_BUFFER_SET(link_bandwidth,buffer);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- sprintf(buffer,"%f",p_link->latency);
- SURFXML_BUFFER_SET(link_latency,buffer);
- SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
- SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
-#endif
+ /*(const char *name,
+ double bw_initial,const char *trace,double lat_initial,
+ const char* latency_trace,int state_init, const char* state_trace,int policy)*/
+ create_link(p_link->id,p_link->bandwidth,p_link->bandwidth_trace,p_link->latency,
+ p_link->latency_trace,p_link->state_initial,p_link->state_trace,p_link->policy);
}
-
// add route
- INFO0("Start Adding routes");
xbt_dynar_foreach(route_list_d,i,p_route)
{
-#ifndef BYPASS_MODEL
+ surf_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0);
+ }
+ /* </platform> */
- SURFXML_BUFFER_SET(route_src,p_route->src_id);
- SURFXML_BUFFER_SET(route_dst,p_route->dest_id);
- SURFXML_BUFFER_SET(route_impact_on_src, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0");
- SURFXML_START_TAG(route);
+ surf_add_host_traces();
+ surf_set_routes();
+ surf_add_link_traces();
- xbt_dynar_foreach(p_route->links_id,j,link_id)
- {
- SURFXML_BUFFER_SET(link_c_ctn_id,link_id);
- SURFXML_START_TAG(link_c_ctn);
- SURFXML_END_TAG(link_c_ctn);
- }
+ return 0; // must return 0 ?!!
+
+}
+
+/**
+ *
+ * surf parse bypass platform
+ * through workstation_ptask_L07 Model
+ */
+
+
+static int surf_wsL07_parse_bypass_platform()
+{
+ unsigned int i;
+ p_host_attr p_host;
+ p_link_attr p_link;
+ p_route_attr p_route;
+
+ // Add Hosts
+ xbt_dynar_foreach(host_list_d,i,p_host)
+ {
+ create_host_wsL07(p_host->id,p_host->power_peak,p_host->power_scale,p_host->power_trace,
+ p_host->state_initial,p_host->state_trace);
+ //add to routing model host list
+ surf_route_add_host((char*)p_host->id);
+ }
- SURFXML_END_TAG(route);
-#endif
+ //add Links
+ xbt_dynar_foreach(link_list_d,i,p_link)
+ {
+ surf_wsL07_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency);
+ }
+ // add route
+ xbt_dynar_foreach(route_list_d,i,p_route)
+ {
+ surf_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0);
}
/* </platform> */
-#ifndef BYPASS_MODEL
- SURFXML_END_TAG(platform);
-#endif
- free(surfxml_bufferstack);
- return 0; // must return 0 ?!!
+ surf_wsL07_add_traces();
+ surf_set_routes();
+
+ return 0;
}
/*
- * surf parse bypass application
+ * surf parse bypass application for MSG Module
*/
static int surf_parse_bypass_application()
{
- unsigned int i,j;
+ unsigned int i;
p_host_attr p_host;
- char * arg;
- static int AX_ptr;
- static int surfxml_bufferstack_size = 2048;
- /* FIXME ( should be manual )allocating memory to the buffer, I think 2MB should be enough */
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- /* <platform> */
- SURFXML_BUFFER_SET(platform_version, "2");
- SURFXML_START_TAG(platform);
-
xbt_dynar_foreach(host_list_d,i,p_host)
- {
+ {
if(p_host->function)
- {
- SURFXML_BUFFER_SET(process_host, p_host->id);
- SURFXML_BUFFER_SET(process_function, p_host->function);
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- SURFXML_START_TAG(process);
- //args
- xbt_dynar_foreach(p_host->args_list,j,arg)
- {
- SURFXML_BUFFER_SET(argument_value,arg);
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
- }
- SURFXML_END_TAG(process);
- }
- }
- /* </platform> */
- SURFXML_END_TAG(platform);
- free(surfxml_bufferstack);
+ MSG_set_function(p_host->id,p_host->function,p_host->args_list);
+ }
return 0;
}
+
+/**
+ * Generate Gras Templates File from lua
+ */
+
+xbt_dict_t process_function_set;
+xbt_dynar_t process_list;
+xbt_dict_t machine_set;
+static s_process_t process;
+
+void s_process_free(void *process)
+{
+ s_process_t *p = (s_process_t *) process;
+ int i;
+ for (i = 0; i < p->argc; i++)
+ free(p->argv[i]);
+ free(p->argv);
+ free(p->host);
+}
+
+static int gras_add_process_function(lua_State *L)
+{
+ const char * arg;
+ const char* process_host = luaL_checkstring(L,1);
+ const char *process_function = luaL_checkstring(L,2);
+
+ if(xbt_dict_is_empty(machine_set) || xbt_dict_is_empty(process_function_set)
+ || xbt_dynar_is_empty(process_list))
+ {
+ process_function_set = xbt_dict_new();
+ process_list = xbt_dynar_new(sizeof(s_process_t), s_process_free);
+ machine_set = xbt_dict_new();
+ }
+
+ xbt_dict_set(machine_set,process_host, NULL, NULL);
+ xbt_dict_set(process_function_set,process_function, NULL, NULL);
+
+ process.argc = 1;
+ process.argv = xbt_new(char *, 1);
+ process.argv[0] = xbt_strdup(process_function);
+ process.host = strdup(process_host);
+
+ lua_pushnil(L);
+ while (lua_next(L,3) != 0) {
+ arg = lua_tostring(L, -1);
+ process.argc++;
+ process.argv = xbt_realloc(process.argv, (process.argc) * sizeof(char *));
+ process.argv[(process.argc) - 1] = xbt_strdup(arg);
+
+ DEBUG2("index = %f , arg = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 1);
+ //add to the process list
+ xbt_dynar_push(process_list, &process);
+
+ return 0;
+
+}
+
+
+static int gras_generate(lua_State *L)
+{
+ const char *project_name = luaL_checkstring(L,1);
+ generate_sim(project_name);
+ generate_rl(project_name);
+ generate_makefile_local(project_name);
+
+ return 0;
+}
+
//***********Register Methods *******************************************//
/*
* Host Methods
*/
static const luaL_reg Route_methods[] ={
{"new",Route_new},
+ {0,0}
};
/*
res = lua_tonumber(L, -1);
lua_pop(L, 1); /* pop returned value */
}
-
// cleanups
luaL_unref(simgrid_lua_state,LUA_REGISTRYINDEX,ref );
DEBUG1("Execution of lua code %s is over", (argv ? argv[0] : "(null)"));
}
/*
- * Bypass XML Pareser
+ * Bypass XML Parser
*/
-static int register_platform(lua_State *L)
+
+/*
+ * Register platform for MSG
+ */
+static int msg_register_platform(lua_State *L)
{
/* Tell Simgrid we dont wanna use its parser*/
surf_parse = surf_parse_bypass_platform;
return 0;
}
-static int register_application(lua_State *L)
+/*
+ * Register platform for Simdag
+ */
+
+static int sd_register_platform(lua_State *L)
+{
+ surf_parse = surf_wsL07_parse_bypass_platform;
+ SD_create_environment(NULL);
+ return 0;
+}
+/*
+ * Register platform for gras
+ */
+static int gras_register_platform(lua_State *L)
+{
+ /* Tell Simgrid we dont wanna use surf parser*/
+ surf_parse = surf_parse_bypass_platform;
+ gras_create_environment(NULL);
+ return 0;
+}
+
+/**
+ * Register applicaiton for MSG
+ */
+static int msg_register_application(lua_State *L)
{
MSG_function_register_default(run_lua_code);
surf_parse = surf_parse_bypass_application;
return 0;
}
+/*
+ * Register application for gras
+ */
+static int gras_register_application(lua_State *L)
+{
+ gras_function_register_default(run_lua_code);
+ surf_parse = surf_parse_bypass_application;
+ gras_launch_application(NULL);
+ return 0;
+}
static const luaL_Reg simgrid_funcs[] = {
{ "create_environment", create_environment},
{ "launch_application", launch_application},
{ "platform", create_environment},
{ "application", launch_application},
/* methods to bypass XML parser*/
- { "register_platform",register_platform},
- { "register_application",register_application},
+ { "msg_register_platform",msg_register_platform},
+ { "sd_register_platform",sd_register_platform},
+ { "msg_register_application",msg_register_application},
+ { "gras_register_platform",gras_register_platform},
+ { "gras_register_application",gras_register_application},
+ /* gras sub generator method*/
+ {"gras_set_process_function",gras_add_process_function},
+ {"gras_generate",gras_generate},
{ NULL, NULL }
};
extern const char*xbt_ctx_factory_to_use; /*Hack: let msg load directly the right factory */
#define LUA_MAX_ARGS_COUNT 10 /* maximum amount of arguments we can get from lua on command line */
-
+#define TEST
int luaopen_simgrid(lua_State* L); // Fuck gcc: we don't need that prototype
int luaopen_simgrid(lua_State* L) {
- //xbt_ctx_factory_to_use = "lua";
+ //xbt_ctx_factory_to_use = "lua";
char **argv=malloc(sizeof(char*)*LUA_MAX_ARGS_COUNT);
int argc=1;
argv[0] = (char*)"/usr/bin/lua"; /* Lie on the argv[0] so that the stack dumping facilities find the right binary. FIXME: what if lua is not in that location? */
/* Get the command line arguments from the lua interpreter */
lua_getglobal(L,"arg");
- xbt_assert1(lua_istable(L,-1),"arg parameter is not a table but a %s",lua_typename(L,-1));
- int done=0;
- while (!done) {
- argc++;
- lua_pushinteger(L,argc-2);
- lua_gettable(L,-2);
- if (lua_isnil(L,-1)) {
- done = 1;
- } else {
- xbt_assert1(lua_isstring(L,-1),"argv[%d] got from lua is no string",argc-1);
- xbt_assert2(argc<LUA_MAX_ARGS_COUNT,
- "Too many arguments, please increase LUA_MAX_ARGS_COUNT in %s before recompiling SimGrid if you insist on having more than %d args on command line",
- __FILE__,LUA_MAX_ARGS_COUNT-1);
- argv[argc-1] = (char*)luaL_checkstring(L,-1);
- lua_pop(L,1);
- DEBUG1("Got command line argument %s from lua",argv[argc-1]);
- }
- }
- argv[argc--]=NULL;
-
- /* Initialize the MSG core */
- MSG_global_init(&argc,argv);
- DEBUG1("Still %d arguments on command line",argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+ /* if arg is a null value, it means we use lua only as a script to init platform
+ * else it should be a table and then take arg in consideration
+ */
+ if(lua_istable(L,-1))
+ {
+ int done=0;
+ while (!done) {
+ argc++;
+ lua_pushinteger(L,argc-2);
+ lua_gettable(L,-2);
+ if (lua_isnil(L,-1)) {
+ done = 1;
+ } else {
+ xbt_assert1(lua_isstring(L,-1),"argv[%d] got from lua is no string",argc-1);
+ xbt_assert2(argc<LUA_MAX_ARGS_COUNT,
+ "Too many arguments, please increase LUA_MAX_ARGS_COUNT in %s before recompiling SimGrid if you insist on having more than %d args on command line",
+ __FILE__,LUA_MAX_ARGS_COUNT-1);
+ argv[argc-1] = (char*)luaL_checkstring(L,-1);
+ lua_pop(L,1);
+ DEBUG1("Got command line argument %s from lua",argv[argc-1]);
+ }
+ }
+ argv[argc--]=NULL;
+ /* Initialize the MSG core */
+ MSG_global_init(&argc,argv);
+ DEBUG1("Still %d arguments on command line",argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+ }
/* register the core C functions to lua */
luaL_register(L, "simgrid", simgrid_funcs);
/* register the task methods to lua */
