use signals to instrument VMs

[simgrid.git] / include / simgrid / s4u / VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 2ec81c7..6a7466d 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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. */
@@ -6,8 +6,7 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/forward.hpp"
+#include <simgrid/s4u/Host.hpp>
 
 enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
@@ -31,8 +30,7 @@ namespace s4u {
  * The total computing power that the contained actors can get is constrained to the virtual machine size.
  *
  */
-XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
-{
+class XBT_PUBLIC VirtualMachine : public s4u::Host {
   simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
   virtual ~VirtualMachine();
 
@@ -58,7 +56,11 @@ public:
   void setBound(double bound);
 
   e_surf_vm_state_t getState();
-  static simgrid::xbt::signal<void(simgrid::s4u::VirtualMachine*)> onVmShutdown;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_start;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_started;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_shutdown;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_suspend;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_resume;
 };
 }
 } // namespace simgrid::s4u