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)
+ 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;
surf_host_create_resource(xbt_strdup(id), power_peak, power_scale,
power_trace, core_nb, state_initial, state_trace,
- current_property_set);
-
- current_property_set = NULL;
-
+ properties);
}
/**
st_trace, policy_initial_link, xbt_dict_new());
}
-
/*
*create host resource via workstation_ptask_L07 model [for SimDag]
*/
/*
- * init AS
+ * Append new AS to the Platform
*/
static int AS_new(lua_State * L)
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);
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
*/
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);
return 0;
}
/**
- * add link to platform links list
+ * add link to AS links list
*/
static int Link_new(lua_State * L) // (id,bandwidth,latency)
{
}
/**
- * add route to platform routes list
+ * add route to AS routes list
*/
static int Route_new(lua_State * L) // (src_id,dest_id,links_number,link_table)
{
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;
+
+}
+
/**
* set function to process
*/
{
p_AS_attr p_as;
p_host_attr p_host;
- const char *host;
- const char *function;
+ unsigned int i,j;
+ const char *host_id ;
+ const char *function_id;
const char *args;
char * tmp_arg;
- unsigned int i,j;
if (lua_istable(L, -1)) {
// get Host id
lua_pushstring(L, "host");
lua_gettable(L, -2);
- host = lua_tostring(L, -1);
+ host_id = lua_tostring(L, -1);
lua_pop(L, 1);
// get Function Name
lua_pushstring(L, "fct");
lua_gettable(L, -2);
- function = lua_tostring(L, -1);
+ function_id = lua_tostring(L, -1);
lua_pop(L, 1);
//get args
lua_pushstring(L,"args");
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) {
- p_host->function = function;
+ 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,",");
}
}
}
- XBT_ERROR("Host : %s Not Found !!", host);
+ XBT_ERROR("Host : %s Not Found !!", host_id);
return 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;
+
}
/*
* surf parse bypass platform
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);
- //add to routing model host list
- surf_route_add_host((char *) p_host->id);
+ 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){
static int surf_wsL07_parse_bypass_platform()
{
-
unsigned int i,j;
- p_AS_attr p_as;
+ p_AS_attr p_as, p_sub_as;
p_host_attr p_host;
p_link_attr p_link;
p_route_attr p_route;
{
// 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,
return Host_set_function(L);
}
+int console_host_set_property(lua_State *L)
+{
+ return Host_set_property(L);
+}
+
int console_parse_platform()
{
return surf_parse_bypass_platform();
