Merge pull request #19259 from shamser/issue32928

HPCC-32928 Capture and report start timings for stranded activities Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Nov 18, 2024 · 185486e · 185486e
2 parents ccdd99c + 47c4e05
commit 185486e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp
@@ -732,6 +732,7 @@ void CThorStrandedActivity::strandedStop()
 //For some reason gcc doesn't let you specify a function as pure virtual and define it at the same time.
 void CThorStrandedActivity::start()
 {
+    SimpleActivityTimer t(startCycles, timeActivities);
     CSlaveActivity::start();
     startJunction(splitter);
     onStartStrands();
@@ -855,7 +856,7 @@ IStrandJunction *CThorStrandedActivity::getOutputStreams(CActivityBase &ctx, uns
 
 unsigned __int64 CThorStrandedActivity::queryTotalCycles() const
 {
-    unsigned __int64 total = 0;;
+    unsigned __int64 total = startCycles;
     ForEachItemIn(i, strands)
     {
         CThorStrandProcessor &strand = strands.item(i);

diff --git a/thorlcr/graph/thgraphslave.hpp b/thorlcr/graph/thgraphslave.hpp
@@ -481,6 +481,7 @@ class graphslave_decl CThorStrandedActivity : public CSlaveActivity
     Owned<IStrandJunction> splitter;
     Owned<IStrandJunction> sourceJunction; // A junction applied to the output of a source activity
     std::atomic<unsigned> active;
+    unsigned __int64 startCycles = 0;
 protected:
     void onStartStrands();
 public: