#2389: trace: handle recursive invoke case outside scheduler

Author: lifflander

src/vt/context/runnable_context/trace.cc

@@ -71,8 +71,9 @@ void Trace::start(TimeType time) {
   }
 
   // If our scheduler depth is zero, we need to end the between scheduler event
-  if (theSched()->getSchedulerDepth() == 0) {
+  if (theSched()->getSchedulerDepth() == 0 and not theTrace()->inInvokeContext()) {
     at_sched_depth_zero_ = true;
+    theTrace()->setInInvokeContext(true);
     theTrace()->beginSchedulerLoop();
   }
 
@@ -102,6 +103,7 @@ void Trace::finish(TimeType time) {
 
   if (at_sched_depth_zero_) {
     theTrace()->endSchedulerLoop();
+    theTrace()->setInInvokeContext(false);
   }
 }
 

src/vt/trace/trace.h

@@ -361,6 +361,22 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
    */
   bool inIdleEvent() const;
 
+  /**
+   * \brief Set if we are inside an invoke context
+   *
+   * \param[in] set the variable value to set
+   */
+  void setInInvokeContext(bool set) {
+    inside_invoke_context_ = set;
+  }
+
+  /**
+   * \brief Return if we are inside an invoke context
+   *
+   * \return whether we are inside an invoke context
+   */
+  bool inInvokeContext() const { return inside_invoke_context_; }
+
   friend void insertNewUserEvent(UserEventIDType event, std::string const& name);
 
   template <typename SerializerT>
@@ -385,7 +401,8 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
       | trace_enabled_cur_phase_
       | flush_event_
       | between_sched_event_type_
-      | between_sched_event_;
+      | between_sched_event_
+      | inside_invoke_context_;
 
     s.skip(log_file_); // definition unavailable
   }
@@ -398,15 +415,12 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
   int incremental_flush_mode = 0;
 
 private:
-
-
   ObjGroupProxyType spec_proxy_ = vt::no_obj_group;
 
-
-
   // Processing event between top-level loops.
   TraceEntryIDType between_sched_event_type_ = no_trace_entry_id;
   TraceProcessingTag between_sched_event_;
+  bool inside_invoke_context_ = false;
 };
 
 }} //end namespace vt::trace