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
The VirtualMachineImpl is stored in VirtualMachine->pimpl_vm_, not in Host->pimpl_
[simgrid.git]
/
src
/
simix
/
smx_host.cpp
diff --git
a/src/simix/smx_host.cpp
b/src/simix/smx_host.cpp
index
bd6371e
..
014a49d
100644
(file)
--- a/
src/simix/smx_host.cpp
+++ b/
src/simix/smx_host.cpp
@@
-7,8
+7,8
@@
#include "mc/mc.h"
#include "smx_private.h"
#include "src/mc/mc_replay.h"
#include "mc/mc.h"
#include "smx_private.h"
#include "src/mc/mc_replay.h"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/VirtualMachineImpl.hpp"
#include "xbt/sysdep.h"
#include <xbt/ex.hpp>
#include "xbt/sysdep.h"
#include <xbt/ex.hpp>
@@
-91,9
+91,8
@@
void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %s",
- process->name.c_str(), sg_host_get_name(process->host),
- issuer->name.c_str());
+ XBT_DEBUG("Killing %s@%s on behalf of %s", process->name.c_str(), sg_host_get_name(process->host),
+ issuer->name.c_str());
}
}
} else {
}
}
} else {
@@
-204,9
+203,9
@@
smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_
host_list_cpy[i] = host_list[i];
/* Check that we are not mixing VMs and PMs in the parallel task */
host_list_cpy[i] = host_list[i];
/* Check that we are not mixing VMs and PMs in the parallel task */
- bool is_a_vm = (nullptr != dynamic_cast<simgrid::s
urf::VirtualMachineImpl*>(host_list[0]->pimpl_
));
+ bool is_a_vm = (nullptr != dynamic_cast<simgrid::s
4u::VirtualMachine*>(host_list[0]
));
for (int i = 1; i < host_nb; i++) {
for (int i = 1; i < host_nb; i++) {
- bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::s
urf::VirtualMachineImpl*>(host_list[i]->pimpl_
));
+ bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::s
4u::VirtualMachine*>(host_list[i]
));
xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}
xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}