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
unnecessary loop for the reset of the simcall args
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
728da6f
..
6c0623c
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();
}
@@
-92,7
+92,6
@@
void SIMIX_global_init(int *argc, char **argv)
__xbt_running_ctx_fetch = SIMIX_process_get_running_context;
__xbt_ex_terminate = SIMIX_process_exception_terminate;
__xbt_running_ctx_fetch = SIMIX_process_get_running_context;
__xbt_ex_terminate = SIMIX_process_exception_terminate;
- /* Initialize the SIMIX network module */
SIMIX_network_init();
/* Prepare to display some more info when dying on Ctrl-C pressing */
SIMIX_network_init();
/* Prepare to display some more info when dying on Ctrl-C pressing */
@@
-107,7
+106,6
@@
void SIMIX_global_init(int *argc, char **argv)
simix_timers = xbt_heap_new(8, &free);
}
simix_timers = xbt_heap_new(8, &free);
}
- XBT_DEBUG("ADD SIMIX LEVELS");
SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
atexit(SIMIX_clean);
SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
atexit(SIMIX_clean);
@@
-459,12
+457,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)
);
}
}
}
}
}
}
@@
-489,6
+487,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);