Merge pull request #1688 from DARMA-tasking/1685-fix-tracing-issue

1685 Fix tracing issue

Author: lifflander

src/vt/collective/reduce/reduce.impl.h

@@ -78,9 +78,10 @@ void Reduce::reduceRootRecv(MsgT* msg) {
   msg->is_root_ = true;
 
   auto const& from_node = theContext()->getFromNodeCurrentTask();
+  auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
 
   auto m = promoteMsg(msg);
-  runnable::makeRunnable(m, false, handler, from_node)
+  runnable::makeRunnable(m, false, handler, from_node, han_type)
     .withTDEpochFromMsg()
     .run();
 }
@@ -258,7 +259,8 @@ void Reduce::startReduce(detail::ReduceStamp id, bool use_num_contrib) {
 
       // this needs to run inline.. threaded not allowed for reduction
       // combination
-      runnable::makeRunnable(state.msgs[0], false, handler, from_node)
+      auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+      runnable::makeRunnable(state.msgs[0], false, handler, from_node, han_type)
         .withTDEpochFromMsg()
         .run();
     }

src/vt/messaging/active.cc

@@ -540,8 +540,10 @@ EventType ActiveMessenger::doMessageSend(
         }
       }
 
-      runnable::makeRunnable(base, true, envelopeGetHandler(msg->env), dest)
-        .withTDEpochFromMsg(is_term)
+      auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+      runnable::makeRunnable(
+        base, true, envelopeGetHandler(msg->env), dest, han_type
+      ) .withTDEpochFromMsg(is_term)
         .withLBStats(&bare_handler_stats_, bare_handler_dummy_elm_id_for_lb_stats_)
         .enqueue();
     }
