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] Fix unitialized variable
[simgrid.git]
/
src
/
mc
/
mc_compare.cpp
diff --git
a/src/mc/mc_compare.cpp
b/src/mc/mc_compare.cpp
index
5b6352a
..
d6204d4
100644
(file)
--- a/
src/mc/mc_compare.cpp
+++ b/
src/mc/mc_compare.cpp
@@
-5,14
+5,17
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#define __STDC_FORMAT_MACROS
* under the terms of the license (GNU LGPL) which comes with this package. */
#define __STDC_FORMAT_MACROS
-#include <
inttypes.h
>
+#include <
cinttypes
>
#include <boost/unordered_set.hpp>
#include <boost/unordered_set.hpp>
+#include <xbt/sysdep.h>
+
#include "internal_config.h"
#include "mc_object_info.h"
#include "mc_safety.h"
#include "mc_liveness.h"
#include "mc_private.h"
#include "internal_config.h"
#include "mc_object_info.h"
#include "mc_safety.h"
#include "mc_liveness.h"
#include "mc_private.h"
+#include "mc_smx.h"
#ifdef HAVE_SMPI
#include "smpi/private.h"
#ifdef HAVE_SMPI
#include "smpi/private.h"
@@
-23,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;
@@
-54,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 ****************************/
/********************************************************************/
@@
-101,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;
@@
-269,7
+272,7
@@
static int compare_global_variables(mc_object_info_t object_info,
return 1;
}
return 1;
}
- size_t process_count = smpi_process_count();
+ size_t process_count =
MC_
smpi_process_count();
xbt_assert(process_count == r1->privatized.regions_count
&& process_count == r2->privatized.regions_count);
xbt_assert(process_count == r1->privatized.regions_count
&& process_count == r2->privatized.regions_count);
@@
-384,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;
@@
-394,6
+397,11
@@
int snapshot_compare(void *state1, void *state2)
s2 = ((mc_visited_pair_t) state2)->graph_state->system_state;
num1 = ((mc_visited_pair_t) state1)->num;
num2 = ((mc_visited_pair_t) state2)->num;
s2 = ((mc_visited_pair_t) state2)->graph_state->system_state;
num1 = ((mc_visited_pair_t) state1)->num;
num2 = ((mc_visited_pair_t) state2)->num;
+ }else if (_sg_mc_termination) { /* Non-progressive cycle MC */
+ s1 = ((mc_state_t) state1)->system_state;
+ s2 = ((mc_state_t) state2)->system_state;
+ num1 = ((mc_state_t) state1)->num;
+ num2 = ((mc_state_t) state2)->num;
} else { /* Safety or comm determinism MC */
s1 = ((mc_visited_state_t) state1)->system_state;
s2 = ((mc_visited_state_t) state2)->system_state;
} else { /* Safety or comm determinism MC */
s1 = ((mc_visited_state_t) state1)->system_state;
s2 = ((mc_visited_state_t) state2)->system_state;