// Surf ( bypass XML )
#define LINK_MODULE_NAME "simgrid.Link"
#define ROUTE_MODULE_NAME "simgrid.Route"
+#undef BYPASS_MODEL
/* ********************************************************************************* */
/* helper functions */
lua_pop(L,1);
return tk;
}
-
-/** @brief leaves a new userdata on top of the stack, sets its metatable, and sets the Task pointer inside the userdata */
-// NOT USED
-/*static m_task_t *pushTask (lua_State *L,m_task_t tk) {
- m_task_t *pi = NULL;
- pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
- *pi=tk;
- DEBUG1("push lua task with Name : %s \n",MSG_task_get_name(*pi));
- luaL_getmetatable(L,TASK_MODULE_NAME);
- lua_setmetatable(L,-2);
- return pi;
-}*/
-
/* ********************************************************************************* */
/* wrapper functions */
/* ********************************************************************************* */
/**
- * Task
+ * A task is either something to compute somewhere, or something to exchange between two hosts (or both).
+ * It is defined by a computing amount and a message size.
+ *
*/
+/* * * *
+ * * Constructors * *
+ * * * */
+/**
+ * Construct an new task with the specified processing amount and amount
+ * of data needed.
+ *
+ * @param name Task's name
+ *
+ * @param computeDuration A value of the processing amount (in flop) needed to process the task.
+ * If 0, then it cannot be executed with the execute() method.
+ * This value has to be >= 0.
+ *
+ * @param messageSize A value of amount of data (in bytes) needed to transfert this task.
+ * If 0, then it cannot be transfered with the get() and put() methods.
+ * This value has to be >= 0.
+ */
static int Task_new(lua_State* L) {
- 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));
- *lua_task = msg_task;
- luaL_getmetatable(L,TASK_MODULE_NAME);
- lua_setmetatable(L,-2);
- lua_setfield (L, -2, "__simgrid_task"); /* put the userdata as field of the table */
- /* remove the args from the stack */
- lua_remove(L,1);
- lua_remove(L,1);
- lua_remove(L,1);
- return 1;
+ const char *name=luaL_checkstring(L,1);
+ int comp_size = luaL_checkint(L,2);
+ int msg_size = luaL_checkint(L,3);
+ 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));
+ *lua_task = msg_task;
+ luaL_getmetatable(L,TASK_MODULE_NAME);
+ lua_setmetatable(L,-2);
+ lua_setfield (L, -2, "__simgrid_task"); /* put the userdata as field of the table */
+ /* remove the args from the stack */
+ lua_remove(L,1);
+ lua_remove(L,1);
+ lua_remove(L,1);
+ return 1;
}
static int Task_get_name(lua_State *L) {
***************************
******************************************************************************************/
#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
+#include "surf/surf_private.h"
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;
- int args_nb;
- const char ** args_list;
+ xbt_dynar_t args_list;
}host_attr,*p_host_attr;
typedef struct t_link_attr
{
const char *src_id;
const char *dest_id;
- int links_nb;
- const char **links_id;
+ xbt_dynar_t links_id;
}route_attr,*p_route_attr;
-
-static int host_index = 0;
-static int link_index = 0;
-static int route_index = 0;
-
-static int max_host_number = 0;
-static int max_link_number = 0;
-static int max_route_number = 0;
-
-
//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 ;
-static int Host_set_number(lua_State *L)
-{
- max_host_number = luaL_checkint(L,1);
-// host_list = malloc(sizeof(host_attr)*max_host_number);
- //host_list_d = xbt_dynar_new(sizeof(p_host_attr), &xbt_free_ref);
+//create resource
- return 0;
-}
+/*FIXME : still have to use a dictionary as argument make it possible to
+consider some arguments as optional and removes the importance of the
+parameter order */
-static int Link_set_number(lua_State *L)
+static void create_host(const char* id,double power_peak,double power_sc,
+ const char* power_tr,int state_init,
+ const char* state_tr)
{
- max_link_number = luaL_checkint(L,1);
- //link_list = malloc(sizeof(link_attr)*max_link_number);
- //link_list_d = xbt_dynar_new(sizeof(p_link_attr),&xbt_free_ref);
- return 0;
-}
-static int Route_set_number(lua_State *L)
+ 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_ON;
+ else
+ state_init = SURF_RESOURCE_OFF;
+ 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);
+
+}
+
+static int Host_new(lua_State *L)
{
- max_route_number = luaL_checkint(L,1);
- //route_list = malloc(sizeof(route_attr)*max_link_number);
- //route_list_d = xbt_dynar_new(sizeof(p_route_attr),&xbt_free_ref);
- return 0;
-}
-static int Host_new(lua_State *L) //(id,power)
-{
- // if it's the first time ,instanciate the dynar
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;
- 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);
- host_index++;
- return 0;
}
+
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;
+ //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);
+
+ } 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;
xbt_dynar_push(link_list_d,&link);
- link_index++;
return 0;
}
{
if(xbt_dynar_is_empty(route_list_d))
route_list_d = xbt_dynar_new(sizeof(p_route_attr), &xbt_free_ref);
-
- int i=0;
+ 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_nb = luaL_checkint(L,3);
- route->links_id = malloc(sizeof(char*)*route->links_nb);
+ route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
lua_pushnil(L);
- while (lua_next(L,4) != 0) {
- if(i >= route->links_nb)
- ERROR1("Number of links should be less than %d",route->links_nb+1);
- route->links_id[i] = lua_tostring(L, -1);
+ 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));
- i++;
lua_pop(L, 1);
}
lua_pop(L, 1);
//add route to platform's route list
xbt_dynar_push(route_list_d,&route);
- route_index++;
return 0;
}
{
// look for the index of host in host_list
const char *host_id = luaL_checkstring(L,1);
- int i;
+ 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);
- p_host->args_nb = luaL_checkint(L,3);
- p_host->args_list = malloc(sizeof(char*)*p_host->args_nb);
+ 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,4) != 0) {
- if(j >= p_host->args_nb)
- ERROR1("Number of args should be less than %d",p_host->args_nb+1);
- p_host->args_list[j] = lua_tostring(L, -1);
+ 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);
return 1;
}
-
-
/*
* surf parse bypass platform
*/
static int surf_parse_bypass_platform()
{
char buffer[22];
- int i;
+ unsigned int i,j;
+ char* link_id;
p_host_attr p_host;
p_link_attr p_link;
p_route_attr p_route;
- xbt_dynar_t dynaroun = xbt_dynar_new(sizeof(int), NULL);
-
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> */
+#ifndef BYPASS_CPU
SURFXML_BUFFER_SET(platform_version, "2");
SURFXML_START_TAG(platform);
-
+#endif
// Add Hosts
- //for(i=0;i<host_index;i++)
xbt_dynar_foreach(host_list_d,i,p_host)
{
- //SURFXML_BUFFER_SET(host_id,host_list[i]->id);
+
+#ifdef BYPASS_MODEL
+ 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);
+#else
+
SURFXML_BUFFER_SET(host_id,p_host->id);
- //sprintf(buffer, "%f", host_list[i]->power);
- sprintf(buffer,"%f",p_host->power);
+ sprintf(buffer,"%f",p_host->power_peak);
SURFXML_BUFFER_SET(host_power,buffer);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, "");
SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
+#endif
}
//add Links
- //for (i = 0;i<link_index;i++)
xbt_dynar_foreach(link_list_d,i,p_link)
{
- //SURFXML_BUFFER_SET(link_id,link_list[i]->id);
+#ifdef BYPASS_MODEL
+ surf_link_create_resouce((char*)p_link->id,p_link->bandwidth,p_link->latency);
+#else
+
SURFXML_BUFFER_SET(link_id,p_link->id);
- //sprintf(buffer,"%f",link_list[i]->bandwidth);
sprintf(buffer,"%f",p_link->bandwidth);
SURFXML_BUFFER_SET(link_bandwidth,buffer);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
- //sprintf(buffer,"%f",link_list[i]->latency);
sprintf(buffer,"%f",p_link->latency);
SURFXML_BUFFER_SET(link_latency,buffer);
SURFXML_BUFFER_SET(link_latency_file, "");
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+#endif
}
// add route
-
- //for (i = 0;i<route_index;i++)
xbt_dynar_foreach(route_list_d,i,p_route)
{
- //SURFXML_BUFFER_SET(route_src,route_list[i]->src_id);
+#ifdef BYPASS_MODEL
+ surf_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0);
+#else
+
SURFXML_BUFFER_SET(route_src,p_route->src_id);
- //SURFXML_BUFFER_SET(route_dst,route_list[i]->dest_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);
- int j;
- //for(j=0; j < route_list[i]->links_nb;j++)
- for(j=0;j< p_route->links_nb;j++)
+ xbt_dynar_foreach(p_route->links_id,j,link_id)
{
- //SURFXML_BUFFER_SET(link_c_ctn_id,route_list[i]->links_id[j]);
- SURFXML_BUFFER_SET(link_c_ctn_id,p_route->links_id[j]);
+ SURFXML_BUFFER_SET(link_c_ctn_id,link_id);
SURFXML_START_TAG(link_c_ctn);
SURFXML_END_TAG(link_c_ctn);
+
}
SURFXML_END_TAG(route);
+#endif
}
/* </platform> */
-
+#ifndef BYPASS_MODEL
SURFXML_END_TAG(platform);
+#endif
+
free(surfxml_bufferstack);
return 0; // must return 0 ?!!
}
-
/*
* surf parse bypass application
*/
static int surf_parse_bypass_application()
{
-
- int i;
-
+ unsigned int i,j;
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");
+#ifdef BYPASS_MODEL
+ 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);
+ }
+#else
+ /* <platform> */
+ SURFXML_BUFFER_SET(platform_version, "2");
SURFXML_START_TAG(platform);
-
- //for(i=0 ; i< host_index ;i++)
xbt_dynar_foreach(host_list_d,i,p_host)
{
if(p_host->function)
SURFXML_BUFFER_SET(process_start_time, "-1.0");
SURFXML_BUFFER_SET(process_kill_time, "-1.0");
SURFXML_START_TAG(process);
-
//args
- int j;
- for(j=0 ;j<p_host->args_nb;j++)
+ xbt_dynar_foreach(p_host->args_list,j,arg)
{
- SURFXML_BUFFER_SET(argument_value,p_host->args_list[j]);
+ SURFXML_BUFFER_SET(argument_value,arg);
SURFXML_START_TAG(argument);
SURFXML_END_TAG(argument);
}
SURFXML_END_TAG(process);
}
-
}
/* </platform> */
SURFXML_END_TAG(platform);
+#endif
free(surfxml_bufferstack);
return 0;
}
-// Free Allocated Memory
-static void clean_attr()
-{
-//nothing to do
-}
//***********Register Methods *******************************************//
/*
* Host Methods
{"at", Host_at},
// Bypass XML Methods
{"new", Host_new},
- {"setNumber", Host_set_number},
{"setFunction", Host_set_function},
{0,0}
};
*/
static const luaL_reg Link_methods[] = {
{"new",Link_new},
- {"setNumber", Link_set_number },
{0,0}
};
/*
*/
static const luaL_reg Route_methods[] ={
{"new",Route_new},
- {"setNumber",Route_set_number}
+ {0,0}
};
/*
return 0;
}
static int clean(lua_State *L) {
- clean_attr(); // in case of using "bypass xml" methods
MSG_clean();
return 0;
}
