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
[surf] Use the pointers to simgrid::Host instead of looking by name
[simgrid.git]
/
src
/
surf
/
virtual_machine.hpp
diff --git
a/src/surf/virtual_machine.hpp
b/src/surf/virtual_machine.hpp
index
7860de6
..
a7d99e4
100644
(file)
--- a/
src/surf/virtual_machine.hpp
+++ b/
src/surf/virtual_machine.hpp
@@
-14,6
+14,9
@@
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
+namespace simgrid {
+namespace surf {
+
/***********
* Classes *
***********/
/***********
* Classes *
***********/
@@
-28,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 surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
+extern XBT_PRIVATE surf_callback(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 surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
+extern XBT_PRIVATE surf_callback(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 surf_callback(void, VirtualMachine*) VMStateChangedCallbacks;
+extern XBT_PRIVATE surf_callback(void,
simgrid::surf::
VirtualMachine*) VMStateChangedCallbacks;
/************
* Resource *
/************
* Resource *
@@
-59,7
+62,7
@@
public:
* @param netElm The RoutingEdge associated to this VM
* @param cpu The Cpu associated to this VM
*/
* @param netElm The RoutingEdge associated to this VM
* @param cpu The Cpu associated to this VM
*/
- VirtualMachine(Model *model, const char *name, xbt_dict_t props,
+ VirtualMachine(
simgrid::surf::
Model *model, const char *name, xbt_dict_t props,
RoutingEdge *netElm, Cpu *cpu);
/** @brief Destructor */
RoutingEdge *netElm, Cpu *cpu);
/** @brief Destructor */
@@
-80,10
+83,10
@@
public:
virtual void restore()=0;
/** @brief Migrate the VM to the destination host */
virtual void restore()=0;
/** @brief Migrate the VM to the destination host */
- virtual void migrate(s
urf_resource
_t dest_PM)=0;
+ virtual void migrate(s
g_host
_t dest_PM)=0;
/** @brief Get the physical machine hosting the VM */
/** @brief Get the physical machine hosting the VM */
- virtual s
urf_resource
_t getPm()=0;
+ virtual s
g_host
_t getPm()=0;
virtual void setBound(double bound)=0;
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
virtual void setBound(double bound)=0;
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
@@
-108,7
+111,7
@@
public:
VMModel() :HostModel(){}
~VMModel(){};
VMModel() :HostModel(){}
~VMModel(){};
- Host *createHost(const char *name){DIE_IMPOSSIBLE;}
+ Host *createHost(const char *name
, RoutingEdge *netElm, Cpu *cpu
){DIE_IMPOSSIBLE;}
/**
* @brief Create a new VM
/**
* @brief Create a new VM
@@
-117,7
+120,7
@@
public:
* @param host_PM The real machine hosting the VM
*
*/
* @param host_PM The real machine hosting the VM
*
*/
- virtual VirtualMachine *createVM(const char *name, s
urf_resource
_t host_PM)=0;
+ virtual VirtualMachine *createVM(const char *name, s
g_host
_t host_PM)=0;
void adjustWeightOfDummyCpuActions() {};
typedef boost::intrusive::member_hook<
void adjustWeightOfDummyCpuActions() {};
typedef boost::intrusive::member_hook<
@@
-130,4
+133,7
@@
public:
* Action *
**********/
* Action *
**********/
+}
+}
+
#endif /* VM_INTERFACE_HPP_ */
#endif /* VM_INTERFACE_HPP_ */