* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid_lua.h"
+#include "simgrid/platf.h"
#include <string.h>
#include <ctype.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_console, bindings, "Lua Bindings");
-
-//AS List
-static xbt_dynar_t as_list_d;
-
-/*
- * Initialize platform model routing
- */
-
-static void create_AS(const char *id, const char *mode)
-{
- routing_AS_init(id, mode);
+int console_open(lua_State *L) {
+ sg_platf_init();
+ sg_platf_open();
+ surf_parse_init_callbacks();
+ return 0;
}
-/**
- * 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 core,int state_init,
- const char *state_tr,xbt_dict_t properties)
-{
- double power_scale = 1.0;
- int core_nb = 1; //default value
- 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 (core)
- core_nb = core; //default value
- 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("");
-
- surf_host_create_resource(xbt_strdup(id), power_peak, power_scale,
- power_trace, core_nb, state_initial, state_trace,
- properties);
+int console_close(lua_State *L) {
+ sg_platf_close();
+ sg_platf_exit();
+ return 0;
}
-/**
- * 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("");
+int console_add_host(lua_State *L) {
+ s_sg_platf_host_cbarg_t host;
+ memset(&host,0,sizeof(host));
+ int state;
- if (latency_trace)
- lat_trace = tmgr_trace_new(latency_trace);
- else
- lat_trace = tmgr_trace_new("");
+ // we get values from the table passed as argument
+ if (!lua_istable(L, -1)) {
+ XBT_ERROR
+ ("Bad Arguments to create host, Should be a table with named arguments");
+ return -1;
+ }
- if (state_trace)
- st_trace = tmgr_trace_new(state_trace);
+ // get Id Value
+ lua_pushstring(L, "id");
+ lua_gettable(L, -2);
+ host.id = lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ // get power value
+ lua_pushstring(L, "power");
+ lua_gettable(L, -2);
+ host.power_peak = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+
+ //get power_scale
+ lua_pushstring(L, "power_scale");
+ lua_gettable(L, -2);
+ host.power_scale = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+
+ //get power_trace
+ lua_pushstring(L, "power_trace");
+ lua_gettable(L, -2);
+ host.power_trace = tmgr_trace_new(lua_tostring(L, -1));
+ lua_pop(L, 1);
+
+ lua_pushstring(L, "core");
+ lua_gettable(L, -2);
+ host.core_amount = lua_tonumber(L, -1);
+ if (host.core_amount == 0)
+ host.core_amount = 1;
+ lua_pop(L, 1);
+
+ //get state initial
+ lua_pushstring(L, "state_initial");
+ lua_gettable(L, -2);
+ state = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+ if (state)
+ host.initial_state = SURF_RESOURCE_ON;
else
- st_trace = tmgr_trace_new("");
+ host.initial_state = SURF_RESOURCE_OFF;
- if (state_init == -1)
- state_initial_link = SURF_RESOURCE_OFF;
- if (policy == -1)
- policy_initial_link = SURF_LINK_FATPIPE;
+ //get trace state
+ lua_pushstring(L, "state_trace");
+ lua_gettable(L, -2);
+ host.state_trace = tmgr_trace_new(lua_tostring(L, -1));
+ lua_pop(L, 1);
- 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());
-}
+ sg_platf_new_host(&host);
-/*
- *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("");
-
- surf_wsL07_host_create_resource(xbt_strdup(id), power_peak, power_scale,
- power_trace, state_initial, state_trace,
- current_property_set);
- current_property_set = NULL;
+ return 0;
}
-/**
- * create link resource via workstation_ptask_L07 model [for SimDag]
- */
+int console_add_link(lua_State *L) {
+ s_sg_platf_link_cbarg_t link;
+ memset(&link,0,sizeof(link));
-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("");
+ const char* policy;
- if (latency_trace)
- lat_trace = tmgr_trace_new(latency_trace);
- else
- lat_trace = tmgr_trace_new("");
+ if (! lua_istable(L, -1)) {
+ XBT_ERROR("Bad Arguments to create link, Should be a table with named arguments");
+ return -1;
+ }
- if (state_trace)
- st_trace = tmgr_trace_new(state_trace);
+ // get Id Value
+ lua_pushstring(L, "id");
+ lua_gettable(L, -2);
+ link.V_link_id = lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ // get bandwidth value
+ lua_pushstring(L, "bandwidth");
+ lua_gettable(L, -2);
+ link.V_link_bandwidth = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+
+ //get latency value
+ lua_pushstring(L, "latency");
+ lua_gettable(L, -2);
+ link.V_link_latency = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+
+ /*Optional Arguments */
+
+ //get bandwidth_trace value
+ lua_pushstring(L, "bandwidth_trace");
+ lua_gettable(L, -2);
+ link.V_link_bandwidth_file = tmgr_trace_new(lua_tostring(L, -1));
+ lua_pop(L, 1);
+
+ //get latency_trace value
+ lua_pushstring(L, "latency_trace");
+ lua_gettable(L, -2);
+ link.V_link_latency_file = tmgr_trace_new(lua_tostring(L, -1));
+ lua_pop(L, 1);
+
+ //get state_trace value
+ lua_pushstring(L, "state_trace");
+ lua_gettable(L, -2);
+ link.V_link_state_file = tmgr_trace_new(lua_tostring(L, -1));
+ lua_pop(L, 1);
+
+ //get state_initial value
+ lua_pushstring(L, "state_initial");
+ lua_gettable(L, -2);
+ if (lua_tonumber(L, -1))
+ link.V_link_state = SURF_RESOURCE_ON;
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());
-}
-
-
-/*
- * Append new AS to the Platform
- */
-
-static int AS_new(lua_State * L)
-{
-
- if (xbt_dynar_is_empty(as_list_d))
- as_list_d = xbt_dynar_new(sizeof(p_AS_attr), &xbt_free_ref);
-
- p_AS_attr AS;
- 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);
+ link.V_link_state = SURF_RESOURCE_OFF;
+ lua_pop(L, 1);
+
+ //get policy value
+ lua_pushstring(L, "policy");
+ lua_gettable(L, -2);
+ policy = lua_tostring(L, -1);
+ lua_pop(L, 1);
+ if (policy && !strcmp(policy,"FULLDUPLEX")) {
+ link.V_link_sharing_policy = SURF_LINK_FULLDUPLEX;
+ } else if (policy && !strcmp(policy,"FATPIPE")) {
+ link.V_link_sharing_policy = SURF_LINK_FATPIPE;
} else {
- XBT_ERROR
- ("Bad Arguments to AS.new, Should be a table with named arguments");
- return -1;
+ link.V_link_sharing_policy = SURF_LINK_SHARED;
}
- AS = malloc(sizeof(AS_attr));
- AS->id = id;
- AS->mode = mode;
- AS->host_list_d = xbt_dynar_new(sizeof(p_host_attr),&xbt_free_ref);
- AS->link_list_d = xbt_dynar_new(sizeof(p_link_attr),&xbt_free_ref);
- AS->route_list_d = xbt_dynar_new(sizeof(p_route_attr),&xbt_free_ref);
- AS->router_list_d = xbt_dynar_new(sizeof(p_router_attr),&xbt_free_ref);
- AS->sub_as_list_id = xbt_dynar_new(sizeof(p_AS_attr),&xbt_free_ref);
- xbt_dynar_push(as_list_d, &AS);
+
+ sg_platf_new_link(&link);
return 0;
}
-
/**
- * add sub AS to the Parent AS
- */
-static int AS_add(lua_State *L)
-{
- unsigned int i;
- p_AS_attr AS;
- p_AS_attr super_as,p_as;
- const char *super_AS_id;
- const char *sub_AS_id = NULL;
- const char *sub_AS_routing= NULL;
- if(lua_istable(L, -1))
- {
- lua_pushstring(L, "AS");
- lua_gettable(L, -2);
- super_AS_id = lua_tostring(L, -1);
- lua_pop(L,1);
-
- lua_pushstring(L, "id");
- lua_gettable(L, -2);
- sub_AS_id = lua_tostring(L, -1);
- lua_pop(L,1);
-
- }
-
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == super_AS_id){
- super_as = p_as;
- break;
- }
- }
- AS = malloc(sizeof(AS_attr));
- AS->id = sub_AS_id;
- AS->mode = sub_AS_routing;
- AS->host_list_d = xbt_dynar_new(sizeof(p_host_attr),&xbt_free_ref);
- AS->link_list_d = xbt_dynar_new(sizeof(p_link_attr),&xbt_free_ref);
- AS->route_list_d = xbt_dynar_new(sizeof(p_route_attr),&xbt_free_ref);
- AS->sub_as_list_id = xbt_dynar_new(sizeof(p_AS_attr),&xbt_free_ref);
- xbt_dynar_push(super_as->sub_as_list_id, &AS);
-
- return 0;
-}
-
-
-/*
- * add new host to platform hosts list
+ * add Router to AS components
*/
-static int Host_new(lua_State * L)
-{
- p_host_attr host;
- unsigned int i;
- p_AS_attr p_as,current_as = NULL;
- const char *AS_id;
- const char *id;
- const char *power_trace;
- const char *state_trace;
- double power, power_scale;
- int state_initial,core;
- //get values from the table passed as argument
- if (lua_istable(L, -1)) {
- // get AS id
- lua_pushstring(L, "AS");
- lua_gettable(L, -2);
- AS_id = lua_tostring(L, -1);
- lua_pop(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);
-
- lua_pushstring(L, "core");
- lua_gettable(L, -2);
- core = lua_tonumber(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);
+int console_add_router(lua_State* L) {
+ s_sg_platf_router_cbarg_t router;
+ memset(&router,0,sizeof(router));
- } else {
- XBT_ERROR
- ("Bad Arguments to create host, Should be a table with named arguments");
+ if (! lua_istable(L, -1)) {
+ XBT_ERROR("Bad Arguments to create router, Should be a table with named arguments");
return -1;
}
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == AS_id){
- current_as = p_as;
- break;
- }
- }
- if (!current_as)
- {
- XBT_ERROR("No AS_id :%s found",AS_id);
- return -2;
- }
+ lua_pushstring(L, "id");
+ lua_gettable(L, -2);
+ router.V_router_id = lua_tostring(L, -1);
+ lua_pop(L,1);
- host = malloc(sizeof(host_attr));
- host->id = id;
- host->power_peak = power;
- host->power_scale = power_scale;
- host->power_trace = power_trace;
- host->core = core;
- host->state_initial = state_initial;
- host->state_trace = state_trace;
- host->function = NULL;
- host->properties = xbt_dict_new();
- xbt_dynar_push(current_as->host_list_d, &host);
+ lua_pushstring(L,"coord");
+ lua_gettable(L,-2);
+ router.V_router_coord = lua_tostring(L, -1);
+ lua_pop(L,1);
+
+ sg_platf_new_router(&router);
return 0;
}
-/**
- * add link to AS links list
- */
-static int Link_new(lua_State * L) // (id,bandwidth,latency)
-{
- const char *AS_id;
- unsigned int i;
- p_AS_attr p_as,current_as = NULL;
- 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 AS id
- lua_pushstring(L, "AS");
- lua_gettable(L, -2);
- AS_id = lua_tostring(L, -1);
- lua_pop(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);
+#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
- } else {
- XBT_ERROR
- ("Bad Arguments to create link, Should be a table with named arguments");
+int console_add_route(lua_State *L) {
+ static int AX_ptr = 0;
+ static int surfxml_bufferstack_size = 2048;
+
+ /* allocating memory for the buffer, I think 2kB should be enough */
+ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
+
+ const char*src;
+ const char*dst;
+ int is_symmetrical;
+ xbt_dynar_t links;
+ unsigned int cursor;
+ char *link_id;
+
+ if (! lua_istable(L, -1)) {
+ XBT_ERROR("Bad Arguments to create a route, Should be a table with named arguments");
return -1;
}
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == AS_id){
- current_as = p_as;
- break;
- }
- }
- if (!current_as)
- {
- XBT_ERROR("No AS_id :%s found",AS_id);
- return -2;
+ lua_pushstring(L,"src");
+ lua_gettable(L,-2);
+ src = lua_tostring(L, -1);
+ lua_pop(L,1);
+
+ lua_pushstring(L,"dest");
+ lua_gettable(L,-2);
+ dst = lua_tostring(L, -1);
+ lua_pop(L,1);
+
+ lua_pushstring(L,"links");
+ lua_gettable(L,-2);
+ links = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
+ if (xbt_dynar_length(links)==0)
+ xbt_dynar_push_as(links,char*,xbt_strdup(lua_tostring(L, -1)));
+ lua_pop(L,1);
+
+ lua_pushstring(L,"symmetrical");
+ lua_gettable(L,-2);
+ is_symmetrical = lua_tointeger(L, -1);
+ lua_pop(L,1);
+
+ /* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet.
+ * Et ouais mon pote. That's the way it goes. F34R.
+ */
+ SURFXML_BUFFER_SET(route_src, src);
+ SURFXML_BUFFER_SET(route_dst, dst);
+ if (is_symmetrical)
+ A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
+ else
+ A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+ SURFXML_START_TAG(route);
+
+ xbt_dynar_foreach(links,cursor,link_id) {
+ SURFXML_BUFFER_SET(link_ctn_id, link_id);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+ SURFXML_START_TAG(link_ctn);
+ SURFXML_END_TAG(link_ctn);
}
- 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(current_as->link_list_d, &link);
+ SURFXML_END_TAG(route);
+
+ xbt_dynar_free(&links);
+ free(surfxml_bufferstack);
return 0;
}
-/**
- * add route to AS routes list
- */
-static int Route_new(lua_State * L) // (src_id,dest_id,links_number,link_table)
-{
- const char* AS_id;
- unsigned int i;
- p_AS_attr p_as,current_as = NULL;
- const char *links;
- const char* link_id;
- p_route_attr route = malloc(sizeof(route_attr));
-
-
- if (!lua_istable(L, 4)) { // if Route.new is declared as an indexed table (FIXME : we check the third arg if it's not a table)
-
- //get AS_id
- lua_pushstring(L, "AS");
- lua_gettable(L, -2);
- AS_id = lua_tostring(L, -1);
- lua_pop(L, 1);
-
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == AS_id){
- current_as = p_as;
- break;
- }
- }
-
- if (!current_as)
- {
- XBT_ERROR("addRoute: No AS_id :%s found",AS_id);
- return -2;
- }
- // get Source Value
- lua_pushstring(L, "src");
- lua_gettable(L, -2);
- route->src_id = lua_tostring(L, -1);
- lua_pop(L, 1);
-
- // get Destination Value
- lua_pushstring(L, "dest");
- lua_gettable(L, -2);
- route->dest_id = lua_tostring(L, -1);
- lua_pop(L, 1);
-
- // get Links Table (char* to be splited later)
- lua_pushstring(L, "links");
- lua_gettable(L, -2);
- links = lua_tostring(L, -1);
- lua_pop(L,1);
-
- route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-
- char *tmp_links = xbt_strdup(links);
- link_id = strtok(tmp_links,","); //tmp_link = strtok((char*)links,",");
- while(link_id != NULL)
- {
- xbt_dynar_push(route->links_id, &link_id);
- link_id = strtok(NULL,","); //Alternatively, a null pointer may be specified, in which case the function continues scanning where a previous successful call to the function ended.
- }
- xbt_dynar_push(current_as->route_list_d, &route);
- return 0;
- }
- else { // Route.new is declared as a function
- AS_id = luaL_checkstring(L, 1);
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == AS_id){
- current_as = p_as;
- break;
- }
- }
-
- if (!current_as)
- {
- XBT_ERROR("addRoute: No AS_id :%s found",AS_id);
- return -2;
- }
- route->src_id = luaL_checkstring(L, 2);
- route->dest_id = luaL_checkstring(L, 3);
- route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- lua_pushnil(L);
- while (lua_next(L, 4) != 0)
- {
- link_id = lua_tostring(L, -1);
- xbt_dynar_push(route->links_id, &link_id);
- XBT_DEBUG("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(current_as->route_list_d, &route);
- return 0;
- }
-
- return -1;
-}
-/**
- * add Router to AS components
- */
-static int Router_new(lua_State* L)
-{
- p_router_attr router;
- const char* AS_id;
- unsigned int i;
- p_AS_attr p_as,current_as = NULL;
- const char* id;
- if (lua_istable(L, -1)) {
- // get AS id
- lua_pushstring(L, "AS");
- lua_gettable(L, -2);
- AS_id = lua_tostring(L, -1);
- lua_pop(L,1);
-
- lua_pushstring(L, "id");
- lua_gettable(L, -2);
- id = lua_tostring(L, -1);
- lua_pop(L,1);
- }
- xbt_dynar_foreach(as_list_d, i, p_as){
- if (p_as->id == AS_id){
- current_as = p_as;
- break;
- }
- }
-
- if (!current_as)
- {
- XBT_ERROR("No AS_id :%s found",AS_id);
- return -2;
- }
- router = malloc(sizeof(router_attr));
- router->id = id;
- xbt_dynar_push(current_as->router_list_d, &router);
- return 0;
+int console_AS_open(lua_State *L) {
+ const char *id;
+ const char *mode;
-}
+ if (! lua_istable(L, 1)) {
+ XBT_ERROR("Bad Arguments to AS_open, Should be a table with named arguments");
+ return -1;
+ }
-/**
- * set function to process
- */
-static int Host_set_function(lua_State * L) //(host,function,nb_args,list_args)
-{
- p_AS_attr p_as;
- p_host_attr p_host;
- unsigned int i,j;
- const char *host_id ;
- const char *function_id;
- const char *args;
- char * tmp_arg;
-
- if (lua_istable(L, -1)) {
- // get Host id
- lua_pushstring(L, "host");
- lua_gettable(L, -2);
- host_id = lua_tostring(L, -1);
- lua_pop(L, 1);
- // get Function Name
- lua_pushstring(L, "fct");
- lua_gettable(L, -2);
- function_id = lua_tostring(L, -1);
- lua_pop(L, 1);
- //get args
- lua_pushstring(L,"args");
- lua_gettable(L, -2);
- args = lua_tostring(L,-1);
- lua_pop(L, 1);
- }
- else {
- XBT_ERROR("Bad Arguments to create link, Should be a table with named arguments");
- return -1;
- }
-
- // look for the index of host in host_list for each AS
- xbt_dynar_foreach(as_list_d, i, p_as)
- {
- xbt_dynar_foreach(p_as->host_list_d, j, p_host) {
- if (p_host->id == host_id) {
- p_host->function = function_id;
- p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- // split & fill the args list
- tmp_arg = strtok((char*)args,",");
- while (tmp_arg != NULL) {
- xbt_dynar_push(p_host->args_list, &tmp_arg);
- tmp_arg = strtok(NULL,",");
- }
- return 0;
- }
- }
- }
- XBT_ERROR("Host : %s Not Found !!", host_id);
- return 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);
-static int Host_set_property(lua_State* L)
-{
- p_AS_attr p_as;
- p_host_attr p_host;
- unsigned int i,j;
- const char* host_id ="";
- const char* prop_id = "";
- const char* prop_value = "";
- if (lua_istable(L, -1)) {
- // get Host id
- lua_pushstring(L, "host");
- lua_gettable(L, -2);
- host_id = lua_tostring(L, -1);
- lua_pop(L, 1);
- // get Function Name
- lua_pushstring(L, "prop_id");
- lua_gettable(L, -2);
- prop_id = lua_tostring(L, -1);
- lua_pop(L, 1);
- //get args
- lua_pushstring(L,"prop_value");
- lua_gettable(L, -2);
- prop_value = lua_tostring(L,-1);
- lua_pop(L, 1);
- }
- xbt_dynar_foreach(as_list_d, i, p_as)
- {
- xbt_dynar_foreach(p_as->host_list_d, j, p_host) {
- if (p_host->id == host_id) {
- xbt_dict_set(p_host->properties, prop_id, xbt_strdup(prop_value), free);
- }
- }
- }
- return 1;
+ sg_platf_new_AS_open(id,mode);
+ return 0;
}
-/*
- * surf parse bypass platform
- * through CPU/network Models
- */
-
-static int surf_parse_bypass_platform()
-{
- unsigned int i,j;
- p_AS_attr p_as;
- p_host_attr p_host;
- p_link_attr p_link;
- p_route_attr p_route;
-
-
- // Add AS
- xbt_dynar_foreach(as_list_d, i,p_as)
- {
- create_AS(p_as->id, p_as->mode);
- // add associated Hosts
- xbt_dynar_foreach(p_as->host_list_d, j, p_host){
- create_host(p_host->id, p_host->power_peak, p_host->power_scale,
- p_host->power_trace, p_host->core, p_host->state_initial,
- p_host->state_trace, p_host->properties);
-
-
- //add to routing model host list
- surf_route_add_host((char *) p_host->id);
- }
- // add associated Links
- xbt_dynar_foreach(p_as->link_list_d, j, 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 associated Routes
- xbt_dynar_foreach(p_as->route_list_d, j, p_route){
- surf_routing_add_route((char *) p_route->src_id,
- (char *) p_route->dest_id, p_route->links_id);
- }
-
- // Finalize AS
- routing_AS_end(p_as->id);
- }
-
- // add traces
- surf_add_host_traces();
- surf_add_link_traces();
-
- return 0; // must return 0 ?!!
-
+int console_AS_close(lua_State *L) {
+ sg_platf_new_AS_close();
+ return 0;
}
-/**
- *
- * surf parse bypass platform
- * through workstation_ptask_L07 Model
- */
+int console_set_function(lua_State *L) {
-static int surf_wsL07_parse_bypass_platform()
-{
- unsigned int i,j;
- p_AS_attr p_as, p_sub_as;
- p_host_attr p_host;
- p_link_attr p_link;
- p_route_attr p_route;
-
- xbt_dynar_foreach(as_list_d, i, p_as)
- {
- // Init AS
- create_AS(p_as->id, p_as->mode);
-
- // add Sub AS
-
- // Add Hosts
- xbt_dynar_foreach(p_as->sub_as_list_id, j, p_sub_as) {
- //...
- }
- xbt_dynar_foreach(p_as->host_list_d, j, 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(p_as->link_list_d, j, 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(p_as->route_list_d, j, p_route) {
- surf_routing_add_route((char *) p_route->src_id,
- (char *) p_route->dest_id, p_route->links_id);
- }
- /* </AS> */
- // Finalize AS
- routing_AS_end(p_as->id);
- }
- // add traces
- surf_wsL07_add_traces();
- return 0;
-}
+ const char *host_id ;
+ const char *function_id;
+ xbt_dynar_t args;
-/*
- * surf parse bypass application for MSG Module
- */
-static int surf_parse_bypass_application()
-{
- unsigned int i,j;
- p_AS_attr p_as;
- p_host_attr p_host;
- xbt_dynar_foreach(as_list_d, i, p_as)
- {
- xbt_dynar_foreach(p_as->host_list_d, j, p_host) {
- if (p_host->function)
- MSG_set_function(p_host->id, p_host->function, p_host->args_list);
- }
+ if (! lua_istable(L, 1)) {
+ XBT_ERROR("Bad Arguments to AS.new, Should be a table with named arguments");
+ return -1;
}
- return 0;
-}
-/*
- * Public Methods
- */
-int console_add_host(lua_State *L)
-{
- return Host_new(L);
-}
-
-int console_add_link(lua_State *L)
-{
- return Link_new(L);
-}
+ // get Host id
+ lua_pushstring(L, "host");
+ lua_gettable(L, -2);
+ host_id = lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ // get Function Name
+ lua_pushstring(L, "fct");
+ lua_gettable(L, -2);
+ function_id = lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ //get args
+ lua_pushstring(L,"args");
+ lua_gettable(L, -2);
+ args = xbt_str_split_quoted( lua_tostring(L,-1) );
+ lua_pop(L, 1);
+
+ // FIXME: hackish to go under MSG that way
+ m_host_t host = xbt_lib_get_or_null(host_lib,host_id,MSG_HOST_LEVEL);
+ if (!host) {
+ XBT_ERROR("no host '%s' found",host_id);
+ return -1;
+ }
-int console_add_route(lua_State *L)
-{
- return Route_new(L);
-}
+ MSG_set_function(host_id, function_id, args);
-int console_add_AS(lua_State *L)
-{
- return AS_new(L);
+ return 0;
}
-int console_set_function(lua_State *L)
-{
- return Host_set_function(L);
-}
+int console_host_set_property(lua_State *L) {
+ const char* name ="";
+ const char* prop_id = "";
+ const char* prop_value = "";
+ if (!lua_istable(L, -1)) {
+ XBT_ERROR("Bad Arguments to create link, Should be a table with named arguments");
+ return -1;
+ }
-int console_host_set_property(lua_State *L)
-{
- return Host_set_property(L);
-}
-int console_parse_platform()
-{
- return surf_parse_bypass_platform();
-}
+ // get Host id
+ lua_pushstring(L, "host");
+ lua_gettable(L, -2);
+ name = lua_tostring(L, -1);
+ lua_pop(L, 1);
+
+ // get prop Name
+ lua_pushstring(L, "prop");
+ lua_gettable(L, -2);
+ prop_id = lua_tostring(L, -1);
+ lua_pop(L, 1);
+ //get args
+ lua_pushstring(L,"value");
+ lua_gettable(L, -2);
+ prop_value = lua_tostring(L,-1);
+ lua_pop(L, 1);
+
+ // FIXME: hackish to go under MSG that way
+ m_host_t host = xbt_lib_get_or_null(host_lib,name,MSG_HOST_LEVEL);
+ if (!host) {
+ XBT_ERROR("no host '%s' found",name);
+ return -1;
+ }
+ xbt_dict_t props = MSG_host_get_properties(host);
+ xbt_dict_set(props,prop_id,xbt_strdup(prop_value),free);
-int console_parse_application()
-{
- return surf_parse_bypass_application();
+ return 0;
}
-int console_parse_platform_wsL07()
-{
- return surf_wsL07_parse_bypass_platform();
-}
