#2387: trace: fix callback in reduce call

Author: cwschilly

src/vt/trace/trace.cc

@@ -125,8 +125,8 @@ void Trace::setProxy(objgroup::proxy::Proxy<Trace> in_proxy) {
   proxy_ = in_proxy;
 }
 
-/*static*/ std::unique_ptr<Trace> Trace::construct() {
-  auto ptr = std::make_unique<Trace>();
+/*static*/ std::unique_ptr<Trace> Trace::construct(std::string const& in_prog_name) {
+  auto ptr = std::make_unique<Trace>(in_prog_name);
   auto proxy = theObjGroup()->makeCollective<Trace>(
     ptr.get(), "Trace"
   );
@@ -210,13 +210,12 @@ void Trace::addUserData(int32_t data) {
   );
 }
 
-void Trace::reducedEventsHan(UserEventRegistry gathered_user_events) {
-  vtAssert(theContext()->getNode() == 0, "Must be node 0");
-  user_event_ = gathered_user_events;
+void Trace::setUserEvents(const UserEventRegistry& events) {
+  user_event_ = std::move(events);
 }
 
 void Trace::gatherUserEvents() {
-  proxy_.reduce<&Trace::reducedEventsHan, vt::collective::PlusOp>(0, std::move(user_event_));
+  proxy_.reduce<&reducedEventsHan, vt::collective::PlusOp>(0, user_event_);
 }
 
 UserEventIDType Trace::registerUserEventRoot(std::string const& name) {
@@ -233,6 +232,11 @@ void Trace::registerUserEventManual(
   user_event_.user(name, id);
 }
 
+void reducedEventsHan(const UserEventRegistry& gathered_user_events) {
+  vtAssert(theContext()->getNode() == 0, "Must be node 0");
+  theTrace()->setUserEvents(gathered_user_events);
+}
+
 void insertNewUserEvent(
   [[maybe_unused]] UserEventIDType event,
   [[maybe_unused]] std::string const& name

src/vt/trace/trace.h

@@ -65,6 +65,9 @@
 
 namespace vt { namespace trace {
 
+// Callback for gathering user events on node 0
+void reducedEventsHan(const UserEventRegistry& gathered_user_events);
+
 /// Tracking information for beginProcessing/endProcessing.
 struct TraceProcessingTag {
 
@@ -108,8 +111,6 @@ struct TraceProcessingTag {
  * java Projections tool.
  */
 struct Trace : runtime::component::Component<Trace>, TraceLite {
-
-
   /**
    * \internal \brief System call to construct the trace component
    *
@@ -123,12 +124,12 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
 
   friend struct Log;
 
+  static std::unique_ptr<Trace> construct(std::string const& in_prog_name = "Trace");
   void initialize() override;
   void startup() override;
   void finalize() override;
 
   void setProxy(objgroup::proxy::Proxy<Trace> in_proxy);
-  static std::unique_ptr<Trace> construct();
 
   /**
    * \brief Initiate a paired processing event.
@@ -295,7 +296,7 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
    * \brief Update event registry on Node 0 with all gathered events
    * \param[in] gathered_user_events summed registry of user events from all nodes
    */
-  void reducedEventsHan(UserEventRegistry gathered_user_events);
+  void setUserEvents(const UserEventRegistry& events);
 
   /**
    * \brief Gathers all user-defined event hashes onto node 0.