@@ -1000,7 +1002,8 @@ bool ActiveMessenger::prepareActiveMsgToRun(
   }
 
   if (has_handler) {
-    runnable::makeRunnable(base, not is_term, handler, from_node)
+    auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+    runnable::makeRunnable(base, not is_term, handler, from_node, han_type)
       .withContinuation(cont)
       .withTag(tag)
       .withTDEpochFromMsg(is_term)

src/vt/objgroup/manager.static.h

@@ -66,8 +66,9 @@ void send(MsgSharedPtr<MsgT> msg, HandlerType han, NodeType dest_node) {
     auto holder = detail::getHolderBase(han);
     auto const& elm_id = holder->getElmID();
     auto stats = &holder->getStats();
+    auto han_type = auto_registry::RegistryTypeEnum::RegObjGroup;
 
-    runnable::makeRunnable(msg, true, han, this_node)
+    runnable::makeRunnable(msg, true, han, this_node, han_type)
       .withTDEpoch(cur_epoch)
       .withLBStats(stats, elm_id)
       .enqueue();
@@ -87,7 +88,8 @@ void invoke(messaging::MsgPtrThief<MsgT> msg, HandlerType han, NodeType dest_nod
   );
 
   // this is a local invocation.. no thread required
-  runnable::makeRunnable(msg.msg_, false, han, this_node)
+  auto han_type = auto_registry::RegistryTypeEnum::RegObjGroup;
+  runnable::makeRunnable(msg.msg_, false, han, this_node, han_type)
     .withTDEpochFromMsg()
     .run();
 }

src/vt/pipe/callback/handler_send/callback_send.impl.h

@@ -110,7 +110,8 @@ CallbackSend<MsgT>::triggerDispatch(SignalDataType* data, PipeType const& pid) {
   if (this_node == send_node_) {
     auto msg = reinterpret_cast<ShortMessage*>(data);
     auto m = promoteMsg(msg);
-    runnable::makeRunnable(m, true, handler_, this_node)
+    auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+    runnable::makeRunnable(m, true, handler_, this_node, han_type)
       .withTDEpochFromMsg()
       .enqueue();
   } else {

src/vt/pipe/callback/handler_send/callback_send_tl.impl.h

@@ -71,7 +71,8 @@ void CallbackSendTypeless::trigger(MsgT* msg, PipeType const& pipe) {
   );
   auto pmsg = promoteMsg(msg);
   if (this_node == send_node_) {
-    runnable::makeRunnable(pmsg, true, handler_, this_node)
+    auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+    runnable::makeRunnable(pmsg, true, handler_, this_node, han_type)
       .withTDEpochFromMsg()
       .enqueue();
   } else {

src/vt/runnable/make_runnable.h

@@ -313,19 +313,19 @@ struct RunnableMaker {
  * \param[in] is_threaded whether it is threaded
  * \param[in] handler the handler bits
  * \param[in] from the node that caused this runnable to execute
- * \param[in] han_type the type of handler (default RegGeneral)
+ * \param[in] han_type the type of handler
  *
  * \return the maker for further customization
  */
 template <typename U>
 RunnableMaker<U> makeRunnable(
   MsgSharedPtr<U> const& msg, bool is_threaded, HandlerType handler,
-  NodeType from, auto_registry::RegistryTypeEnum han_type =
-  auto_registry::RegistryTypeEnum::RegGeneral
+  NodeType from, auto_registry::RegistryTypeEnum han_type
 ) {
   auto r = std::make_unique<RunnableNew>(msg, is_threaded);
   if (han_type == auto_registry::RegistryTypeEnum::RegVrt or
-      han_type == auto_registry::RegistryTypeEnum::RegGeneral) {
+      han_type == auto_registry::RegistryTypeEnum::RegGeneral or
+      han_type == auto_registry::RegistryTypeEnum::RegObjGroup) {
     r->template addContext<ctx::Trace>(msg, handler, from, han_type);
   }
   r->template addContext<ctx::FromNode>(from);
@@ -339,15 +339,14 @@ RunnableMaker<U> makeRunnable(
  * \param[in] is_threaded whether it is threaded
  * \param[in] handler the handler bits
  * \param[in] from the node that caused this runnable to execute
- * \param[in] han_type the type of handler (default RegGeneral)
  *
  * \return the maker for further customization
  */
 inline RunnableMaker<BaseMsgType> makeRunnableVoid(
-  bool is_threaded, HandlerType handler,
-  NodeType from, auto_registry::RegistryTypeEnum han_type =
-  auto_registry::RegistryTypeEnum::RegGeneral
+  bool is_threaded, HandlerType handler, NodeType from
 ) {
+  // These are currently only types of registry entries that can be void
+  auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
   auto r = std::make_unique<RunnableNew>(is_threaded);
   // @todo: figure out how to trace this?
   r->template addContext<ctx::FromNode>(from);

src/vt/serialization/messaging/serialized_messenger.impl.h

@@ -88,7 +88,8 @@ template <typename UserMsgT>
   auto msg_data = ptr_offset;
   auto user_msg = deserializeFullMessage<UserMsgT>(msg_data);
 
-  runnable::makeRunnable(user_msg, true, handler, sys_msg->from_node)
+  auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+  runnable::makeRunnable(user_msg, true, handler, sys_msg->from_node, han_type)
     .withTDEpochFromMsg()
     .enqueue();
 }
@@ -132,7 +133,8 @@ template <typename UserMsgT>
         handler, recv_tag, envelopeGetEpoch(msg->env)
       );
 
-      runnable::makeRunnable(msg, true, handler, node)
+      auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+      runnable::makeRunnable(msg, true, handler, node, han_type)
         .withTDEpoch(epoch, not is_valid_epoch)
         .withContinuation(action)
         .enqueue();
@@ -174,7 +176,8 @@ template <typename UserMsgT, typename BaseEagerMsgT>
     print_ptr(user_msg.get()), envelopeGetEpoch(sys_msg->env)
   );
 
-  runnable::makeRunnable(user_msg, true, handler, sys_msg->from_node)
+  auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+  runnable::makeRunnable(user_msg, true, handler, sys_msg->from_node, han_type)
     .withTDEpochFromMsg()
     .enqueue();
 }
@@ -407,7 +410,8 @@ template <typename MsgT, typename BaseT>
 
         auto base_msg = msg.template to<BaseMsgType>();
         return messaging::PendingSend(base_msg, [=](MsgPtr<BaseMsgType> in){
-          runnable::makeRunnable(msg, true, typed_handler, node)
+          auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+          runnable::makeRunnable(msg, true, typed_handler, node, han_type)
             .withTDEpochFromMsg()
             .enqueue();
         });

src/vt/topos/location/location.impl.h

@@ -538,7 +538,8 @@ void EntityLocationCoord<EntityID>::routeMsgNode(
           hid, from, handler, envelopeGetRef(msg->env)
         );
 
-        runnable::makeRunnable(msg, true, handler, from)
+        auto han_type = auto_registry::RegistryTypeEnum::RegGeneral;
+        runnable::makeRunnable(msg, true, handler, from, han_type)
           .withTDEpochFromMsg()
           .run();
       } else {