Merge branch 'master' into woptim/spack-update

Author: adrienbernede

include/caliper/Caliper.h

@@ -40,13 +40,21 @@ typedef std::function<void(CaliperMetadataAccessInterface&,const std::vector<cal
 class Channel
 {
     struct ChannelImpl;
-
     std::shared_ptr<ChannelImpl> mP;
 
     Channel(cali_id_t id, const char* name, const RuntimeConfig& cfg);
 
 public:
 
+    constexpr Channel()
+        : mP { nullptr } { }
+
+    Channel(const Channel&) = default;
+    Channel(Channel&&) = default;
+
+    Channel& operator = (const Channel&) = default;
+    Channel& operator = (Channel&&) = default;
+
     ~Channel();
 
     // --- Events (callback functions)
@@ -175,9 +183,22 @@ class Channel
 
     cali_id_t      id() const;
 
+    operator bool() const { return mP.use_count() > 0; }
+
     friend class Caliper;
+    friend bool operator == (const Channel&, const Channel&);
+    friend bool operator != (const Channel&, const Channel&);
 };
 
+inline bool operator == (const Channel& a, const Channel& b)
+{
+    return a.mP == b.mP;
+}
+
+inline bool operator != (const Channel& a, const Channel& b)
+{
+    return a.mP != b.mP;
+}
 
 /// \class Caliper
 /// \brief The main interface for the caliper runtime system
@@ -493,7 +514,7 @@ class Caliper : public CaliperMetadataAccessInterface
     /// \brief Return all global attributes for \a channel
     ///
     ///
-    std::vector<Entry> get_globals(Channel* channel);
+    std::vector<Entry> get_globals(const Channel& channel);
 
     /// \}
     /// \name Explicit snapshot record manipulation
@@ -630,38 +651,32 @@ class Caliper : public CaliperMetadataAccessInterface
     /// \param name Name of the channel. This is used to identify the channel
     ///   in %Caliper log output.
     /// \param cfg The channel's runtime configuration.
-    /// \return Pointer to the channel. Null pointer if the channel could
-    ///   not be created.
-    Channel* create_channel(const char* name, const RuntimeConfig& cfg);
+    /// \return The channel
+    Channel   create_channel(const char* name, const RuntimeConfig& cfg);
 
     /// \brief Return all existing channels
-    std::vector<Channel*> get_all_channels();
+    std::vector<Channel> get_all_channels();
 
-    /// \brief Return pointer to channel object with the given ID.
-    ///
-    /// The call returns a pointer to the created channel object. %Caliper
-    /// retains ownership of the channel object. This pointer becomes invalid
-    /// when the channel is deleted. %Caliper notifies users with the
-    /// finish_evt callback when an channel is about to be deleted.
-    Channel* get_channel(cali_id_t id);
+    /// \brief Return the channel with the given ID or an empty Channel object.
+    Channel   get_channel(cali_id_t id);
 
     /// \brief Delete the given channel.
     ///
     /// Deleting channels is \b not thread-safe.
-    void     delete_channel(Channel* chn);
+    void      delete_channel(Channel& chn);
 
     /// \brief Activate the given channel.
     ///
     /// Inactive channels will not track or process annotations and other
     /// blackboard updates.
-    void     activate_channel(Channel* chn);
+    void      activate_channel(Channel& chn);
 
     /// \brief Deactivate the given channel.
     /// \copydetails Caliper::activate_channel
-    void     deactivate_channel(Channel* chn);
+    void      deactivate_channel(Channel& chn);
 
     /// \brief Flush and delete all channels
-    void     finalize();
+    void      finalize();
 
     /// \}
 

include/caliper/ChannelController.h

@@ -52,19 +52,19 @@ class ChannelController
 
     /// \brief Create the channel with the controller's
     ///   name, flags, and config map
-    Channel*      create();
+    Channel       create();
 
     /// \brief Callback function, invoked after the underlying channel
     ///   has been created.
     ///
     ///   This can be used to setup additional functionality, e.g.
     /// registering %Caliper callbacks.
-    virtual void  on_create(Caliper* /*c*/, Channel* /*chn*/) { }
+    virtual void  on_create(Caliper* /*c*/, Channel& /*chn*/) { }
 
 public:
 
     /// \brief Return the underlying %Caliper channel object.
-    Channel*      channel();
+    Channel       channel();
 
     /// \brief Create and activate the %Caliper channel,
     ///   or reactivate a stopped %Caliper channel.

scripts/run-annotation-perftest.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-depth=20
+depth=28
 width=200
 
 EXE=`pwd`/test/cali-annotation-perftest
 ARGS="-d ${depth} -w ${width}"
 
-# Run Caliper annotation benchmarks. Designed to run on LLNL quartz (36 cores/node)
+# Run Caliper annotation benchmarks. Designed to run on LLNL dane (56 cores/socket)
 
-for threads in 1 4 36
+for threads in 1 4 56
 do
     # Annotations only, no active measurement config
     OMP_NUM_THREADS=${threads} \