X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..c19a107a096f503e67217fb178fa98eb742ceb4d:/src/plugins/vm/VmLiveMigration.hpp

diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp
index 257faeb776..269c18509a 100644
--- a/src/plugins/vm/VmLiveMigration.hpp
+++ b/src/plugins/vm/VmLiveMigration.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
@@ -27,10 +27,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;
@@ -38,19 +39,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(std::string("__mbox_mig_ctl:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                     "-" + dst_pm_->get_cname() + ")");
+    mbox = s4u::Mailbox::by_name(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                 "-" + dst_pm_->get_cname() + ")");
   }
   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;
@@ -58,9 +59,9 @@ 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(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                 "-" + dst_pm_->get_cname() + ")");
   }
   void operator()();
   sg_size_t sendMigrationData(sg_size_t size, int stage, int stage2_round, double mig_speed, double timeout);