More performance optimizations (LLNL#470)

Author: daboehme

include/caliper/common/Entry.h

@@ -42,7 +42,7 @@ class Entry
         { }
 
     Entry(Node* node)
-        : m_node(node)
+        : m_node(node), m_value(node->data())
         { }
 
     Entry(const Attribute& attr, const Variant& val)
@@ -72,10 +72,7 @@ class Entry
 
     /// \brief Return top-level data value of this entry
     Variant   value() const {
-        if (!m_node)
-            return Variant();
-
-        return Attribute::is_attribute(m_node) ? m_value : m_node->data();
+        return m_value;
     }
 
     /// \brief Extract data value for attribute \a attr_id from this entry

src/caliper/Blackboard.cpp

@@ -45,7 +45,6 @@ Blackboard::add(cali_id_t key, const Entry& value, bool include_in_snapshots)
     }
 
     hashtable[I].key   = key;
-    hashtable[I].is_occupied = true;
     hashtable[I].value = value;
 
     if (include_in_snapshots) {
@@ -81,14 +80,14 @@ Blackboard::del(cali_id_t key)
 
     size_t I = find_existing_entry(key);
 
-    if (!hashtable[I].is_occupied || hashtable[I].key != key)
+    if (hashtable[I].key != key)
         return;
 
     {
         size_t j = I;
         while (true) {
             j = (j+1) % Nmax;
-            if (!hashtable[j].is_occupied)
+            if (hashtable[j].key == CALI_INV_ID)
                 break;
             size_t k = hashtable[j].key % Nmax;
             if ((j > I && (k <= I || k > j)) || (j < I && (k <= I && k > j))) {
@@ -99,7 +98,6 @@ Blackboard::del(cali_id_t key)
     }
 
     hashtable[I].key   = CALI_INV_ID;
-    hashtable[I].is_occupied = false;
     hashtable[I].value = Entry();
 
     --num_entries;

src/caliper/Blackboard.h

@@ -29,7 +29,6 @@ class Blackboard {
 
     struct blackboard_entry_t {
         cali_id_t key   { CALI_INV_ID };
-        bool      is_occupied { false };
         Entry     value { };
     };
 
@@ -55,7 +54,7 @@ class Blackboard {
     inline size_t find_existing_entry(cali_id_t key) const {
         size_t I = key % Nmax;
 
-        while (hashtable[I].is_occupied && hashtable[I].key != key)
+        while (hashtable[I].key != key && hashtable[I].key != CALI_INV_ID)
             I = (I+1) % Nmax;
 
         return I;
@@ -64,7 +63,7 @@ class Blackboard {
     inline size_t find_free_slot(cali_id_t key) const {
         size_t I = key % Nmax;
 
-        while (hashtable[I].is_occupied)
+        while (hashtable[I].key != CALI_INV_ID)
             I = (I+1) % Nmax;
 
         return I;
@@ -91,7 +90,7 @@ class Blackboard {
 
         size_t I = find_existing_entry(key);
 
-        if (!hashtable[I].is_occupied || hashtable[I].key != key)
+        if (hashtable[I].key != key)
             return Entry();
 
         return hashtable[I].value;