case DW_TAG_structure_type:
case DW_TAG_union_type:
if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */
- dw_type_t full_type = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
- if(full_type) {
- type = full_type;
- } else {
- subtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
+ subtype = subtype->other_object_same_type;
switch_types = 1;
- }
}
elm_size = subtype->byte_size;
break;
case DW_TAG_volatile_type:
subsubtype = subtype->subtype;
if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */
- subsubtype = xbt_dict_get_or_null(other_info->types_by_name, subsubtype->name);
+ subsubtype = subsubtype->other_object_same_type;
switch_types = 1;
}
elm_size = subsubtype->byte_size;
}
break;
case DW_TAG_pointer_type:
- if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(info->types, type->dw_type_id))->type == DW_TAG_subroutine_type){
+ if(type->subtype && type->subtype->type == DW_TAG_subroutine_type){
addr_pointed1 = *((void **)(area1));
addr_pointed2 = *((void **)(area2));
return (addr_pointed1 != addr_pointed2);
offset = (char *)current_var->address - (char *)object_info->start_rw;
- dw_type_t bvariable_type = xbt_dict_get_or_null(object_info->types, current_var->type_origin);
+ dw_type_t bvariable_type = current_var->type;
res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, object_info, other_object_info, bvariable_type, r1->size, region_type, start_data, 0);
if(res == 1){
XBT_VERB("Global variable %s (%p - %p) is different between snapshots", current_var->name, (char *)r1->data + offset, (char *)r2->data + offset);
if(current_var1->region == 1) {
- dw_type_t subtype = xbt_dict_get_or_null(mc_libsimgrid_info->types, current_var1->type);
+ dw_type_t subtype = current_var1->type;
res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_libsimgrid_info, mc_binary_info, subtype, 0, 1, start_data_libsimgrid, 0);
} else {
- dw_type_t subtype = xbt_dict_get_or_null(mc_binary_info->types, current_var1->type);
+ dw_type_t subtype = current_var2->type;
res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_binary_info, mc_libsimgrid_info, subtype, 0, 2, start_data_binary, 0);
}
if(res == 1){
xbt_os_walltimer_start(timer);
#endif
- if(MC_USE_SNAPSHOT_HASH) {
- if(s1->hash != s2->hash) {
+ int hash_result = 0;
+ if(_sg_mc_hash) {
+ hash_result = (s1->hash != s2->hash);
+ if(hash_result) {
XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash);
+#ifndef MC_DEBUG
return 1;
+#endif
} else {
XBT_VERB("(%d - %d) Same hash : 0x%" PRIx64, num1, num2, s1->hash);
}
#endif
#ifdef MC_VERBOSE
- if(errors==0)
+ if(errors || hash_result)
+ XBT_VERB("(%d - %d) Difference found", num1, num2);
+ else
XBT_VERB("(%d - %d) No difference found", num1, num2);
#endif
- return errors > 0;
+
+#if defined(MC_DEBUG) && defined(MC_VERBOSE)
+ if(_sg_mc_hash) {
+ // * false positive SHOULD be avoided.
+ // * There MUST not be any false negative.
+
+ XBT_VERB("(%d - %d) State equality hash test is %s %s", num1, num2,
+ (hash_result!=0) == (errors!=0) ? "true" : "false",
+ !hash_result ? "positive" : "negative");
+ }
+#endif
+
+ return errors > 0 || hash_result;
}