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
Extend simcall_host_execute() for CPU affinity
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
3315b51
..
e171cd7
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-27,10
+27,10
@@
static void SIMIX_clean(void);
/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
#include <signal.h>
/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
#include <signal.h>
-int _s
urf
_do_verbose_exit = 1;
+int _s
g
_do_verbose_exit = 1;
static void _XBT_CALL inthandler(int ignored)
{
static void _XBT_CALL inthandler(int ignored)
{
- if ( _s
urf
_do_verbose_exit ) {
+ if ( _s
g
_do_verbose_exit ) {
XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
SIMIX_display_process_status();
}
XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
SIMIX_display_process_status();
}
@@
-64,7
+64,7
@@
void SIMIX_global_init(int *argc, char **argv)
#ifdef TIME_BENCH_AMDAHL
simix_global->timer_seq = xbt_os_timer_new();
simix_global->timer_par = xbt_os_timer_new();
#ifdef TIME_BENCH_AMDAHL
simix_global->timer_seq = xbt_os_timer_new();
simix_global->timer_par = xbt_os_timer_new();
- xbt_os_timer_start(simix_global->timer_seq);
+ xbt_os_
cpu
timer_start(simix_global->timer_seq);
#endif
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL);
#endif
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL);
@@
-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();
@@
-156,7
+156,7
@@
static void SIMIX_clean(void)
surf_exit();
#ifdef TIME_BENCH_AMDAHL
surf_exit();
#ifdef TIME_BENCH_AMDAHL
- xbt_os_timer_stop(simix_global->timer_seq);
+ xbt_os_
cpu
timer_stop(simix_global->timer_seq);
XBT_INFO("Amdhal timing informations. Sequential time: %lf; Parallel time: %lf",
xbt_os_timer_elapsed(simix_global->timer_seq),
xbt_os_timer_elapsed(simix_global->timer_par));
XBT_INFO("Amdhal timing informations. Sequential time: %lf; Parallel time: %lf",
xbt_os_timer_elapsed(simix_global->timer_seq),
xbt_os_timer_elapsed(simix_global->timer_par));
@@
-226,13
+226,13
@@
void SIMIX_run(void)
/* Run all processes that are ready to run, possibly in parallel */
#ifdef TIME_BENCH_AMDAHL
/* Run all processes that are ready to run, possibly in parallel */
#ifdef TIME_BENCH_AMDAHL
- xbt_os_timer_stop(simix_global->timer_seq);
- xbt_os_timer_resume(simix_global->timer_par);
+ xbt_os_
cpu
timer_stop(simix_global->timer_seq);
+ xbt_os_
cpu
timer_resume(simix_global->timer_par);
#endif
SIMIX_process_runall();
#ifdef TIME_BENCH_AMDAHL
#endif
SIMIX_process_runall();
#ifdef TIME_BENCH_AMDAHL
- xbt_os_timer_stop(simix_global->timer_par);
- xbt_os_timer_resume(simix_global->timer_seq);
+ xbt_os_
cpu
timer_stop(simix_global->timer_par);
+ xbt_os_
cpu
timer_resume(simix_global->timer_seq);
#endif
/* Move all killing processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
#endif
/* Move all killing processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
@@
-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) {
@@
-322,13
+323,23
@@
void SIMIX_run(void)
while ((action = xbt_swag_extract(set)))
SIMIX_simcall_post((smx_action_t) action->data);
set = model->states.done_action_set;
while ((action = xbt_swag_extract(set)))
SIMIX_simcall_post((smx_action_t) action->data);
set = model->states.done_action_set;
- while ((action = xbt_swag_extract(set)))
- SIMIX_simcall_post((smx_action_t) action->data);
+
+ while ((action = xbt_swag_extract(set))) {
+ if (action->data == NULL)
+ XBT_DEBUG("probably vcpu's action %p, skip", action);
+ else
+ SIMIX_simcall_post((smx_action_t) action->data);
+ }
}
/* Clean processes to destroy */
SIMIX_process_empty_trash();
}
/* Clean processes to destroy */
SIMIX_process_empty_trash();
+
+ XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
+ // !(time == -1.0 && xbt_dynar_is_empty())
+
+
} while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
if (xbt_swag_size(simix_global->process_list) != 0) {
} while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
if (xbt_swag_size(simix_global->process_list) != 0) {
@@
-457,12
+468,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)
);
}
}
}
}
}
}
@@
-487,6
+498,9
@@
static void SIMIX_action_mallocator_reset_f(void* action) {
((smx_action_t) action)->simcalls = fifo;
}
((smx_action_t) action)->simcalls = fifo;
}
+xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name){
+ return SIMIX_asr_get_properties(name);
+}
xbt_dict_t SIMIX_asr_get_properties(const char *name)
{
return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
xbt_dict_t SIMIX_asr_get_properties(const char *name)
{
return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);