Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Oct 22, 2024 · ea449dc · ea449dc
2 parents 00cb373 + bd5e926
commit ea449dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/system/include/platform.h b/system/include/platform.h
@@ -493,7 +493,7 @@ typedef unsigned __int64 hash64_t;
 typedef unsigned __int64 __uint64;
 typedef __uint64 offset_t;
 typedef unsigned char byte;
-typedef __int64 cycle_t;
+typedef __uint64 cycle_t;                 // This must be unsigned to avoid integer overflow issues when subtracting
 typedef unsigned __int64 timestamp_type;
 
 // BUILD_TAG not needed here anymore - defined in build_tag.h

diff --git a/system/jlib/jdebug.cpp b/system/jlib/jdebug.cpp
@@ -502,8 +502,8 @@ class TimeSectionInfo : public MappingBase
     unsigned getCount() const { return count; }
 
     StringAttr  scope;
-    __int64 totalcycles;
-    __int64 maxcycles;
+    cycle_t totalcycles;
+    cycle_t maxcycles;
     unsigned count;
 };