commit some harmless changes

[simgrid.git] / src / plugins / vm / VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 82b3d9e..797bfb0 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,16 +1,13 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
 
 /* 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 <deque>
-
-#include <xbt/base.h>
-
 #include "simgrid/s4u/VirtualMachine.hpp"
+#include "src/simix/ActorImpl.hpp"
 #include "src/surf/HostImpl.hpp"
+#include <algorithm>
+#include <deque>
 
 #ifndef VM_INTERFACE_HPP_
 #define VM_INTERFACE_HPP_
@@ -26,7 +23,7 @@ namespace vm {
  ***********/
 
 class XBT_PRIVATE VMModel;
-class XBT_PRIVATE VirtualMachineImpl;
+XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
 
 /*************
  * Callbacks *
@@ -55,21 +52,22 @@ extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)>
  * @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 */
-  virtual void suspend(smx_actor_t issuer);
+  virtual void suspend(simgrid::simix::ActorImpl* issuer);
 
   /** @brief Resume the VM */
   virtual void resume();
 
   /** @brief Shutdown the VM */
-  virtual void shutdown(smx_actor_t issuer);
+  virtual void shutdown(simgrid::simix::ActorImpl* issuer);
 
   /** @brief Change the physical host on which the given VM is running */
   virtual void setPm(s4u::Host* dest);
@@ -99,11 +97,13 @@ public:
   e_surf_vm_state_t getState();
   void setState(e_surf_vm_state_t state);
   static std::deque<s4u::VirtualMachine*> allVms_;
+  int coreAmount() { return coreAmount_; }
 
   bool isMigrating = false;
 
 private:
   s_vm_params_t params_;
+  int coreAmount_;
 
 protected:
   e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
@@ -118,7 +118,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{};