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
Merge branch 'master'
[simgrid.git]
/
src
/
mc
/
mc_global.c
diff --git
a/src/mc/mc_global.c
b/src/mc/mc_global.c
index
66e8f81
..
6c3b742
100644
(file)
--- a/
src/mc/mc_global.c
+++ b/
src/mc/mc_global.c
@@
-4,6
+4,9
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "mc_base.h"
+
+#ifndef _XBT_WIN32
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
@@
-13,6
+16,7
@@
#define UNW_LOCAL_ONLY
#include <libunwind.h>
#define UNW_LOCAL_ONLY
#include <libunwind.h>
+#endif
#include "simgrid/sg_config.h"
#include "../surf/surf_private.h"
#include "simgrid/sg_config.h"
#include "../surf/surf_private.h"
@@
-23,6
+27,13
@@
#ifdef HAVE_MC
#include "../xbt/mmalloc/mmprivate.h"
#ifdef HAVE_MC
#include "../xbt/mmalloc/mmprivate.h"
+#include "mc_object_info.h"
+#include "mc_comm_pattern.h"
+#include "mc_request.h"
+#include "mc_safety.h"
+#include "mc_memory_map.h"
+#include "mc_snapshot.h"
+#include "mc_liveness.h"
#include "mc_private.h"
#endif
#include "mc_record.h"
#include "mc_private.h"
#endif
#include "mc_record.h"
@@
-181,22
+192,25
@@
void MC_init()
/* Ignore local variable about time used for tracing */
MC_ignore_local_variable("start_time", "*");
/* Ignore local variable about time used for tracing */
MC_ignore_local_variable("start_time", "*");
+ /* Main MC state: */
MC_ignore_global_variable("mc_model_checker");
MC_ignore_global_variable("mc_model_checker");
+ MC_ignore_global_variable("communications_pattern");
+ MC_ignore_global_variable("initial_communications_pattern");
+ MC_ignore_global_variable("incomplete_communications_pattern");
- /
/ Mot of those things could be moved into mc_model_checker:
- MC_ignore_global_variable("
compared_pointers
");
+ /
* MC __thread variables: */
+ MC_ignore_global_variable("
mc_diff_info
");
MC_ignore_global_variable("mc_comp_times");
MC_ignore_global_variable("mc_snapshot_comparison_time");
MC_ignore_global_variable("mc_comp_times");
MC_ignore_global_variable("mc_snapshot_comparison_time");
+
+ /* This MC state is used in MC replay as well: */
MC_ignore_global_variable("mc_time");
MC_ignore_global_variable("mc_time");
- MC_ignore_global_variable("smpi_current_rank");
- MC_ignore_global_variable("counter"); /* Static variable used for tracing */
- MC_ignore_global_variable("maestro_stack_start");
- MC_ignore_global_variable("maestro_stack_end");
+
+ /* Static variable used for tracing */
+ MC_ignore_global_variable("counter");
+
+ /* SIMIX */
MC_ignore_global_variable("smx_total_comms");
MC_ignore_global_variable("smx_total_comms");
- MC_ignore_global_variable("communications_pattern");
- MC_ignore_global_variable("initial_communications_pattern");
- MC_ignore_global_variable("incomplete_communications_pattern");
- MC_ignore_global_variable("mc_diff_info");
MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double));
MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double));