diff --git a/thorlcr/activities/project/thprojectslave.cpp b/thorlcr/activities/project/thprojectslave.cpp index 5c9ce6ee953..7af306fa6de 100644 --- a/thorlcr/activities/project/thprojectslave.cpp +++ b/thorlcr/activities/project/thprojectslave.cpp @@ -35,7 +35,7 @@ class CProjecStrandProcessor : public CThorStrandProcessor } STRAND_CATCH_NEXTROW() { - ActivityTimer t(slaveTimerStats, timeActivities); + LookAheadTimer t(slaveTimerStats, timeActivities); for (;;) { if (parent.queryAbortSoon()) diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp index 7e31640b07d..ea8a40e297a 100644 --- 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 index 685784ddc86..d5567d2a558 100644 --- 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 &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; };