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
move all VM+energy code into callbacks
[simgrid.git]
/
src
/
surf
/
virtual_machine.hpp
diff --git
a/src/surf/virtual_machine.hpp
b/src/surf/virtual_machine.hpp
index
ebc420b
..
7860de6
100644
(file)
--- a/
src/surf/virtual_machine.hpp
+++ b/
src/surf/virtual_machine.hpp
@@
-26,17
+26,17
@@
class XBT_PRIVATE VirtualMachine;
*************/
/** @ingroup SURF_callbacks
*************/
/** @ingroup SURF_callbacks
- * @brief Callbacks fired after VM creation. Signature: `void(V
M
*)`
+ * @brief Callbacks fired after VM creation. Signature: `void(V
irtualMachine
*)`
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
/** @ingroup SURF_callbacks
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
/** @ingroup SURF_callbacks
- * @brief Callbacks fired after VM destruction. Signature: `void(V
M
*)`
+ * @brief Callbacks fired after VM destruction. Signature: `void(V
irtualMachine
*)`
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
/** @ingroup SURF_callbacks
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
/** @ingroup SURF_callbacks
- * @brief Callbacks after VM State changes. Signature: `void(V
MAction
*)`
+ * @brief Callbacks after VM State changes. Signature: `void(V
irtualMachine
*)`
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMStateChangedCallbacks;
*/
extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMStateChangedCallbacks;
@@
-90,7
+90,7
@@
public:
/* The vm object of the lower layer */
CpuAction *p_action;
/* The vm object of the lower layer */
CpuAction *p_action;
- Host *p_subWs;
// Pointer to the ''host'' OS
+ Host *p_subWs;
e_surf_vm_state_t p_currentState;
public:
boost::intrusive::list_member_hook<> vm_hook;
e_surf_vm_state_t p_currentState;
public:
boost::intrusive::list_member_hook<> vm_hook;