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
Some #include fixes
[simgrid.git]
/
src
/
surf
/
virtual_machine.hpp
diff --git
a/src/surf/virtual_machine.hpp
b/src/surf/virtual_machine.hpp
index
4c64492
..
5b1396d
100644
(file)
--- a/
src/surf/virtual_machine.hpp
+++ b/
src/surf/virtual_machine.hpp
@@
-4,6
+4,8
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <boost/intrusive/list.hpp>
+
#include <xbt/base.h>
#include "src/surf/HostImpl.hpp"
#include <xbt/base.h>
#include "src/surf/HostImpl.hpp"
@@
-53,16
+55,7
@@
extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VM
*/
class VirtualMachine : public HostImpl {
public:
*/
class VirtualMachine : public HostImpl {
public:
- /**
- * @brief Constructor
- *
- * @param model VMModel associated to this VM
- * @param name The name of the VM
- * @param host The host
- */
VirtualMachine(simgrid::surf::HostModel *model, const char *name, simgrid::s4u::Host *host);
VirtualMachine(simgrid::surf::HostModel *model, const char *name, simgrid::s4u::Host *host);
-
- /** @brief Destructor */
~VirtualMachine();
/** @brief Suspend the VM */
~VirtualMachine();
/** @brief Suspend the VM */
@@
-87,13
+80,14
@@
public:
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
/* The vm object of the lower layer */
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
/* The vm object of the lower layer */
- CpuAction *p_action;
- simgrid::s4u::Host *p_hostPM;
+ CpuAction *action_;
+protected:
+ simgrid::s4u::Host *hostPM_;
+public:
void turnOn() override;
void turnOff() override;
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 getState();
void setState(e_surf_vm_state_t state);
protected: