A few more minor optimizations (LLNL#462)

Author: daboehme

include/caliper/Annotation.h

@@ -24,15 +24,13 @@ namespace cali
 /// \brief Pre-defined function annotation class
 class Function
 {
-private:
-
-    // Do not copy Function objects: will double-end things
-    Function(const Function&);
-    Function& operator = (const Function&);
-
 public:
 
     Function(const char* name);
+
+    Function(const Function&) = delete;
+    Function& operator = (const Function&) = delete;
+
     ~Function();
 };
 
@@ -150,13 +148,13 @@ class Annotation
     class Guard {
         Impl* pI;
 
-        Guard(const Guard&);
-        Guard& operator = (const Guard&);
-
     public:
 
         Guard(Annotation& a);
 
+        Guard(const Guard&) = delete;
+        Guard& operator = (const Guard&) = delete;
+
         ~Guard();
     };
 
@@ -179,8 +177,13 @@ class Annotation
     /// \copydoc cali::Annotation::begin(int)
     Annotation& begin(double data);
     /// \copydoc cali::Annotation::begin(int)
-    Annotation& begin(const char* data);
-    Annotation& begin(cali_attr_type type, void* data, uint64_t size);
+    Annotation& begin(const char* data) {
+        return begin(Variant(data));
+    }
+    /// \copydoc cali::Annotation::begin(int)
+    Annotation& begin(cali_attr_type type, void* data, uint64_t size) {
+        return begin(Variant(type, data, size));
+    }
     /// \copydoc cali::Annotation::begin(int)
     Annotation& begin(const Variant& data);
 

include/caliper/Caliper.h

@@ -520,9 +520,6 @@ class Caliper : public CaliperMetadataAccessInterface
     /// \name Context tree manipulation and metadata access
     /// \{
 
-    /// \brief Return the total number of attributes
-    size_t    num_attributes() const;
-
     /// \brief Return \a true if the attribute with name \a name exists
     bool      attribute_exists(const std::string& name) const;
 

include/caliper/common/Node.h

@@ -44,8 +44,6 @@ class Node : public util::LockfreeIntrusiveTree<Node>
 
     Node& operator = (const Node&) = delete;
 
-    ~Node();
-
     /// \brief Check if the node's attribute and value are equal to
     ///   \a attr and \a v
     bool equals(cali_id_t attr, const Variant& v) const {

src/caliper/Annotation.cpp

@@ -126,6 +126,7 @@ struct Annotation::Impl {
     std::vector<Variant>     m_metadata_values;
     int                      m_opt;
     std::atomic<int>         m_refcount;
+
     Impl(const std::string& name, MetadataListType metadata, int opt)
         : m_attr(nullptr),
           m_name(name),
@@ -151,17 +152,18 @@ struct Annotation::Impl {
     ~Impl() {
         delete m_attr.load();
     }
+
     void begin(const Variant& data) {
         Caliper   c;
-        Attribute attr = get_attribute(c, data.type(), m_metadata_keys, m_metadata_values);
+        Attribute attr = get_attribute(c, data.type());
 
         if ((attr.type() == data.type()) && attr.type() != CALI_TYPE_INV)
             c.begin(attr, data);
     }
 
     void set(const Variant& data) {
         Caliper   c;
-        Attribute attr = get_attribute(c, data.type(), m_metadata_keys, m_metadata_values);
+        Attribute attr = get_attribute(c, data.type());
 
         if ((attr.type() == data.type()) && attr.type() != CALI_TYPE_INV)
             c.set(attr, data);
@@ -173,13 +175,13 @@ struct Annotation::Impl {
         c.end(get_attribute(c));
     }
 
-    Attribute get_attribute(Caliper& c, cali_attr_type type = CALI_TYPE_INV, const std::vector<cali::Attribute>& attrs = {}, const std::vector<cali::Variant>& values = {}) {
+    Attribute get_attribute(Caliper& c, cali_attr_type type = CALI_TYPE_INV) {
         Attribute* attr_p = m_attr.load();
 
         if (!attr_p) {
             Attribute* new_attr = type == CALI_TYPE_INV ?
                 new Attribute(c.get_attribute(m_name)) :
-                new Attribute(c.create_attribute(m_name, type, m_opt,attrs.size(),attrs.data(),values.data()));
+                new Attribute(c.create_attribute(m_name, type, m_opt, m_metadata_keys.size(), m_metadata_keys.data(), m_metadata_values.data()));
 
             // Don't store invalid attribute in shared pointer
             if (*new_attr == Attribute::invalid)
@@ -281,16 +283,6 @@ Annotation& Annotation::begin(double data)
     return begin(Variant(data));
 }
 
-Annotation& Annotation::begin(const char* data)
-{
-    return begin(Variant(data));
-}
-
-Annotation& Annotation::begin(cali_attr_type type, void* data, uint64_t size)
-{
-    return begin(Variant(type, data, size));
-}
-
 Annotation& Annotation::begin(const Variant& data)
 {
     pI->begin(data);
@@ -319,7 +311,7 @@ Annotation& Annotation::set(double data)
 
 Annotation& Annotation::set(const char* data)
 {
-    return set(Variant(CALI_TYPE_STRING, data, strlen(data)));
+    return set(Variant(data));
 }
 
 Annotation& Annotation::set(cali_attr_type type, void* data, uint64_t size)

src/caliper/Caliper.cpp

@@ -1298,7 +1298,7 @@ Caliper::memory_region_end(Channel* channel, const void* ptr)
 // --- Generic entry API
 
 void
-Caliper::make_record(size_t n, const Attribute* attr, const Variant* value, SnapshotBuilder& rec, Node* parent)
+Caliper::make_record(size_t n, const Attribute attr[], const Variant value[], SnapshotBuilder& rec, Node* parent)
 {
     std::lock_guard<::siglock>
         g(sT->lock);

src/common/CMakeLists.txt

@@ -4,7 +4,6 @@ set(CALIPER_COMMON_SOURCES
   CompressedSnapshotRecord.cpp
   Entry.cpp
   Log.cpp
-  Node.cpp
   NodeBuffer.cpp
   OutputStream.cpp
   RuntimeConfig.cpp