A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into xbt_random
[simgrid.git]
/
src
/
plugins
/
vm
/
VmLiveMigration.hpp
diff --git
a/src/plugins/vm/VmLiveMigration.hpp
b/src/plugins/vm/VmLiveMigration.hpp
index
f942710
..
a981013
100644
(file)
--- a/
src/plugins/vm/VmLiveMigration.hpp
+++ b/
src/plugins/vm/VmLiveMigration.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
9
. 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. */
/* 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 {
};
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. */
/* The migration_rx and migration_tx processes use mbox to transfer migration data. */
- s4u::Mailbox
Ptr
mbox;
+ s4u::Mailbox
*
mbox;
s4u::VirtualMachine* vm_;
s4u::Host* src_pm_ = nullptr;
s4u::Host* dst_pm_ = nullptr;
s4u::VirtualMachine* vm_;
s4u::Host* src_pm_ = nullptr;
s4u::Host* dst_pm_ = nullptr;
@@
-38,7
+39,7
@@
class MigrationRx {
public:
explicit MigrationRx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
{
public:
explicit MigrationRx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
{
- src_pm_ = vm_->get
P
m();
+ src_pm_ = vm_->get
_p
m();
mbox_ctl = s4u::Mailbox::by_name(std::string("__mbox_mig_ctl:") + 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() + ")");
@@
-50,7
+51,7
@@
public:
class MigrationTx {
/* The migration_rx and migration_tx processes use mbox to transfer migration data. */
class MigrationTx {
/* The migration_rx and migration_tx processes use mbox to transfer migration data. */
- s4u::Mailbox
Ptr
mbox;
+ s4u::Mailbox
*
mbox;
s4u::VirtualMachine* vm_;
s4u::Host* src_pm_ = nullptr;
s4u::Host* dst_pm_ = nullptr;
s4u::VirtualMachine* vm_;
s4u::Host* src_pm_ = nullptr;
s4u::Host* dst_pm_ = nullptr;
@@
-58,7
+59,7
@@
class MigrationTx {
public:
explicit MigrationTx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
{
public:
explicit MigrationTx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
{
- src_pm_ = vm_->get
P
m();
+ src_pm_ = vm_->get
_p
m();
mbox = s4u::Mailbox::by_name(std::string("__mbox_mig_src_dst:") + 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() + ")");
}