X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b7e401a2d400a77cae7741a12dea84fb6408bbd..c66deda6497d36e70e2485fff5431151be1713c6:/src/plugins/vm/VirtualMachineImpl.hpp diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp index 3ec7abb107..d9371762d4 100644 --- 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 VirtualMachineImpl; +XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin /************* * Callbacks * @@ -50,11 +50,12 @@ extern XBT_PRIVATE simgrid::xbt::signal * @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: - explicit VirtualMachineImpl(s4u::VirtualMachine* piface, s4u::Host* host); + explicit VirtualMachineImpl(s4u::VirtualMachine * piface, s4u::Host * host, int coreAmount); ~VirtualMachineImpl(); /** @brief Suspend the VM */ @@ -99,6 +100,7 @@ public: private: s_vm_params_t params_; + int coreAmount_; protected: e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED; @@ -113,7 +115,7 @@ protected: */ class VMModel : public surf::HostModel { public: - void adjustWeightOfDummyCpuActions() override{}; + void ignoreEmptyVmInPmLMM() override{}; double nextOccuringEvent(double now) override; void updateActionsState(double /*now*/, double /*delta*/) override{};