Remove unused CALI_CALIPER_ALLOW_REGION_OVERLAP setting (#570)

LLNL · Jul 9, 2024 · 469caeb · 469caeb
1 parent 2d46914
commit 469caeb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 38 deletions.
diff --git a/src/caliper/Caliper.cpp b/src/caliper/Caliper.cpp
@@ -315,8 +315,6 @@ struct Caliper::GlobalData
 
     // --- data
 
-    bool                               allow_region_overlap;
-
     mutable std::mutex                 attribute_lock;
     map<string, Attribute>             attribute_map;
 
@@ -399,8 +397,6 @@ struct Caliper::GlobalData
             attribute_default_scope = CALI_ATTR_SCOPE_THREAD;
         else
             log_invalid_cfg_value("CALI_CALIPER_ATTRIBUTE_DEFAULT_SCOPE", scope_str.c_str());
-
-        allow_region_overlap = config.get("allow_region_overlap").to_bool();
     }
 
     void init() {
@@ -523,10 +519,6 @@ const ConfigSet::Entry Caliper::GlobalData::s_configdata[] = {
       "  process:   Process scope\n"
       "  thread:    Thread scope"
     },
-    { "allow_region_overlap", CALI_TYPE_BOOL, "false",
-      "Allow overlapping regions for all attributes",
-      "Allow overlapping begin/end regions for all attributes."
-    },
 
     ConfigSet::Terminator
 };
@@ -658,7 +650,7 @@ struct BlackboardEntry
 };
 
 inline BlackboardEntry
-load_current_entry(const Attribute& attr, cali_id_t key, Blackboard& blackboard, bool allow_overlap)
+load_current_entry(const Attribute& attr, cali_id_t key, Blackboard& blackboard)
 {
     Entry merged_entry = blackboard.get(key);
     Entry entry = merged_entry.get(attr);
@@ -668,7 +660,7 @@ load_current_entry(const Attribute& attr, cali_id_t key, Blackboard& blackboard,
             log_stack_error(nullptr, attr);
             return { Entry(), Entry() };
         }
-        if (key != UNALIGNED_KEY && !allow_overlap) {
+        if (key != UNALIGNED_KEY) {
             log_stack_error(merged_entry.node(), attr);
             return { Entry(), Entry() };
         }
@@ -1028,7 +1020,7 @@ Caliper::end(const Attribute& attr)
     std::lock_guard<::siglock>
         g(sT->lock);
 
-    auto current = load_current_entry(attr, key, *blackboard, sG->allow_region_overlap);
+    auto current = load_current_entry(attr, key, *blackboard);
 
     if (current.entry.empty()) {
         sT->stack_error = true;
@@ -1068,7 +1060,7 @@ Caliper::end_with_value_check(const Attribute& attr, const Variant& data)
     std::lock_guard<::siglock>
         g(sT->lock);
 
-    auto current = load_current_entry(attr, key, *blackboard, sG->allow_region_overlap);
+    auto current = load_current_entry(attr, key, *blackboard);
 
     if (current.entry.empty() || data != current.entry.value()) {
         log_stack_value_error(current.entry, attr, data);
@@ -1143,7 +1135,7 @@ Caliper::end(Channel* channel, const Attribute& attr)
         g(sT->lock);
 
     BlackboardEntry current =
-        load_current_entry(attr, key, channel->mP->channel_blackboard, sG->allow_region_overlap);
+        load_current_entry(attr, key, channel->mP->channel_blackboard);
 
     if (current.entry.empty()) {
         sT->stack_error = true;

diff --git a/test/ci_app_tests/test_validator.py b/test/ci_app_tests/test_validator.py
@@ -6,31 +6,6 @@
 class CaliperValidatorTest(unittest.TestCase):
     """ Caliper validator service test cases """
 
-    def test_validator_nesting_error(self):
-        target_cmd = [ '../cali-test', 'nesting-error' ]
-
-        env = {
-            'CALI_LOG_VERBOSITY'   : '1',
-            'CALI_LOG_LOGFILE'     : 'stdout',
-            'CALI_SERVICES_ENABLE' : 'validator',
-            'CALI_CALIPER_ALLOW_REGION_OVERLAP' : 'true'
-        }
-
-        log_targets = [
-            'validator: incorrect nesting: trying to end "test.nesting-error.a"="11" but current attribute is "test.nesting-error.b"',
-            'validator: Annotation nesting errors found'
-        ]
-
-        report_out,_ = cat.run_test(target_cmd, env)
-        lines = report_out.decode().splitlines()
-
-        for target in log_targets:
-            for line in lines:
-                if target in line:
-                    break
-            else:
-                self.fail('%s not found in log' % target)
-
     def test_validator_unclosed_region(self):
         target_cmd = [ '../cali-test', 'unclosed-region' ]