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
Rewrite xbt_getline.
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
3cdbdc0
..
7cd414d
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-24,16
+24,13
@@
static void SIMIX_action_mallocator_reset_f(void* action);
static void SIMIX_clean(void);
static void SIMIX_clean(void);
-SIMCALL_LIST(SIMCALL_RES_GETSET, SIMCALL_SEP_NOTHING)
-SIMCALL_LIST(SIMCALL_ARG_GETSET, SIMCALL_SEP_NOTHING)
-
/* 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();
}
@@
-127,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();
@@
-460,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)
);
}
}
}
}
}
}