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
Allow multicore VMs, and take this into account in the sharing
[simgrid.git]
/
src
/
plugins
/
vm
/
VirtualMachineImpl.hpp
diff --git
a/src/plugins/vm/VirtualMachineImpl.hpp
b/src/plugins/vm/VirtualMachineImpl.hpp
index
3ec7abb
..
d937176
100644
(file)
--- a/
src/plugins/vm/VirtualMachineImpl.hpp
+++ b/
src/plugins/vm/VirtualMachineImpl.hpp
@@
-21,7
+21,7
@@
namespace vm {
***********/
class XBT_PRIVATE VMModel;
***********/
class XBT_PRIVATE VMModel;
-class XBT_PRIVATE VirtualMachineImpl;
+XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
/*************
* Callbacks *
/*************
* Callbacks *
@@
-50,11
+50,12
@@
extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)>
* @brief SURF VM interface class
* @details A VM represent a virtual machine
*/
* @brief SURF VM interface class
* @details A VM represent a virtual machine
*/
-class VirtualMachineImpl : public surf::HostImpl {
+XBT_PUBLIC_CLASS VirtualMachineImpl : public surf::HostImpl
+{
friend simgrid::s4u::VirtualMachine;
public:
friend simgrid::s4u::VirtualMachine;
public:
- explicit VirtualMachineImpl(s4u::VirtualMachine
* piface, s4u::Host* hos
t);
+ explicit VirtualMachineImpl(s4u::VirtualMachine
* piface, s4u::Host * host, int coreAmoun
t);
~VirtualMachineImpl();
/** @brief Suspend the VM */
~VirtualMachineImpl();
/** @brief Suspend the VM */
@@
-99,6
+100,7
@@
public:
private:
s_vm_params_t params_;
private:
s_vm_params_t params_;
+ int coreAmount_;
protected:
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
protected:
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
@@
-113,7
+115,7
@@
protected:
*/
class VMModel : public surf::HostModel {
public:
*/
class VMModel : public surf::HostModel {
public:
- void
adjustWeightOfDummyCpuActions
() override{};
+ void
ignoreEmptyVmInPmLMM
() override{};
double nextOccuringEvent(double now) override;
void updateActionsState(double /*now*/, double /*delta*/) override{};
double nextOccuringEvent(double now) override;
void updateActionsState(double /*now*/, double /*delta*/) override{};