[MERGE #5507 @VSadov] Always reduce count when removing items from SimpleHashTable

VSadov · VSadov · commit 693bb72161a3 · 2018-07-24T10:02:24.000-07:00
Merge pull request #5507 from VSadov:SimpleHash In particlar `MapAndRemoveIf` used to not reduce `count`. That could cause the table to be larger than necessary in the long term. It was also inflating the count of pinned references as reported in OOM postmotems. Fixes: OS: #18369725
diff --git a/lib/Common/DataStructures/SimpleHashTable.h b/lib/Common/DataStructures/SimpleHashTable.h
@@ -149,7 +149,6 @@ class SimpleHashTable
                     (*pOut) = current->value;
                 }
 
-                count--;
                 FreeEntry(current);
 #if PROFILE_DICTIONARY
                 if (stats)
@@ -308,6 +307,7 @@ class SimpleHashTable
 
     void FreeEntry(EntryType* current)
     {
+        count--;
         if ( freecount < 10 )
         {
             current->key = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,6 @@ class SimpleHashTable`
`149`	`149`	`(*pOut) = current->value;`
`150`	`150`	`}`
`151`	`151`
`152`		`- count--;`
`153`	`152`	`FreeEntry(current);`
`154`	`153`	`#if PROFILE_DICTIONARY`
`155`	`154`	`if (stats)`
`@@ -308,6 +307,7 @@ class SimpleHashTable`
`308`	`307`
`309`	`308`	`void FreeEntry(EntryType* current)`
`310`	`309`	`{`
	`310`	`+ count--;`
`311`	`311`	`if ( freecount < 10 )`
`312`	`312`	`{`
`313`	`313`	`current->key = nullptr;`