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
Avoid (conditionnaly) including C++ headers files in C headers
[simgrid.git]
/
src
/
simix
/
smx_process.cpp
diff --git
a/src/simix/smx_process.cpp
b/src/simix/smx_process.cpp
index
d7654ef
..
5f28c68
100644
(file)
--- a/
src/simix/smx_process.cpp
+++ b/
src/simix/smx_process.cpp
@@
-4,20
+4,28
@@
/* 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. */
+#include <exception>
+#include <functional>
+#include <string>
+#include <utility>
+
#include <boost/range/algorithm.hpp>
#include <xbt/functional.hpp>
#include <boost/range/algorithm.hpp>
#include <xbt/functional.hpp>
+#include <xbt/ex.hpp>
+#include <xbt/sysdep.h>
+#include <xbt/log.h>
+#include <xbt/dict.h>
+
+#include <simgrid/s4u/host.hpp>
+
+#include <mc/mc.h>
#include "src/surf/surf_interface.hpp"
#include "smx_private.h"
#include "src/surf/surf_interface.hpp"
#include "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
-#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
#include "src/msg/msg_private.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
#include "src/msg/msg_private.h"
-
#include "src/simix/SynchroSleep.hpp"
#include "src/simix/SynchroRaw.hpp"
#include "src/simix/SynchroIo.hpp"
#include "src/simix/SynchroSleep.hpp"
#include "src/simix/SynchroRaw.hpp"
#include "src/simix/SynchroIo.hpp"
@@
-76,6
+84,7
@@
void SIMIX_process_cleanup(smx_process_t process)
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p",
process->name.c_str(), process, process->waiting_synchro);
XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p",
process->name.c_str(), process, process->waiting_synchro);
+ process->finished = true;
SIMIX_process_on_exit_runall(process);
/* Unregister from the kill timer if any */
SIMIX_process_on_exit_runall(process);
/* Unregister from the kill timer if any */
@@
-203,6
+212,7
@@
void SIMIX_maestro_create(void (*code)(void*), void* data)
* and stops its context.
*/
void SIMIX_process_stop(smx_process_t arg) {
* and stops its context.
*/
void SIMIX_process_stop(smx_process_t arg) {
+ arg->finished = true;
/* execute the on_exit functions */
SIMIX_process_on_exit_runall(arg);
/* Add the process to the list of process to restart, only if the host is down */
/* execute the on_exit functions */
SIMIX_process_on_exit_runall(arg);
/* Add the process to the list of process to restart, only if the host is down */
@@
-751,6
+761,12
@@
xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
{
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
{
+ if (process->finished) {
+ // The joined process is already finished, just wake up the issuer process right away
+ simcall_process_sleep__set__result(simcall, SIMIX_DONE);
+ SIMIX_simcall_answer(simcall);
+ return;
+ }
smx_synchro_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
sync->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
smx_synchro_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
sync->simcalls.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
@@
-778,13
+794,14
@@
static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synch
sleep->surf_sleep->unref();
sleep->surf_sleep = nullptr;
}
sleep->surf_sleep->unref();
sleep->surf_sleep = nullptr;
}
-
delete sleep
;
+
sleep->unref()
;
return 0;
}
smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
{
smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
return 0;
}
smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
{
smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
+ static_cast<simgrid::simix::Synchro*>(res)->ref();
SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
return res;
}
SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
return res;
}
@@
-827,6
+844,7
@@
void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
if (sleep->surf_sleep) {
sleep->surf_sleep->unref();
sleep->surf_sleep = nullptr;
if (sleep->surf_sleep) {
sleep->surf_sleep->unref();
sleep->surf_sleep = nullptr;
+ sleep->unref();
}
}
}
}
@@
-1041,7
+1059,7
@@
smx_process_t simcall_process_create(
if (name == nullptr)
name = "";
smx_process_t self = SIMIX_process_self();
if (name == nullptr)
name = "";
smx_process_t self = SIMIX_process_self();
- return simgrid::simix::kernel([&] {
+ return simgrid::simix::kernel
Immediate
([&] {
return SIMIX_process_create(name,
std::move(code), data, hostname,
kill_time, properties, auto_restart,
return SIMIX_process_create(name,
std::move(code), data, hostname,
kill_time, properties, auto_restart,