A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use default value core, state host value if empty
[simgrid.git]
/
src
/
bindings
/
lua
/
lua_platf.c
diff --git
a/src/bindings/lua/lua_platf.c
b/src/bindings/lua/lua_platf.c
index
279bf65
..
89d7ef3
100644
(file)
--- a/
src/bindings/lua/lua_platf.c
+++ b/
src/bindings/lua/lua_platf.c
@@
-88,6
+88,15
@@
int console_add_host(lua_State *L) {
host.power_peak = lua_tonumber(L, -1);
lua_pop(L, 1);
host.power_peak = lua_tonumber(L, -1);
lua_pop(L, 1);
+ // get core
+ lua_pushstring(L, "core");
+ lua_gettable(L, -2);
+ if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value
+ else host.core_amount = lua_tonumber(L, -1);
+ if (host.core_amount == 0)
+ host.core_amount = 1;
+ lua_pop(L, 1);
+
//get power_scale
lua_pushstring(L, "power_scale");
lua_gettable(L, -2);
//get power_scale
lua_pushstring(L, "power_scale");
lua_gettable(L, -2);
@@
-100,18
+109,13
@@
int console_add_host(lua_State *L) {
host.power_trace = tmgr_trace_new(lua_tostring(L, -1));
lua_pop(L, 1);
host.power_trace = tmgr_trace_new(lua_tostring(L, -1));
lua_pop(L, 1);
- lua_pushstring(L, "core");
- lua_gettable(L, -2);
- host.core_amount = lua_tonumber(L, -1);
- if (host.core_amount == 0)
- host.core_amount = 1;
- lua_pop(L, 1);
-
//get state initial
lua_pushstring(L, "state_initial");
lua_gettable(L, -2);
//get state initial
lua_pushstring(L, "state_initial");
lua_gettable(L, -2);
- state = lua_tonumber(L, -1);
+ if(!lua_isnumber(L,-1)) state = 1;// Default value
+ else state = lua_tonumber(L, -1);
lua_pop(L, 1);
lua_pop(L, 1);
+
if (state)
host.initial_state = SURF_RESOURCE_ON;
else
if (state)
host.initial_state = SURF_RESOURCE_ON;
else