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
adapt two collectives of starmpi to avoid timing issues, by using only smpi calls...
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
3d72dd4
..
3799230
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-124,7
+124,7
@@
static void SIMIX_clean(void)
#endif
/* Kill everyone (except maestro) */
#endif
/* Kill everyone (except maestro) */
- SIMIX_process_killall(simix_global->maestro_process);
+ SIMIX_process_killall(simix_global->maestro_process
, 1
);
/* Exit the SIMIX network module */
SIMIX_network_exit();
/* Exit the SIMIX network module */
SIMIX_network_exit();
@@
-315,6
+315,7
@@
void SIMIX_run(void)
timer = xbt_heap_pop(simix_timers);
if (timer->func)
((void (*)(void*))timer->func)(timer->args);
timer = xbt_heap_pop(simix_timers);
if (timer->func)
((void (*)(void*))timer->func)(timer->args);
+ xbt_free(timer);
}
/* Wake up all processes waiting for a Surf action to finish */
xbt_dynar_foreach(model_list, iter, model) {
}
/* Wake up all processes waiting for a Surf action to finish */
xbt_dynar_foreach(model_list, iter, model) {
@@
-457,12
+458,12
@@
void SIMIX_display_process_status(void)
break;
}
XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",
break;
}
XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",
- process->pid, process->name,
process->smx_host->name
,
+ process->pid, process->name,
sg_host_name(process->smx_host)
,
action_description, process->waiting_action,
process->waiting_action->name, (int)process->waiting_action->state);
}
else {
action_description, process->waiting_action,
process->waiting_action->name, (int)process->waiting_action->state);
}
else {
- XBT_INFO("Process %lu (%s@%s)", process->pid, process->name,
process->smx_host->name
);
+ XBT_INFO("Process %lu (%s@%s)", process->pid, process->name,
sg_host_name(process->smx_host)
);
}
}
}
}
}
}