X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..c312320c2e43da49b536c51a9d19b6ad6d66e489:/src/plugins/vm/VmLiveMigration.hpp

diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp
index c965535b13..0ac98a59f8 100644
--- a/src/plugins/vm/VmLiveMigration.hpp
+++ b/src/plugins/vm/VmLiveMigration.hpp
@@ -1,22 +1,22 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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 "simgrid/s4u.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/VirtualMachine.hpp"
 
 #ifndef VM_LIVE_MIGRATION_HPP_
 #define VM_LIVE_MIGRATION_HPP_
 
-namespace simgrid {
-namespace vm {
+namespace simgrid::plugin::vm {
 class VmMigrationExt {
 public:
   s4u::ActorPtr issuer_ = nullptr;
   s4u::ActorPtr tx_     = nullptr;
   s4u::ActorPtr rx_     = nullptr;
-  static simgrid::xbt::Extension<simgrid::s4u::Host, VmMigrationExt> EXTENSION_ID;
-  virtual ~VmMigrationExt() = default;
+  static xbt::Extension<s4u::Host, VmMigrationExt> EXTENSION_ID;
   explicit VmMigrationExt(s4u::ActorPtr issuer, s4u::ActorPtr rx, s4u::ActorPtr tx) : issuer_(issuer), tx_(tx), rx_(rx)
   {
   }
@@ -24,10 +24,11 @@ public:
 };
 
 class MigrationRx {
-  /* The miration_rx process uses mbox_ctl to let the caller of do_migration()  know the completion of the migration. */
-  s4u::MailboxPtr mbox_ctl;
+  /* The migration_rx process uses mbox_ctl to let the caller of do_migration()  know the completion of the migration.
+   */
+  s4u::Mailbox* mbox_ctl;
   /* The migration_rx and migration_tx processes use mbox to transfer migration data. */
-  s4u::MailboxPtr mbox;
+  s4u::Mailbox* mbox;
   s4u::VirtualMachine* vm_;
   s4u::Host* src_pm_ = nullptr;
   s4u::Host* dst_pm_ = nullptr;
@@ -35,19 +36,19 @@ class MigrationRx {
 public:
   explicit MigrationRx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
   {
-    src_pm_ = vm_->getPm();
+    src_pm_ = vm_->get_pm();
 
-    mbox_ctl = s4u::Mailbox::byName(std::string("__mbox_mig_ctl:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
-                                    "-" + dst_pm_->get_cname() + ")");
-    mbox     = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
-                                "-" + dst_pm_->get_cname() + ")");
+    mbox_ctl = s4u::Mailbox::by_name("__mbox_mig_ctl:" + vm_->get_name() + "(" + src_pm_->get_name() + "-" +
+                                     dst_pm_->get_name() + ")");
+    mbox     = s4u::Mailbox::by_name("__mbox_mig_src_dst:" + vm_->get_name() + "(" + src_pm_->get_name() + "-" +
+                                 dst_pm_->get_name() + ")");
   }
   void operator()();
 };
 
 class MigrationTx {
   /* The migration_rx and migration_tx processes use mbox to transfer migration data. */
-  s4u::MailboxPtr mbox;
+  s4u::Mailbox* mbox;
   s4u::VirtualMachine* vm_;
   s4u::Host* src_pm_ = nullptr;
   s4u::Host* dst_pm_ = nullptr;
@@ -55,13 +56,12 @@ class MigrationTx {
 public:
   explicit MigrationTx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
   {
-    src_pm_ = vm_->getPm();
-    mbox    = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
-                                "-" + dst_pm_->get_cname() + ")");
+    src_pm_ = vm_->get_pm();
+    mbox    = s4u::Mailbox::by_name("__mbox_mig_src_dst:" + vm_->get_name() + "(" + src_pm_->get_name() + "-" +
+                                 dst_pm_->get_name() + ")");
   }
   void operator()();
   sg_size_t sendMigrationData(sg_size_t size, int stage, int stage2_round, double mig_speed, double timeout);
 };
-}
-}
+} // namespace simgrid::plugin::vm
 #endif