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
Fix process_killall. Closes #186.
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
6b6f2ef
..
f3f5ab0
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-134,7
+134,7
@@
void Actor::kill(aid_t pid)
{
smx_actor_t process = SIMIX_process_from_PID(pid);
if(process != nullptr) {
- sim
call_process_kill(process
);
+ sim
grid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }
);
} else {
std::ostringstream oss;
oss << "kill: ("<< pid <<") - No such process" << std::endl;
@@
-147,7
+147,9
@@
smx_actor_t Actor::getImpl() {
}
void Actor::kill() {
- simcall_process_kill(pimpl_);
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate(
+ [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
}
// ***** Static functions *****
@@
-174,14
+176,12
@@
void Actor::killAll(int resetPid)
/** Retrieve the property value (or nullptr if not set) */
const char* Actor::getProperty(const char* key)
{
- return
(char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key
);
+ return
simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); }
);
}
void Actor::setProperty(const char* key, const char* value)
{
- simgrid::simix::kernelImmediate([this, key, value] {
- xbt_dict_set(simcall_process_get_properties(pimpl_), key, (char*)value, (void_f_pvoid_t) nullptr);
- });
+ simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
}
Actor* Actor::restart()
@@
-296,7
+296,8
@@
bool isSuspended()
void kill()
{
- simcall_process_kill(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
}
void onExit(int_f_pvoid_pvoid_t fun, void* data)