Updated subproject glyphcache_bench: enabled FONT_LOCAL_GLYPH_CACHE_GUARD & FONT_GLYPH_CACHE_GUARD

in all cache implementation, enabled global cache refresh in experimental cache based
on hash table, so that the performance comparison is correct.

Author: virxkane

crengine/Tools/glyphcache_bench/lvfontglyphcache_a.cpp

@@ -15,11 +15,11 @@
 // This file contains copy of class LVFontLocalGlyphCacheA from cr3.2.31
 
 #include "lvfontglyphcache_a.h"
-//#include "../../include/crlocks.h"
+#include "../../include/crlocks.h"
 
 
 void LVFontLocalGlyphCacheA::clear() {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     while (head) {
         LVFontGlyphCacheItemA *ptr = head;
         remove(ptr);
@@ -29,7 +29,7 @@ void LVFontLocalGlyphCacheA::clear() {
 }
 
 LVFontGlyphCacheItemA *LVFontLocalGlyphCacheA::getByChar(lChar16 ch) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     LVFontGlyphCacheItemA *ptr = head;
     for (; ptr; ptr = ptr->next_local) {
         if (ptr->data.ch == ch) {
@@ -43,7 +43,7 @@ LVFontGlyphCacheItemA *LVFontLocalGlyphCacheA::getByChar(lChar16 ch) {
 #if USE_HARFBUZZ==1
 LVFontGlyphCacheItemA* LVFontLocalGlyphCacheA::getByIndex(lUInt32 index)
 {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     LVFontGlyphCacheItemA *ptr = head;
     for (; ptr; ptr = ptr->next_local) {
         if (ptr->data.gindex == index) {
@@ -56,7 +56,7 @@ LVFontGlyphCacheItemA* LVFontLocalGlyphCacheA::getByIndex(lUInt32 index)
 #endif
 
 void LVFontLocalGlyphCacheA::put(LVFontGlyphCacheItemA *item) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     global_cache->put(item);
     item->next_local = head;
     if (head)
@@ -68,7 +68,7 @@ void LVFontLocalGlyphCacheA::put(LVFontGlyphCacheItemA *item) {
 
 /// remove from list, but don't delete
 void LVFontLocalGlyphCacheA::remove(LVFontGlyphCacheItemA *item) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     if (item == head)
         head = item->next_local;
     if (item == tail)
@@ -84,7 +84,7 @@ void LVFontLocalGlyphCacheA::remove(LVFontGlyphCacheItemA *item) {
 }
 
 void LVFontGlobalGlyphCacheA::refresh(LVFontGlyphCacheItemA *item) {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     if (tail != item) {
         //move to head
         removeNoLock(item);
@@ -93,7 +93,7 @@ void LVFontGlobalGlyphCacheA::refresh(LVFontGlyphCacheItemA *item) {
 }
 
 void LVFontGlobalGlyphCacheA::put(LVFontGlyphCacheItemA *item) {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     putNoLock(item);
 }
 
@@ -119,7 +119,7 @@ void LVFontGlobalGlyphCacheA::putNoLock(LVFontGlyphCacheItemA *item) {
 }
 
 void LVFontGlobalGlyphCacheA::remove(LVFontGlyphCacheItemA *item) {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     removeNoLock(item);
 }
 
@@ -140,7 +140,7 @@ void LVFontGlobalGlyphCacheA::removeNoLock(LVFontGlyphCacheItemA *item) {
 }
 
 void LVFontGlobalGlyphCacheA::clear() {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     while (head) {
         LVFontGlyphCacheItemA *ptr = head;
         remove(ptr);

crengine/Tools/glyphcache_bench/lvfontglyphcache_b.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "lvfontglyphcache_b.h"
-//#include "../../include/crlocks.h"
+#include "../../include/crlocks.h"
 #include <stdio.h>
 
 
@@ -28,7 +28,7 @@ inline bool operator==(GlyphCacheItemData data1, GlyphCacheItemData data2)
 }
 
 void LVFontLocalGlyphCacheB::clear() {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     int count = 0;
     LVHashTable<GlyphCacheItemData, struct LVFontGlyphCacheItemB*>::iterator it = hashTable.forwardIterator();
     LVHashTable<GlyphCacheItemData, struct LVFontGlyphCacheItemB*>::pair* pair;
@@ -43,12 +43,13 @@ void LVFontLocalGlyphCacheB::clear() {
 }
 
 LVFontGlyphCacheItemB *LVFontLocalGlyphCacheB::getByChar(lChar16 ch) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     LVFontGlyphCacheItemB *ptr = 0;
     GlyphCacheItemData data;
     data.ch = ch;
     if (hashTable.get(data, ptr))
     {
+        global_cache->refresh(ptr);
         return ptr;
     }
     return NULL;
@@ -57,32 +58,42 @@ LVFontGlyphCacheItemB *LVFontLocalGlyphCacheB::getByChar(lChar16 ch) {
 #if USE_HARFBUZZ==1
 LVFontGlyphCacheItemB* LVFontLocalGlyphCacheB::getByIndex(lUInt32 index)
 {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     LVFontGlyphCacheItemB *ptr = 0;
     GlyphCacheItemData data;
     data.gindex = index;
     if (hashTable.get(data, ptr))
     {
+        global_cache->refresh(ptr);
         return ptr;
     }
     return NULL;
 }
 #endif
 
 void LVFontLocalGlyphCacheB::put(LVFontGlyphCacheItemB *item) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     global_cache->put(item);
     hashTable.set(item->data, item);
 }
 
 /// remove hash table, but don't delete
 void LVFontLocalGlyphCacheB::remove(LVFontGlyphCacheItemB *item) {
-    //FONT_LOCAL_GLYPH_CACHE_GUARD
+    FONT_LOCAL_GLYPH_CACHE_GUARD
     hashTable.remove(item->data);
 }
 
+void LVFontGlobalGlyphCacheB::refresh(LVFontGlyphCacheItemB *item) {
+    FONT_GLYPH_CACHE_GUARD
+    if (tail != item) {
+        //move to head
+        removeNoLock(item);
+        putNoLock(item);
+    }
+}
+
 void LVFontGlobalGlyphCacheB::put(LVFontGlyphCacheItemB *item) {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     putNoLock(item);
 }
 
@@ -108,7 +119,7 @@ void LVFontGlobalGlyphCacheB::putNoLock(LVFontGlyphCacheItemB *item) {
 }
 
 void LVFontGlobalGlyphCacheB::remove(LVFontGlyphCacheItemB *item) {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     removeNoLock(item);
 }
 
@@ -129,7 +140,7 @@ void LVFontGlobalGlyphCacheB::removeNoLock(LVFontGlyphCacheItemB *item) {
 }
 
 void LVFontGlobalGlyphCacheB::clear() {
-    //FONT_GLYPH_CACHE_GUARD
+    FONT_GLYPH_CACHE_GUARD
     int count = 0;
     while (head) {
         LVFontGlyphCacheItemB *ptr = head;

crengine/Tools/glyphcache_bench/lvfontglyphcache_b.h

@@ -53,6 +53,8 @@ class LVFontGlobalGlyphCacheB {
 
 	void remove(LVFontGlyphCacheItemB *item);
 
+	void refresh(LVFontGlyphCacheItemB *item);
+
 	void clear();
 
 	int getSize() { return size; }

crengine/Tools/glyphcache_bench/main.cpp

@@ -278,7 +278,7 @@ int main(int /*argc*/, char* /*argv*/[])
     LVFontLocalGlyphCache localCache(&globalCache);
     LVFontGlyphCacheItem* item;
 
-    uint64_t tmp;
+    volatile uint64_t tmp;
     struct timeval ts1;
     struct timeval ts2;
     int64_t elapsed;
@@ -334,7 +334,7 @@ int main(int /*argc*/, char* /*argv*/[])
     printf("t = %lld\n", tmp);
 
     // bench lookup based on hash table
-    printf("bench cache based on hash table (copy from cr3.2.32)...\n");
+    printf("bench cache based on hash table (candidate introduced in cr3.2.32)...\n");
     gettimeofday(&ts1, NULL);
     for (j = 0; j < bench_sz; j++)
     {