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
model-checker : add ignore mechanism for global variables (data + bss segments) in...
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
6133fcf
..
728da6f
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-22,6
+22,8
@@
static void* SIMIX_action_mallocator_new_f(void);
static void SIMIX_action_mallocator_free_f(void* action);
static void SIMIX_action_mallocator_reset_f(void* action);
static void SIMIX_action_mallocator_free_f(void* action);
static void SIMIX_action_mallocator_reset_f(void* action);
+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>
@@
-107,6
+109,8
@@
void SIMIX_global_init(int *argc, char **argv)
XBT_DEBUG("ADD SIMIX LEVELS");
SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
XBT_DEBUG("ADD SIMIX LEVELS");
SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
+
+ atexit(SIMIX_clean);
}
/**
}
/**
@@
-115,7
+119,7
@@
void SIMIX_global_init(int *argc, char **argv)
*
* This functions remove the memory used by SIMIX
*/
*
* This functions remove the memory used by SIMIX
*/
-void SIMIX_clean(void)
+
static
void SIMIX_clean(void)
{
#ifdef TIME_BENCH_PER_SR
smx_ctx_raw_new_sr();
{
#ifdef TIME_BENCH_PER_SR
smx_ctx_raw_new_sr();
@@
-178,7
+182,7
@@
void SIMIX_clean(void)
*/
XBT_INLINE double SIMIX_get_clock(void)
{
*/
XBT_INLINE double SIMIX_get_clock(void)
{
- if(MC_
IS_ENABLED
){
+ if(MC_
is_active()
){
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();
@@
-445,6
+449,13
@@
void SIMIX_display_process_status(void)
case SIMIX_ACTION_IO:
action_description = "I/O";
case SIMIX_ACTION_IO:
action_description = "I/O";
+ break;
+ /* **************************************/
+ /* TUTORIAL: New API */
+ case SIMIX_ACTION_NEW_API:
+ action_description = "NEW API";
+ /* **************************************/
+
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",