Fix performance regression on glibc on Linux (dotnet/coreclr#24099)

Commit migrated from dotnet/coreclr@0ca6b89
picenka21 · Apr 19, 2019 · 77034d8 · 77034d8
1 parent c1222d0
commit 77034d8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/coreclr/src/corefx/System.Globalization.Native/pal_collation.c b/src/coreclr/src/corefx/System.Globalization.Native/pal_collation.c
@@ -439,11 +439,15 @@ const UCollator* GetCollatorFromSortHandle(SortHandle* pSortHandle, int32_t opti
 
         TCollatorMap* map = (TCollatorMap*)malloc(sizeof(TCollatorMap));
         map->key = options;
-        void* entry = tsearch(map, &pSortHandle->collatorsPerOptionRoot, TreeComparer);
-        if ((*(TCollatorMap**)entry) == map)
+        // tfind on glibc is significantly faster than tsearch and we expect
+        // to hit the cache here often so it's benefitial to prefer lookup time
+        // over addition time
+        void* entry = tfind(map, &pSortHandle->collatorsPerOptionRoot, TreeComparer);
+        if (entry == NULL)
         {
             pCollator = CloneCollatorWithOptions(pSortHandle->regular, options, pErr);
             map->UCollator = pCollator;
+            tsearch(map, &pSortHandle->collatorsPerOptionRoot, TreeComparer);
         }
         else
         {