// Surf ( bypass XML )
#define LINK_MODULE_NAME "simgrid.Link"
#define ROUTE_MODULE_NAME "simgrid.Route"
+#define AS_MODULE_NAME "simgrid.AS"
/* ********************************************************************************* */
/* helper functions */
******************************************************************************************/
#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
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
}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]
*/
}
+/**
+ * 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]
*/
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
*/
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
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;
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;
}
return 0;
}
}
- ERROR1("Host : %s Not Fount !!",host_id);
+ ERROR1("Host : %s Not Found !!",host_id);
return 1;
}
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)
{
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)
{
- surf_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency);
+ 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_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0);
+ 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_set_routes();
+ //surf_set_routes();
surf_add_link_traces();
return 0; // must return 0 ?!!
//add Links
xbt_dynar_foreach(link_list_d,i,p_link)
{
- surf_wsL07_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency);
+ 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_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0);
+ //surf_routing_add_route((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id);
}
/* </platform> */
surf_wsL07_add_traces();
- surf_set_routes();
+ //surf_set_routes();
return 0;
{0,0}
};
+/*
+ * AS Methods
+ */
+static const luaL_reg AS_methods[] = {
+ {"new",AS_new},
+ {0,0}
+};
+
+
/*
* Link Methods
*/
lua_rawset(L,-3);
lua_pop(L,1);
+ /* register the links methods to lua*/
+ luaL_openlib(L,AS_MODULE_NAME,AS_methods,0);
+ luaL_newmetatable(L,AS_MODULE_NAME);
+ lua_pop(L,1);
+
/* register the links methods to lua*/
luaL_openlib(L,LINK_MODULE_NAME,Link_methods,0);
luaL_newmetatable(L,LINK_MODULE_NAME);
