use signals to instrument VMs

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index a228732..6a7466d 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -56,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

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 11e7925..573d068 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -10,6 +10,7 @@
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"
@@ -228,18 +229,6 @@ static void instr_host_on_creation(simgrid::s4u::Host& host)
     root->type_->getOrCreateLinkType("MIGRATE_LINK", mpi, mpi);
     mpi->getOrCreateStateType("MIGRATE_STATE");
   }
-
-  if (TRACE_vm_is_enabled()) {
-    simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("MSG_VM");
-    simgrid::instr::StateType* state      = msg_vm->getOrCreateStateType("MSG_VM_STATE");
-    state->addEntityValue("suspend", "1 0 1");
-    state->addEntityValue("sleep", "1 1 0");
-    state->addEntityValue("receive", "1 0 0");
-    state->addEntityValue("send", "0 0 1");
-    state->addEntityValue("task_execute", "0 1 1");
-    root->type_->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm);
-    root->type_->getOrCreateLinkType("MSG_VM_ACTOR_LINK", msg_vm, msg_vm);
-  }
 }
 
 static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
@@ -310,6 +299,46 @@ static void instr_actor_on_migration_end(simgrid::s4u::ActorPtr actor)
   counter++;
 }
 
+static void instr_vm_on_creation(simgrid::s4u::Host& host)
+{
+  container_t container                 = new simgrid::instr::HostContainer(host, currentContainer.back());
+  container_t root                      = simgrid::instr::Container::getRoot();
+  simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("MSG_VM");
+  simgrid::instr::StateType* state      = msg_vm->getOrCreateStateType("MSG_VM_STATE");
+  state->addEntityValue("suspend", "1 0 1");
+  state->addEntityValue("sleep", "1 1 0");
+  state->addEntityValue("receive", "1 0 0");
+  state->addEntityValue("send", "0 0 1");
+  state->addEntityValue("task_execute", "0 1 1");
+  root->type_->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm);
+  root->type_->getOrCreateLinkType("MSG_VM_ACTOR_LINK", msg_vm, msg_vm);
+}
+
+static void instr_vm_on_start(simgrid::s4u::VirtualMachine& vm)
+{
+  simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->pushEvent("start");
+}
+
+static void instr_vm_on_started(simgrid::s4u::VirtualMachine& vm)
+{
+  simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->popEvent();
+}
+
+static void instr_vm_on_suspend(simgrid::s4u::VirtualMachine& vm)
+{
+  simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->pushEvent("suspend");
+}
+
+static void instr_vm_on_resume(simgrid::s4u::VirtualMachine& vm)
+{
+  simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->popEvent();
+}
+
+static void instr_vm_on_destruction(simgrid::s4u::Host& host)
+{
+  simgrid::instr::Container::byName(host.get_name())->removeFromParent();
+}
+
 void instr_define_callbacks()
 {
   // always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType
@@ -330,6 +359,15 @@ void instr_define_callbacks()
     simgrid::s4u::Actor::on_migration_start.connect(instr_actor_on_migration_start);
     simgrid::s4u::Actor::on_migration_end.connect(instr_actor_on_migration_end);
   }
+
+  if (TRACE_vm_is_enabled()) {
+    simgrid::s4u::Host::onCreation.connect(instr_vm_on_creation);
+    simgrid::s4u::VirtualMachine::on_start.connect(instr_vm_on_start);
+    simgrid::s4u::VirtualMachine::on_started.connect(instr_vm_on_started);
+    simgrid::s4u::VirtualMachine::on_suspend.connect(instr_vm_on_suspend);
+    simgrid::s4u::VirtualMachine::on_resume.connect(instr_vm_on_resume);
+    simgrid::s4u::Host::onDestruction.connect(instr_vm_on_destruction);
+  }
 }
 /*
  * user categories support

diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp
index 8df22cd..84001da 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.cpp
+++ b/src/plugins/vm/VmLiveMigration.cpp
@@ -283,13 +283,13 @@ void MigrationTx::operator()()
 }
 }
 
-static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine* vm)
+static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine& vm)
 {
-  if (vm->getImpl()->isMigrating) {
-    vm->extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
-    vm->extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
-    vm->extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();
-    vm->getImpl()->isMigrating = false;
+  if (vm.getImpl()->isMigrating) {
+    vm.extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
+    vm.extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
+    vm.extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();
+    vm.getImpl()->isMigrating = false;
   }
 }
 
@@ -297,7 +297,7 @@ void sg_vm_live_migration_plugin_init()
 {
   sg_vm_dirty_page_tracking_init();
   simgrid::vm::VmMigrationExt::ensureVmMigrationExtInstalled();
-  simgrid::s4u::VirtualMachine::onVmShutdown.connect(&onVirtualMachineShutdown);
+  simgrid::s4u::VirtualMachine::on_shutdown.connect(&onVirtualMachineShutdown);
 }
 
 /* Deprecated. Please use MSG_vm_create_migratable() instead */

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index 6f436a5..29174e3 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/Actor.hpp"
-#include "src/instr/instr_private.hpp"
+#include "simgrid/vm.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
 #include "src/simix/smx_host_private.hpp"
@@ -12,10 +12,14 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
 
-simgrid::xbt::signal<void(simgrid::s4u::VirtualMachine*)> simgrid::s4u::VirtualMachine::onVmShutdown;
 
 namespace simgrid {
 namespace s4u {
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_start;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_started;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_shutdown;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_suspend;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_resume;
 
 VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount)
     : VirtualMachine(name, pm, coreAmount, 1024)
@@ -38,15 +42,6 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount,
 
   /* Make a process container */
   extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
-
-  if (TRACE_vm_is_enabled()) {
-    container_t host_container = instr::Container::byName(pm->get_name());
-    new instr::Container(name, "MSG_VM", host_container);
-    instr::Container::byName(get_name())->getState("MSG_VM_STATE")->addEntityValue("start", "0 0 1"); // start is blue
-    instr::Container::byName(get_name())
-        ->getState("MSG_VM_STATE")
-        ->addEntityValue("suspend", "1 0 0"); // suspend is red
-  }
 }
 
 VirtualMachine::~VirtualMachine()
@@ -65,15 +60,11 @@ VirtualMachine::~VirtualMachine()
 
   /* Don't free these things twice: they are the ones of my physical host */
   pimpl_netpoint = nullptr;
-
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(get_name())->removeFromParent();
 }
 
 void VirtualMachine::start()
 {
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(get_name())->getState("MSG_VM_STATE")->pushEvent("start");
+  on_start(*this);
 
   simgrid::simix::kernelImmediate([this]() {
     simgrid::vm::VmHostExt::ensureVmExtInstalled();
@@ -104,31 +95,27 @@ void VirtualMachine::start()
     this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
   });
 
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(get_name())->getState("MSG_VM_STATE")->popEvent();
+  on_started(*this);
 }
 
 void VirtualMachine::suspend()
 {
+  on_suspend(*this);
   smx_actor_t issuer = SIMIX_process_self();
   simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); });
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(get_name())->getState("MSG_VM_STATE")->pushEvent("suspend");
-  XBT_DEBUG("vm_suspend done");
 }
 
 void VirtualMachine::resume()
 {
   pimpl_vm_->resume();
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(get_name())->getState("MSG_VM_STATE")->popEvent();
+  on_resume(*this);
 }
 
 void VirtualMachine::shutdown()
 {
   smx_actor_t issuer = SIMIX_process_self();
   simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->shutdown(issuer); });
-  onVmShutdown(this);
+  on_shutdown(*this);
 }
 
 void VirtualMachine::destroy()