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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
popping_enum.h
diff --git
a/src/simix/popping_enum.h
b/src/simix/popping_enum.h
index
40c949d
..
0225d19
100644
(file)
--- a/
src/simix/popping_enum.h
+++ b/
src/simix/popping_enum.h
@@
-31,7
+31,7
@@
typedef enum {
SIMCALL_HOST_GET_CURRENT_POWER_PEAK,
SIMCALL_HOST_GET_POWER_PEAK_AT,
SIMCALL_HOST_GET_NB_PSTATES,
SIMCALL_HOST_GET_CURRENT_POWER_PEAK,
SIMCALL_HOST_GET_POWER_PEAK_AT,
SIMCALL_HOST_GET_NB_PSTATES,
- SIMCALL_HOST_SET_P
OWER_PEAK_AT
,
+ SIMCALL_HOST_SET_P
STATE
,
SIMCALL_HOST_GET_CONSUMED_ENERGY,
SIMCALL_HOST_EXECUTE,
SIMCALL_HOST_PARALLEL_EXECUTE,
SIMCALL_HOST_GET_CONSUMED_ENERGY,
SIMCALL_HOST_EXECUTE,
SIMCALL_HOST_PARALLEL_EXECUTE,
@@
-60,6
+60,7
@@
typedef enum {
SIMCALL_VM_SHUTDOWN,
SIMCALL_VM_SAVE,
SIMCALL_VM_RESTORE,
SIMCALL_VM_SHUTDOWN,
SIMCALL_VM_SAVE,
SIMCALL_VM_RESTORE,
+ SIMCALL_VM_MIGRATEFROM_RESUMETO,
SIMCALL_PROCESS_CREATE,
SIMCALL_PROCESS_KILL,
SIMCALL_PROCESS_KILLALL,
SIMCALL_PROCESS_CREATE,
SIMCALL_PROCESS_KILL,
SIMCALL_PROCESS_KILLALL,