Plug many memleaks in the Java bindings

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

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 387aaa0..d9b4ed6 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,15 +1,10 @@
-/* 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"
 
 #ifndef VM_INTERFACE_HPP_
@@ -26,7 +21,7 @@ namespace vm {
  ***********/
 
 class XBT_PRIVATE VMModel;
-class XBT_PRIVATE VirtualMachineImpl;
+XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
 
 /*************
  * Callbacks *
@@ -55,7 +50,8 @@ 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:
@@ -63,19 +59,16 @@ public:
   ~VirtualMachineImpl();
 
   /** @brief Suspend the VM */
-  virtual void suspend();
+  virtual void suspend(simgrid::simix::ActorImpl* issuer);
 
   /** @brief Resume the VM */
   virtual void resume();
 
-  /** @brief Save the VM (Not yet implemented) */
-  virtual void save();
-
-  /** @brief Restore the VM (Not yet implemented) */
-  virtual void restore();
+  /** @brief Shutdown the VM */
+  virtual void shutdown(simgrid::simix::ActorImpl* issuer);
 
-  /** @brief Migrate the VM to the destination host */
-  virtual void migrate(s4u::Host* dest);
+  /** @brief Change the physical host on which the given VM is running */
+  virtual void setPm(s4u::Host* dest);
 
   /** @brief Get the physical machine hosting the VM */
   s4u::Host* getPm();