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
[mc] Move MCer code from mc_ignore.cpp to mcer_ignore.cpp
[simgrid.git]
/
src
/
mc
/
mc_compare.cpp
diff --git
a/src/mc/mc_compare.cpp
b/src/mc/mc_compare.cpp
index
3420b02
..
1cfbd3c
100644
(file)
--- a/
src/mc/mc_compare.cpp
+++ b/
src/mc/mc_compare.cpp
@@
-8,6
+8,8
@@
#include <inttypes.h>
#include <boost/unordered_set.hpp>
#include <inttypes.h>
#include <boost/unordered_set.hpp>
+#include <xbt/sysdep.h>
+
#include "internal_config.h"
#include "mc_object_info.h"
#include "mc_safety.h"
#include "internal_config.h"
#include "mc_object_info.h"
#include "mc_safety.h"
@@
-24,9
+26,6
@@
#include <xbt/probes.h>
#include <xbt/probes.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
- "Logging specific to mc_compare");
-
typedef struct s_pointers_pair {
void *p1;
void *p2;
typedef struct s_pointers_pair {
void *p1;
void *p2;
@@
-55,6
+54,9
@@
struct mc_compare_state {
extern "C" {
extern "C" {
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt,
+ "Logging specific to mc_compare in mc");
+
/************************** Free functions ****************************/
/********************************************************************/
/************************** Free functions ****************************/
/********************************************************************/
@@
-102,7
+104,7
@@
static int compare_areas_with_type(struct mc_compare_state& state,
void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2,
dw_type_t type, int pointer_level)
{
void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2,
dw_type_t type, int pointer_level)
{
- mc_process_t process = &mc_model_checker->process;
+ mc_process_t process = &mc_model_checker->process
()
;
unsigned int cursor = 0;
dw_type_t member, subtype, subsubtype;
unsigned int cursor = 0;
dw_type_t member, subtype, subsubtype;
@@
-385,7
+387,7
@@
static int compare_local_variables(int process_index,
int snapshot_compare(void *state1, void *state2)
{
int snapshot_compare(void *state1, void *state2)
{
- mc_process_t process = &mc_model_checker->process;
+ mc_process_t process = &mc_model_checker->process
()
;
mc_snapshot_t s1, s2;
int num1, num2;
mc_snapshot_t s1, s2;
int num1, num2;