X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa0daa47324ca4c8669c2da934e363c36b8e76a1..ed5bc1532577eb73f0ae8ebe686961097ae30fdf:/src/bindings/lua/simgrid_lua.c
diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 3f09ee78ce..81cb592a91 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -19,7 +19,7 @@ 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_CPU
+#undef BYPASS_MODEL
/* ********************************************************************************* */
/* helper functions */
@@ -114,7 +114,6 @@ 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));
@@ -309,8 +308,14 @@ static int Host_at(lua_State *L)
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;
@@ -336,29 +341,149 @@ static xbt_dynar_t host_list_d ;
static xbt_dynar_t link_list_d ;
static xbt_dynar_t route_list_d ;
-static int Host_new(lua_State *L) //(id,power)
+
+//create resource
+
+/*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 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_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)
{
- // 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 = 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;
+
}
+
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);
return 0;
}
@@ -367,7 +492,6 @@ 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);
@@ -438,8 +562,8 @@ static int surf_parse_bypass_platform()
/* FIXME allocating memory for the buffer, I think 2kB should be enough */
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
/* */
- SURFXML_BUFFER_SET(platform_version, "2");
#ifndef BYPASS_CPU
+ SURFXML_BUFFER_SET(platform_version, "2");
SURFXML_START_TAG(platform);
#endif
@@ -447,13 +571,15 @@ static int surf_parse_bypass_platform()
xbt_dynar_foreach(host_list_d,i,p_host)
{
-#ifdef BYPASS_CPU
- INFO0("Bypass_Cpu");
- init_host_bypass(p_host->id,p_host->power);
+#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",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, "");
@@ -471,7 +597,9 @@ static int surf_parse_bypass_platform()
//add Links
xbt_dynar_foreach(link_list_d,i,p_link)
{
-#ifndef BYPASS_CPU
+#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",p_link->bandwidth);
@@ -489,10 +617,11 @@ static int surf_parse_bypass_platform()
}
// add route
-
xbt_dynar_foreach(route_list_d,i,p_route)
{
-#ifndef BYPASS_CPU
+#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,p_route->dest_id);
@@ -507,13 +636,14 @@ static int surf_parse_bypass_platform()
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
}
/* */
-#ifndef BYPASS_CPU
+#ifndef BYPASS_MODEL
SURFXML_END_TAG(platform);
#endif
@@ -533,10 +663,18 @@ static int surf_parse_bypass_application()
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);
+
+#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
+
/* */
SURFXML_BUFFER_SET(platform_version, "2");
SURFXML_START_TAG(platform);
-
xbt_dynar_foreach(host_list_d,i,p_host)
{
if(p_host->function)
@@ -558,6 +696,7 @@ static int surf_parse_bypass_application()
}
/* */
SURFXML_END_TAG(platform);
+#endif
free(surfxml_bufferstack);
return 0;
}
@@ -608,6 +747,7 @@ static const luaL_reg Link_methods[] = {
*/
static const luaL_reg Route_methods[] ={
{"new",Route_new},
+ {0,0}
};
/*