HPCC-23947 Changes following review

Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.com>
hpcc-systems · Nov 7, 2024 · 73dd3d4 · 73dd3d4
1 parent 14ea038
commit 73dd3d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/thorlcr/activities/project/thprojectslave.cpp b/thorlcr/activities/project/thprojectslave.cpp
@@ -35,7 +35,7 @@ class CProjecStrandProcessor : public CThorStrandProcessor
     }
     STRAND_CATCH_NEXTROW()
     {
-        LookAheadTimer t(parent.slaveTimerStats, timeActivities);
+        LookAheadTimer t(slaveTimerStats, timeActivities);
         for (;;)
         {
             if (parent.queryAbortSoon())

diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp
@@ -855,7 +855,7 @@ IStrandJunction *CThorStrandedActivity::getOutputStreams(CActivityBase &ctx, uns
 
 unsigned __int64 CThorStrandedActivity::queryTotalCycles() const
 {
-    unsigned __int64 total = 0;;
+    unsigned __int64 total = 0;
     ForEachItemIn(i, strands)
     {
         CThorStrandProcessor &strand = strands.item(i);
@@ -864,6 +864,16 @@ unsigned __int64 CThorStrandedActivity::queryTotalCycles() const
     return total;
 }
 
+unsigned __int64 CThorStrandedActivity::queryLookAheadCycles() const
+{
+    unsigned __int64 total = 0;;
+    ForEachItemIn(i, strands)
+    {
+        CThorStrandProcessor &strand = strands.item(i);
+        total += strand.queryLookAheadCycles();
+    }
+    return total;
+}
 void CThorStrandedActivity::dataLinkSerialize(MemoryBuffer &mb) const
 {
     mb.append(getProgressCount());

diff --git a/thorlcr/graph/thgraphslave.hpp b/thorlcr/graph/thgraphslave.hpp
@@ -508,6 +508,7 @@ class graphslave_decl CThorStrandedActivity : public CSlaveActivity
 // IThorDataLink
     virtual IStrandJunction *getOutputStreams(CActivityBase &_ctx, unsigned idx, PointerArrayOf<IEngineRowStream> &streams, const CThorStrandOptions * consumerOptions, bool consumerOrdered, IOrderedCallbackCollection * orderedCallbacks) override;
     virtual unsigned __int64 queryTotalCycles() const override;
+    virtual unsigned __int64 queryLookAheadCycles() const override;
     virtual void dataLinkSerialize(MemoryBuffer &mb) const override;
     virtual rowcount_t getProgressCount() const override;
 };