Merge pull request #17789 from ghalliday/issue30308

HPCC-30308 Remove unnecessary atomics cacheAdds and cacheHits Reviewed-By: Richard Chapman <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 4, 2023 · b63ec78 · b63ec78
2 parents 8b3ec0a + f6c5723
commit b63ec78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/roxie/ccd/ccdsnmp.cpp b/roxie/ccd/ccdsnmp.cpp
@@ -296,8 +296,6 @@ CRoxieMetricsManager::CRoxieMetricsManager()
     addMetric(restarts, 0);
 
     addMetric(nodesLoaded, 1000);
-    addMetric(cacheHits, 1000);
-    addMetric(cacheAdds, 1000);
 
     addMetric(blobCacheHits, 1000);
     addMetric(blobCacheAdds, 1000);

diff --git a/system/jhtree/jhtree.cpp b/system/jhtree/jhtree.cpp
@@ -2632,7 +2632,6 @@ const CJHTreeNode *CNodeCache::getNode(const INodeLoader *keyIndex, unsigned iD,
                 block.leave();
 
                 //Update any stats outside of the critical section.
-                cacheHits++;
                 (*hitMetric[cacheType])++;
                 if (ctx) ctx->noteStatistic(hitStatId[cacheType], 1);
                 return fastPathMatch;
@@ -2658,13 +2657,11 @@ const CJHTreeNode *CNodeCache::getNode(const INodeLoader *keyIndex, unsigned iD,
         //Move the atomic increments out of the critical section - they can be relatively expensive
         if (likely(alreadyExists))
         {
-            cacheHits++;
             if (ctx) ctx->noteStatistic(hitStatId[cacheType], 1);
             (*hitMetric[cacheType])++;
         }
         else
         {
-            cacheAdds++;
             if (ctx) ctx->noteStatistic(addStatId[cacheType], 1);
             (*addMetric[cacheType])++;
         }
@@ -2756,8 +2753,6 @@ const CJHTreeNode *CNodeCache::getNode(const INodeLoader *keyIndex, unsigned iD,
     }
 }
 
-RelaxedAtomic<unsigned> cacheAdds;
-RelaxedAtomic<unsigned> cacheHits;
 RelaxedAtomic<unsigned> nodesLoaded;
 RelaxedAtomic<unsigned> blobCacheHits;
 RelaxedAtomic<unsigned> blobCacheAdds;
@@ -2771,8 +2766,6 @@ RelaxedAtomic<unsigned> nodeCacheDups;
 
 void clearNodeStats()
 {
-    cacheAdds.store(0);
-    cacheHits.store(0);
     nodesLoaded.store(0);
     blobCacheHits.store(0);
     blobCacheAdds.store(0);

diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp
@@ -1793,7 +1793,9 @@ void CJobSlave::endJob()
 void CJobSlave::reportGraphEnd(graph_id gid)
 {
     if (nodesLoaded) // wouldn't mean much if parallel jobs running
-        PROGLOG("Graph[%" GIDPF "u] - JHTree node stats:\ncacheAdds=%d\ncacheHits=%d\nnodesLoaded=%d\nblobCacheHits=%d\nblobCacheAdds=%d\nleafCacheHits=%d\nleafCacheAdds=%d\nnodeCacheHits=%d\nnodeCacheAdds=%d\n", gid, cacheAdds.load(), cacheHits.load(), nodesLoaded.load(), blobCacheHits.load(), blobCacheAdds.load(), leafCacheHits.load(), leafCacheAdds.load(), nodeCacheHits.load(), nodeCacheAdds.load());
+        PROGLOG("Graph[%" GIDPF "u] - JHTree node stats:\ncacheAdds=%d\ncacheHits=%d\nnodesLoaded=%d\nblobCacheHits=%d\nblobCacheAdds=%d\nleafCacheHits=%d\nleafCacheAdds=%d\nnodeCacheHits=%d\nnodeCacheAdds=%d\n",
+             gid, blobCacheAdds + leafCacheAdds + nodeCacheAdds, blobCacheHits + leafCacheHits + nodeCacheHits,
+             nodesLoaded.load(), blobCacheHits.load(), blobCacheAdds.load(), leafCacheHits.load(), leafCacheAdds.load(), nodeCacheHits.load(), nodeCacheAdds.load());
     if (!REJECTLOG(MCthorDetailedDebugInfo))
     {        
         JSocketStatistics stats;