From a7409f30a21b91090f11709cb20ef1367e0961a9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 12 May 2022 10:43:08 +0200 Subject: [PATCH] Rename VM signals to distinguish them from Host::on_creation/on_destruction. --- include/simgrid/s4u/VirtualMachine.hpp | 8 ++++---- src/kernel/resource/VirtualMachineImpl.cpp | 2 +- src/s4u/s4u_VirtualMachine.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index 7fb4816c89..4382f3f621 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -35,7 +35,7 @@ class XBT_PUBLIC VirtualMachine : public s4u::Host { kernel::resource::VirtualMachineImpl* const pimpl_vm_; /* Signals about the life cycle of the VM */ - static xbt::signal on_creation; + static xbt::signal on_vm_creation; static xbt::signal on_start; static xbt::signal on_started; static xbt::signal on_shutdown; @@ -43,7 +43,7 @@ class XBT_PUBLIC VirtualMachine : public s4u::Host { static xbt::signal on_resume; static xbt::signal on_migration_start; static xbt::signal on_migration_end; - static xbt::signal on_destruction; + static xbt::signal on_vm_destruction; #ifndef DOXYGEN friend kernel::resource::VirtualMachineImpl; // calls signals from Impl @@ -89,13 +89,13 @@ public: State get_state() const; /* Callbacks on signals */ - static void on_creation_cb(const std::function& cb) { on_creation.connect(cb); } + static void on_creation_cb(const std::function& cb) { on_vm_creation.connect(cb); } static void on_start_cb(const std::function& cb) { on_start.connect(cb); } static void on_started_cb(const std::function& cb) { on_started.connect(cb); } static void on_shutdown_cb(const std::function& cb) { on_shutdown.connect(cb); } static void on_suspend_cb(const std::function& cb) { on_suspend.connect(cb); } static void on_resume_cb(const std::function& cb) { on_resume.connect(cb); } - static void on_destruction_cb(const std::function& cb) { on_destruction.connect(cb); } + static void on_destruction_cb(const std::function& cb) { on_vm_destruction.connect(cb); } static void on_migration_start_cb(const std::function& cb) { on_migration_start.connect(cb); diff --git a/src/kernel/resource/VirtualMachineImpl.cpp b/src/kernel/resource/VirtualMachineImpl.cpp index 48f2492f1e..854aafcbf7 100644 --- a/src/kernel/resource/VirtualMachineImpl.cpp +++ b/src/kernel/resource/VirtualMachineImpl.cpp @@ -410,7 +410,7 @@ void VirtualMachineImpl::end_migration() void VirtualMachineImpl::seal() { HostImpl::seal(); - s4u::VirtualMachine::on_creation(*get_iface()); + s4u::VirtualMachine::on_vm_creation(*get_iface()); } } // namespace kernel::resource diff --git a/src/s4u/s4u_VirtualMachine.cpp b/src/s4u/s4u_VirtualMachine.cpp index 284e5eb8ea..f607ad859c 100644 --- a/src/s4u/s4u_VirtualMachine.cpp +++ b/src/s4u/s4u_VirtualMachine.cpp @@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_vm, s4u, "S4U virtual machines"); namespace simgrid::s4u { -xbt::signal VirtualMachine::on_creation; +xbt::signal VirtualMachine::on_vm_creation; xbt::signal VirtualMachine::on_start; xbt::signal VirtualMachine::on_started; xbt::signal VirtualMachine::on_shutdown; @@ -21,7 +21,7 @@ xbt::signal VirtualMachine::on_suspend; xbt::signal VirtualMachine::on_resume; xbt::signal VirtualMachine::on_migration_start; xbt::signal VirtualMachine::on_migration_end; -xbt::signal VirtualMachine::on_destruction; +xbt::signal VirtualMachine::on_vm_destruction; xbt::Extension VmHostExt::EXTENSION_ID; @@ -72,7 +72,7 @@ void VirtualMachine::destroy() shutdown(); XBT_DEBUG("destroy %s", get_cname()); - on_destruction(*this); + on_vm_destruction(*this); /* Then, destroy the VM object */ kernel::actor::simcall_answered( [this]() { get_vm_impl()->get_physical_host()->get_impl()->destroy_vm(get_name()); }); -- 2.20.1