From cbc3117c526501483677c834f121499c5c67b753 Mon Sep 17 00:00:00 2001 From: Marion Guthmuller Date: Wed, 13 Mar 2013 17:05:56 +0100 Subject: [PATCH] model-checker : improve debug message --- src/mc/mc_compare.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 7ed2201f89..6e1ea06553 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -547,7 +547,7 @@ static int compare_local_variables(char *s1, char *s2){ char *frame_name1 = NULL, *frame_name2 = NULL; int res_compare = 0; - #ifdef MC_VERBOSE + #if defined MC_VERBOSE || defined MC_DEBUG char *var_name; #endif @@ -555,7 +555,7 @@ static int compare_local_variables(char *s1, char *s2){ s_tokens1 = xbt_str_split(xbt_dynar_get_as(tokens1, cursor, char *), "="); s_tokens2 = xbt_str_split(xbt_dynar_get_as(tokens2, cursor, char *), "="); if(xbt_dynar_length(s_tokens1) > 1 && xbt_dynar_length(s_tokens2) > 1){ - #ifdef MC_VERBOSE + #if defined MC_VERBOSE || defined MC_DEBUG var_name = xbt_dynar_get_as(s_tokens1, 0, char *); #endif if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "frame_name") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "frame_name") == 0)){ @@ -578,6 +578,9 @@ static int compare_local_variables(char *s1, char *s2){ #ifdef MC_VERBOSE XBT_VERB("Different local variable : %s at addresses %p - %p", var_name, addr1, addr2); #endif + #ifdef MC_DEBUG + XBT_DEBUG("Different local variable : %s at addresses %p - %p", var_name, addr1, addr2); + #endif xbt_dynar_free(&s_tokens1); xbt_dynar_free(&s_tokens2); xbt_dynar_free(&tokens1); @@ -598,6 +601,9 @@ static int compare_local_variables(char *s1, char *s2){ #ifdef MC_VERBOSE XBT_VERB("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)); #endif + #ifdef MC_DEBUG + XBT_DEBUG("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)); + #endif xbt_dynar_free(&s_tokens1); xbt_dynar_free(&s_tokens2); xbt_dynar_free(&tokens1); @@ -654,7 +660,7 @@ static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2){ int MC_compare_snapshots(void *s1, void *s2){ MC_ignore_stack("self", "simcall_BODY_mc_snapshot"); - + return simcall_mc_compare_snapshots(s1, s2); } -- 2.20.1