From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Wed, 11 Jan 2012 15:26:44 +0000 (+0100)
Subject: merge conflicts resolved
X-Git-Tag: exp_20120216~133^2~3
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2be0e4648c5b7055580df1c265b7c43ee6763a46

merge conflicts resolved
---

2be0e4648c5b7055580df1c265b7c43ee6763a46
diff --cc src/mc/mc_liveness.c
index 81c402d35e,3c093ad07f..8ff21442dd
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@@ -77,84 -60,46 +77,84 @@@ int snapshot_compare(mc_snapshot_t s1, 
        break;
      case 1 :
        if(s1->regions[i]->size != s2->regions[i]->size){
 -	//XBT_DEBUG("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -	//XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 + 	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -    	//XBT_DEBUG("Different memcmp for data in libsimgrid");
 -    	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different memcmp for data in libsimgrid");
 + 	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        break;
 -    case 2:
 +      /*case 2:
        if(s1->regions[i]->size != s2->regions[i]->size){
 -	//XBT_DEBUG("Different size of program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -	return 1;
 -      }
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
-       }      
++      } 
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -	//XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -    	//XBT_DEBUG("Different memcmp for data in program");
 -    	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different memcmp for data in program");
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
 -      break;
 +      break;*/
      case 3:
        if(s1->regions[i]->size != s2->regions[i]->size){
 -	//XBT_DEBUG("Different size of stack (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -	//XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -    	//XBT_DEBUG("Different memcmp for data in stack");
 -    	return 1;
 +	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +	  XBT_DEBUG("Different memcmp for data in stack");
 +	  errors++;
 +	}else{
 +	  return 1;
 +	}
        }
        break;
 +    default:
 +      break;
      }
    }