Merge pull request hpcc-systems#19196 from ghalliday/issue32799

HPCC-32799 Minor improvements to lookahead timing code Reviewed-By: Shamser Ahmed <[email protected]> Merged-by: Gavin Halliday <[email protected]>
kenrowland · Oct 16, 2024 · 7bf4acc · 7bf4acc
2 parents 50db25e + 8783739
commit 7bf4acc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/thorlcr/activities/thactivityutil.cpp b/thorlcr/activities/thactivityutil.cpp
@@ -120,21 +120,22 @@ class CRowStreamLookAhead : public CSimpleInterfaceOf<IStartableEngineRowStream>
                 while (requiredLeft&&running)
                 {
                     OwnedConstThorRow row;
+                    bool eog = false;
                     {
                         LookAheadTimer timer(activity.getActivityTimerAccumulator(), activity.queryTimeActivities());
                         row.setown(inputStream->nextRow());
-                    }
-                    if (!row)
-                    {
+                        if (!row)
                         {
-                            LookAheadTimer timer(activity.getActivityTimerAccumulator(), activity.queryTimeActivities());
                             row.setown(inputStream->nextRow());
+                            if (!row)
+                                break;
+                            eog = true;
                         }
-                        if (!row)
-                            break;
-                        else
-                            writer->putRow(NULL); // eog
                     }
+
+                    if (unlikely(eog))
+                        writer->putRow(NULL);
+
                     ++count;
                     writer->putRow(row.getClear());
                     if (requiredLeft!=RCUNBOUND)

diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp
@@ -593,7 +593,7 @@ unsigned __int64 CSlaveActivity::queryLocalCycles() const
     const unsigned __int64 blockedCycles = queryBlockedCycles();
     if (processCycles < blockedCycles)
     {
-        IWARNLOG("CSlaveActivity::queryLocalCycles - processCycles %" I64F "u < blockedCycles %" I64F "u", processCycles, blockedCycles);
+        ActPrintLog("CSlaveActivity::queryLocalCycles - process %" I64F "uns < blocked %" I64F "uns", cycle_to_nanosec(processCycles), cycle_to_nanosec(blockedCycles));
         return 0;
     }
     return processCycles-blockedCycles;