/* 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 <stdio.h>
-#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"
+#include "simgrid_lua.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
+lua_State *simgrid_lua_state;
+
#define TASK_MODULE_NAME "simgrid.Task"
#define HOST_MODULE_NAME "simgrid.Host"
// Surf ( bypass XML )
#define LINK_MODULE_NAME "simgrid.Link"
#define ROUTE_MODULE_NAME "simgrid.Route"
#define AS_MODULE_NAME "simgrid.AS"
+#define TRACE_MODULE_NAME "simgrid.Trace"
/* ********************************************************************************* */
/* helper functions */
}
-/*****************************************************************************************
- * BYPASS XML SURF Methods *
- ***************************
- ***************************
-******************************************************************************************/
-#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
-#include "surf/surf_private.h"
-
-typedef struct t_AS_attr {
- const char *id;
- const char *mode;
-} AS_attr, *p_AS_attr;
-
-typedef struct t_host_attr {
- //platform attribute
- // Mandatory attributes
- const char *id;
- 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;
-} host_attr, *p_host_attr;
-
-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 {
- const char *src_id;
- const char *dest_id;
- xbt_dynar_t links_id;
-
-} route_attr, *p_route_attr;
-
-//AS : One struct needed
-static p_AS_attr AS;
-
-//using xbt_dynar_t :
-static xbt_dynar_t host_list_d;
-static xbt_dynar_t link_list_d;
-static xbt_dynar_t route_list_d;
-
-
-/*
- * Initialize platform model routing
- */
-static void create_AS(const char *id, const char *mode)
-{
- surf_AS_new(id, mode);
-}
-
-/**
- * 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)
-{
-
- 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);
-
-}
-
-/**
- * create link resource via workstation_ptask_L07 model [for SimDag]
- */
-
-static void create_link_wsL07(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_wsL07_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());
-}
-
-
-/*
- * init AS
- */
-
-static int AS_new(lua_State * L)
-{
- const char *id;
- const char *mode;
- if (lua_istable(L, 1)) {
- lua_pushstring(L, "id");
- lua_gettable(L, -2);
- id = lua_tostring(L, -1);
- lua_pop(L, 1);
-
- lua_pushstring(L, "mode");
- lua_gettable(L, -2);
- mode = lua_tostring(L, -1);
- lua_pop(L, 1);
- } else {
- ERROR0
- ("Bad Arguments to AS.new, Should be a table with named arguments");
- return -1;
- }
- AS = malloc(sizeof(AS_attr));
- AS->id = id;
- AS->mode = mode;
-
- return 0;
-}
-
-/*
- * 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;
- 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 = 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);
- const char *link_id;
- p_route_attr route = malloc(sizeof(route_attr));
- route->src_id = luaL_checkstring(L, 1);
- route->dest_id = luaL_checkstring(L, 2);
- route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- lua_pushnil(L);
- while (lua_next(L, 3) != 0) {
- link_id = lua_tostring(L, -1);
- xbt_dynar_push(route->links_id, &link_id);
- DEBUG2("index = %f , Link_id = %s \n", lua_tonumber(L, -2),
- lua_tostring(L, -1));
- lua_pop(L, 1);
- }
- lua_pop(L, 1);
-
- //add route to platform's route list
- xbt_dynar_push(route_list_d, &route);
- 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
- const char *host_id = luaL_checkstring(L, 1);
- const char *argument;
- unsigned int i;
- p_host_attr p_host;
-
- xbt_dynar_foreach(host_list_d, i, p_host) {
- if (p_host->id == host_id) {
- p_host->function = luaL_checkstring(L, 2);
- 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;
- }
- }
- ERROR1("Host : %s Not Found !!", host_id);
- return 1;
-}
-
-/*
- * surf parse bypass platform
- * through CPU/network Models
- */
-
-static int surf_parse_bypass_platform()
-{
- unsigned int i;
- p_host_attr p_host;
- p_link_attr p_link;
- p_route_attr p_route;
-
- // Init routing mode
- create_AS(AS->id, AS->mode);
-
-
- // Add Hosts
- xbt_dynar_foreach(host_list_d, i, p_host) {
- 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
- xbt_dynar_foreach(link_list_d, i, p_link) {
- 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
- xbt_dynar_foreach(route_list_d, i, p_route) {
- surf_routing_add_route((char *) p_route->src_id,
- (char *) p_route->dest_id, p_route->links_id);
- }
- /* </platform> */
-
- // Finalize AS
- surf_AS_finalize(AS->id);
-
- // add traces
- surf_add_host_traces();
- surf_add_link_traces();
-
- return 0; // must return 0 ?!!
-
-}
-
-/**
- *
- * surf parse bypass platform
- * through workstation_ptask_L07 Model
- */
-
-
-static int surf_wsL07_parse_bypass_platform()
+static int Host_self(lua_State * L)
{
- unsigned int i;
- p_host_attr p_host;
- p_link_attr p_link;
- p_route_attr p_route;
-
- // Init routing mode
- create_AS(AS->id, AS->mode);
-
- // 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);
- }
-
- //add Links
- xbt_dynar_foreach(link_list_d, i, p_link) {
- create_link_wsL07(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
- xbt_dynar_foreach(route_list_d, i, p_route) {
- surf_routing_add_route((char *) p_route->src_id,
- (char *) p_route->dest_id, p_route->links_id);
- }
- /* </platform> */
-
- // Finalize AS
- surf_AS_finalize(AS->id);
- // add traces
- surf_wsL07_add_traces();
+ m_host_t host = MSG_host_self();
+ lua_newtable(L);
+ 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");
+ return 1;
- return 0;
}
-/*
- * surf parse bypass application for MSG Module
- */
-static int surf_parse_bypass_application()
+static int Host_get_property_value(lua_State * L)
{
- unsigned int i;
- p_host_attr p_host;
- xbt_dynar_foreach(host_list_d, i, p_host) {
- if (p_host->function)
- MSG_set_function(p_host->id, p_host->function, p_host->args_list);
- }
- return 0;
+ m_host_t ht = checkHost(L, -2);
+ const char *prop = luaL_checkstring(L, -1);
+ lua_pushstring(L,MSG_host_get_property_value(ht,prop));
+ return 1;
}
-
-/**
- * Generate Gras Templates File from lua
- */
+/* ********************************************************************************* */
+/* lua_stub_generator functions */
+/* ********************************************************************************* */
xbt_dict_t process_function_set;
xbt_dynar_t process_list;
generate_sim(project_name);
generate_rl(project_name);
generate_makefile_local(project_name);
-
return 0;
}
+/***********************************
+ * Tracing
+ **********************************/
+static int trace_start(lua_State *L)
+{
+#ifdef HAVE_TRACING
+ TRACE_start();
+#endif
+ return 1;
+}
+
+static int trace_category(lua_State * L)
+{
+#ifdef HAVE_TRACING
+ TRACE_category(luaL_checkstring(L, 1));
+#endif
+ return 1;
+}
+
+static int trace_set_task_category(lua_State *L)
+{
+#ifdef HAVE_TRACING
+ TRACE_msg_set_task_category(checkTask(L, -2), luaL_checkstring(L, -1));
+#endif
+ return 1;
+}
+
+static int trace_end(lua_State *L)
+{
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+ return 1;
+}
//***********Register Methods *******************************************//
/*
* Host Methods
{"name", Host_get_name},
{"number", Host_number},
{"at", Host_at},
+ {"self",Host_self},
+ {"getPropValue",Host_get_property_value},
// Bypass XML Methods
- {"new", Host_new},
- {"setFunction", Host_set_function},
+ {"new", console_add_host},
+ {"setFunction", console_set_function},
{0, 0}
};
* AS Methods
*/
static const luaL_reg AS_methods[] = {
- {"new", AS_new},
+ {"new", console_add_AS},
{0, 0}
};
* Link Methods
*/
static const luaL_reg Link_methods[] = {
- {"new", Link_new},
+ {"new", console_add_link},
{0, 0}
};
* Route Methods
*/
static const luaL_reg Route_methods[] = {
- {"new", Route_new},
+ {"new", console_add_route},
{0, 0}
};
+/**
+ * Tracing Functions
+ */
+static const luaL_reg Trace_methods[] = {
+ {"start",trace_start},
+ {"category",trace_category},
+ {"setTaskCategory",trace_set_task_category},
+ {"finish",trace_end},
+ {0,0}
+};
/*
* Environment related
*/
const char *file = luaL_checkstring(L, 1);
DEBUG1("Loading environment file %s", file);
MSG_create_environment(file);
- smx_host_t *hosts = SIMIX_host_get_table();
- int i;
- for (i = 0; i < SIMIX_host_get_number(); i++) {
- DEBUG1("We have an host %s", SIMIX_host_get_name(hosts[i]));
+
+/*
+ xbt_dict_t hosts = SIMIX_host_get_dict();
+ smx_host_t host;
+ xbt_dict_cursor_t c;
+ const char *name;
+
+ xbt_dict_foreach(hosts, c, name, host) {
+ DEBUG1("We have an host %s", SIMIX_host_get_name(host));
}
+*/
return 0;
}
}
/*
- * Bypass XML Parser
+ * Bypass XML Parser (lua console)
*/
/*
static int msg_register_platform(lua_State * L)
{
/* Tell Simgrid we dont wanna use its parser */
- surf_parse = surf_parse_bypass_platform;
+ surf_parse = console_parse_platform;
MSG_create_environment(NULL);
return 0;
}
static int sd_register_platform(lua_State * L)
{
- surf_parse = surf_wsL07_parse_bypass_platform;
+ surf_parse = console_parse_platform_wsL07;
SD_create_environment(NULL);
return 0;
}
static int gras_register_platform(lua_State * L)
{
/* Tell Simgrid we dont wanna use surf parser */
- surf_parse = surf_parse_bypass_platform;
+ surf_parse = console_parse_platform;
gras_create_environment(NULL);
return 0;
}
static int msg_register_application(lua_State * L)
{
MSG_function_register_default(run_lua_code);
- surf_parse = surf_parse_bypass_application;
+ surf_parse = console_parse_application;
MSG_launch_application(NULL);
return 0;
}
static int gras_register_application(lua_State * L)
{
gras_function_register_default(run_lua_code);
- surf_parse = surf_parse_bypass_application;
+ surf_parse = console_parse_application;
gras_launch_application(NULL);
return 0;
}
/* module management functions */
/* ********************************************************************************* */
-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)
{
- //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? */
/*register the routes methods to lua */
luaL_openlib(L, ROUTE_MODULE_NAME, Route_methods, 0);
- luaL_newmetatable(L, LINK_MODULE_NAME);
+ luaL_newmetatable(L, ROUTE_MODULE_NAME);
+ lua_pop(L, 1);
+
+ /*register the Tracing functions to lua */
+ luaL_openlib(L, TRACE_MODULE_NAME, Trace_methods, 0);
+ luaL_newmetatable(L, TRACE_MODULE_NAME);
lua_pop(L, 1);
/* Keep the context mechanism informed of our lua world today */
