-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
routing_register_callbacks();
gpu_register_callbacks();
-
+
return 0;
}
//get power_scale
lua_pushstring(L, "power_scale");
lua_gettable(L, -2);
- if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value
+ if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value
else host.power_scale = lua_tonumber(L, -1);
lua_pop(L, 1);
#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
int console_add_route(lua_State *L) {
+ XBT_DEBUG("Adding route");
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
/* allocating memory for the buffer, I think 2kB should be enough */
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- int is_symmetrical;
-
if (! lua_istable(L, -1)) {
XBT_ERROR("Bad Arguments to create a route, Should be a table with named arguments");
return -1;
xbt_dynar_push_as(route.link_list,char*,xbt_strdup(lua_tostring(L, -1)));
lua_pop(L,1);
+ /* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet.
+ * Et ouais mon pote. That's the way it goes. F34R.
+ */
lua_pushstring(L,"symmetrical");
lua_gettable(L,-2);
- is_symmetrical = lua_tointeger(L, -1);
+ if (lua_isstring(L, -1)) {
+ const char* value = lua_tostring(L, -1);
+ if (strcmp("YES", value) == 0) {
+ route.symmetrical = TRUE;
+ }
+ else
+ route.symmetrical = FALSE;
+ }
+ else {
+ route.symmetrical = TRUE;
+ }
lua_pop(L,1);
route.gw_src = NULL;
route.gw_dst = NULL;
- /* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet.
- * Et ouais mon pote. That's the way it goes. F34R.
- */
- if (is_symmetrical)
- route.symmetrical = TRUE;
- else
- route.symmetrical = FALSE;
-
sg_platf_new_route(&route);
-
+
return 0;
}
const char *id;
const char *mode;
+ XBT_DEBUG("Opening AS");
+
if (! lua_istable(L, 1)) {
XBT_ERROR("Bad Arguments to AS_open, Should be a table with named arguments");
return -1;
return 0;
}
int console_AS_close(lua_State *L) {
+ XBT_DEBUG("Closing AS");
sg_platf_new_AS_end();
return 0;
}
args = xbt_str_split_str( lua_tostring(L,-1) , ",");
lua_pop(L, 1);
- // FIXME: hackish to go under MSG that way
- msg_host_t host = xbt_lib_get_or_null(host_lib,host_id,MSG_HOST_LEVEL);
+ msg_host_t host = MSG_host_by_name(host_id);
if (!host) {
XBT_ERROR("no host '%s' found",host_id);
return -1;
prop_value = lua_tostring(L,-1);
lua_pop(L, 1);
- // FIXME: hackish to go under MSG that way
- msg_host_t host = xbt_lib_get_or_null(host_lib,name,MSG_HOST_LEVEL);
+ msg_host_t host = MSG_host_by_name(name);
if (!host) {
XBT_ERROR("no host '%s' found",name);
return -1;