// 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
}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]
*/
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
*/
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
// 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 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);