X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20fb1d8f699a02bdfd23130097cf7cf3d11f5840..2d2995483b57463581ffdc4365fe1999ddc306c2:/src/plugins/vm/VmLiveMigration.hpp

diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp
index 7df29b45bd..911f92789c 100644
--- a/src/plugins/vm/VmLiveMigration.hpp
+++ b/src/plugins/vm/VmLiveMigration.hpp
@@ -1,15 +1,30 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
 
-#include "simgrid/s4u.hpp"
+#include "simgrid/s4u/Comm.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 {
+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;
+  explicit VmMigrationExt(s4u::ActorPtr issuer, s4u::ActorPtr rx, s4u::ActorPtr tx) : issuer_(issuer), tx_(tx), rx_(rx)
+  {
+  }
+  static void ensureVmMigrationExtInstalled();
+};
 
 class MigrationRx {
   /* The miration_rx process uses mbox_ctl to let the caller of do_migration()  know the completion of the migration. */
@@ -23,12 +38,12 @@ 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_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                    dst_pm_->getCname() + ")");
-    mbox = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                dst_pm_->getCname() + ")");
+    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()();
 };
@@ -43,9 +58,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_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                dst_pm_->getCname() + ")");
+    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);