@@ -315,8 +315,6 @@ struct Caliper::GlobalData
315
315
316
316
// --- data
317
317
318
- bool allow_region_overlap;
319
-
320
318
mutable std::mutex attribute_lock;
321
319
map<string, Attribute> attribute_map;
322
320
@@ -399,8 +397,6 @@ struct Caliper::GlobalData
399
397
attribute_default_scope = CALI_ATTR_SCOPE_THREAD;
400
398
else
401
399
log_invalid_cfg_value (" CALI_CALIPER_ATTRIBUTE_DEFAULT_SCOPE" , scope_str.c_str ());
402
-
403
- allow_region_overlap = config.get (" allow_region_overlap" ).to_bool ();
404
400
}
405
401
406
402
void init () {
@@ -523,10 +519,6 @@ const ConfigSet::Entry Caliper::GlobalData::s_configdata[] = {
523
519
" process: Process scope\n "
524
520
" thread: Thread scope"
525
521
},
526
- { " allow_region_overlap" , CALI_TYPE_BOOL, " false" ,
527
- " Allow overlapping regions for all attributes" ,
528
- " Allow overlapping begin/end regions for all attributes."
529
- },
530
522
531
523
ConfigSet::Terminator
532
524
};
@@ -658,7 +650,7 @@ struct BlackboardEntry
658
650
};
659
651
660
652
inline BlackboardEntry
661
- load_current_entry (const Attribute& attr, cali_id_t key, Blackboard& blackboard, bool allow_overlap )
653
+ load_current_entry (const Attribute& attr, cali_id_t key, Blackboard& blackboard)
662
654
{
663
655
Entry merged_entry = blackboard.get (key);
664
656
Entry entry = merged_entry.get (attr);
@@ -668,7 +660,7 @@ load_current_entry(const Attribute& attr, cali_id_t key, Blackboard& blackboard,
668
660
log_stack_error (nullptr , attr);
669
661
return { Entry (), Entry () };
670
662
}
671
- if (key != UNALIGNED_KEY && !allow_overlap ) {
663
+ if (key != UNALIGNED_KEY) {
672
664
log_stack_error (merged_entry.node (), attr);
673
665
return { Entry (), Entry () };
674
666
}
@@ -1028,7 +1020,7 @@ Caliper::end(const Attribute& attr)
1028
1020
std::lock_guard<::siglock>
1029
1021
g (sT ->lock );
1030
1022
1031
- auto current = load_current_entry (attr, key, *blackboard, sG -> allow_region_overlap );
1023
+ auto current = load_current_entry (attr, key, *blackboard);
1032
1024
1033
1025
if (current.entry .empty ()) {
1034
1026
sT ->stack_error = true ;
@@ -1068,7 +1060,7 @@ Caliper::end_with_value_check(const Attribute& attr, const Variant& data)
1068
1060
std::lock_guard<::siglock>
1069
1061
g (sT ->lock );
1070
1062
1071
- auto current = load_current_entry (attr, key, *blackboard, sG -> allow_region_overlap );
1063
+ auto current = load_current_entry (attr, key, *blackboard);
1072
1064
1073
1065
if (current.entry .empty () || data != current.entry .value ()) {
1074
1066
log_stack_value_error (current.entry , attr, data);
@@ -1143,7 +1135,7 @@ Caliper::end(Channel* channel, const Attribute& attr)
1143
1135
g (sT ->lock );
1144
1136
1145
1137
BlackboardEntry current =
1146
- load_current_entry (attr, key, channel->mP ->channel_blackboard , sG -> allow_region_overlap );
1138
+ load_current_entry (attr, key, channel->mP ->channel_blackboard );
1147
1139
1148
1140
if (current.entry .empty ()) {
1149
1141
sT ->stack_error = true ;
0 commit comments