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 'v3_8_x'
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
d6aa7da
..
95bf7c7
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-318,7
+318,7
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
case SIMIX_ACTION_COMMUNICATE:
xbt_fifo_remove(process->comms, process->waiting_action);
case SIMIX_ACTION_COMMUNICATE:
xbt_fifo_remove(process->comms, process->waiting_action);
- SIMIX_comm_
destroy
(process->waiting_action);
+ SIMIX_comm_
cancel
(process->waiting_action);
break;
case SIMIX_ACTION_SLEEP:
break;
case SIMIX_ACTION_SLEEP:
@@
-333,6
+333,14
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
case SIMIX_ACTION_IO:
SIMIX_io_destroy(process->waiting_action);
break;
case SIMIX_ACTION_IO:
SIMIX_io_destroy(process->waiting_action);
break;
+
+ /* **************************************/
+ /* TUTORIAL: New API */
+ case SIMIX_ACTION_NEW_API:
+ SIMIX_new_api_destroy(process->waiting_action);
+ break;
+ /* **************************************/
+
}
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
}
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
@@
-571,7
+579,7
@@
xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
void SIMIX_pre_process_sleep(smx_simcall_t simcall)
{
void SIMIX_pre_process_sleep(smx_simcall_t simcall)
{
- if (MC_
IS_ENABLED
) {
+ if (MC_
is_active()
) {
MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration);
simcall->process_sleep.result = SIMIX_DONE;
SIMIX_simcall_answer(simcall);
MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration);
simcall->process_sleep.result = SIMIX_DONE;
SIMIX_simcall_answer(simcall);
@@
-713,7
+721,7
@@
xbt_running_ctx_t *SIMIX_process_get_running_context(void)
void SIMIX_process_exception_terminate(xbt_ex_t * e)
{
xbt_ex_display(e);
void SIMIX_process_exception_terminate(xbt_ex_t * e)
{
xbt_ex_display(e);
- abort();
+
xbt_
abort();
}
smx_context_t SIMIX_process_get_context(smx_process_t p) {
}
smx_context_t SIMIX_process_get_context(smx_process_t p) {
@@
-786,7
+794,7
@@
void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart) {
* \brief Restart a process.
* Restart a process, starting it again from the beginning.
*/
* \brief Restart a process.
* Restart a process, starting it again from the beginning.
*/
-
void
SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
+
smx_process_t
SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
XBT_DEBUG("Restarting process %s on %s", process->name, process->smx_host->name);
//retrieve the arguments of the old process
//FIXME: Factorise this with SIMIX_host_add_auto_restart_process ?
XBT_DEBUG("Restarting process %s on %s", process->name, process->smx_host->name);
//retrieve the arguments of the old process
//FIXME: Factorise this with SIMIX_host_add_auto_restart_process ?
@@
-833,5
+841,5
@@
void SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
arg.auto_restart);
}
arg.auto_restart);
}
-
+ return new_process;
}
}