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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
virtual_machine.hpp
diff --git
a/src/surf/virtual_machine.hpp
b/src/surf/virtual_machine.hpp
index
baef9f2
..
21c4896
100644
(file)
--- a/
src/surf/virtual_machine.hpp
+++ b/
src/surf/virtual_machine.hpp
@@
-31,17
+31,17
@@
class XBT_PRIVATE VirtualMachine;
/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE simgrid::
surf
::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::
xbt
::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE simgrid::
surf
::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::
xbt
::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
*/
/** @ingroup SURF_callbacks
* @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE simgrid::
surf
::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::
xbt
::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
/************
* Resource *
/************
* Resource *
@@
-59,17
+59,14
@@
public:
* @param model VMModel associated to this VM
* @param name The name of the VM
* @param props Dictionary of properties associated to this VM
* @param model VMModel associated to this VM
* @param name The name of the VM
* @param props Dictionary of properties associated to this VM
- * @param netElm The RoutingEdge associated to this VM
- * @param cpu The Cpu associated to this VM
+ * @param host The host
*/
*/
- VirtualMachine(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
-
simgrid
::Host *host);
+ VirtualMachine(simgrid::surf::
Host
Model *model, const char *name, xbt_dict_t props,
+
simgrid::s4u
::Host *host);
/** @brief Destructor */
~VirtualMachine();
/** @brief Destructor */
~VirtualMachine();
- void setState(e_surf_resource_state_t state);
-
/** @brief Suspend the VM */
virtual void suspend()=0;
/** @brief Suspend the VM */
virtual void suspend()=0;
@@
-93,8
+90,18
@@
public:
/* The vm object of the lower layer */
CpuAction *p_action;
/* The vm object of the lower layer */
CpuAction *p_action;
- simgrid::Host *p_hostPM;
- e_surf_vm_state_t p_currentState;
+ simgrid::s4u::Host *p_hostPM;
+
+ void turnOn() override;
+ void turnOff() override;
+
+public:
+ e_surf_vm_state_t getState();
+ void setState(e_surf_vm_state_t state);
+protected:
+ e_surf_vm_state_t p_vm_state = SURF_VM_STATE_CREATED;
+
+
public:
boost::intrusive::list_member_hook<> vm_hook;
};
public:
boost::intrusive::list_member_hook<> vm_hook;
};
@@
-111,8
+118,6
@@
public:
VMModel() :HostModel(){}
~VMModel(){};
VMModel() :HostModel(){}
~VMModel(){};
- Host *createHost(const char *name, RoutingEdge *netElm, Cpu *cpu,xbt_dict_t props) override {DIE_IMPOSSIBLE;}
-
/**
* @brief Create a new VM
*
/**
* @brief Create a new VM
*