Merge remote-tracking branch 'upstream/cr3.2.33-fixes'

Author: plotn

android/src/org/coolreader/crengine/ReaderView.java

@@ -3829,6 +3829,8 @@ private BitmapInfo preparePageImage(int offset) {
 			return currentImageViewer.prepareImage();
 
 		PositionProperties currpos = doc.getPositionProps(null);
+		if (null == currpos)
+			return null;
 
 		boolean isPageView = currpos.pageMode!=0;
 

crengine/Tools/glyphcache_bench/CMakeLists.txt

@@ -5,12 +5,22 @@ set(SRC_LIST
     lvfontglyphcache_b.cpp
 )
 
+set(crengine_part_SRC_LIST
+    ../../src/crconcurrent.cpp
+    ../../src/lvstring.cpp
+    ../../src/lvmemman.cpp
+    ../../src/lvstream.cpp
+    ../../src/crtxtenc.cpp
+    ../../src/cp_stats.cpp
+    ../../src/private/lvfontglyphcache.cpp
+)
+
 if(WIN32)
     add_definitions(-DWIN32 -D_CONSOLE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mconsole")
 endif(WIN32)
 
-add_executable(glyphcache_bench ${SRC_LIST})
-#target_link_libraries(glyphcache_bench)
+add_executable(glyphcache_bench ${SRC_LIST} ${crengine_part_SRC_LIST})
+target_link_libraries(glyphcache_bench ${ZLIB_LIBRARIES})
 
 configure_file(valgrind_check.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/valgrind_check.sh)

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

@@ -1,9 +1,11 @@
 
 #include "lvfontglyphcache_a.h"
 #include "lvfontglyphcache_b.h"
+#include "../../src/private/lvfontglyphcache.h"
 #include "lvtypes.h"
 
 #include <stdio.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <limits.h>
 
@@ -271,7 +273,12 @@ int main(int /*argc*/, char* /*argv*/[])
     LVFontGlobalGlyphCacheB globalCacheB(0x40000);
     LVFontLocalGlyphCacheB localCacheB(&globalCacheB, 256);
     LVFontGlyphCacheItemB* itemB;
-    u_int64_t tmp;
+
+    LVFontGlobalGlyphCache globalCache(0x40000);
+    LVFontLocalGlyphCache localCache(&globalCache);
+    LVFontGlyphCacheItem* item;
+
+    volatile uint64_t tmp;
     struct timeval ts1;
     struct timeval ts2;
     int64_t elapsed;
@@ -296,10 +303,18 @@ int main(int /*argc*/, char* /*argv*/[])
             itemB->origin_y = 0;
             localCacheB.put(itemB);
         }
+        item = LVFontGlyphCacheItem::newItem(&localCache, glyphCodes_tofill[i], 10, 10);
+        if (item)
+        {
+            item->origin_x = 0;
+            item->origin_y = 0;
+            localCache.put(item);
+        }
     }
 
     printf("size of global cacheA: %u\n", globalCacheA.getSize());
     printf("size of global cacheB: %u\n", globalCacheB.getSize());
+    printf("size of global cache: no data...\n");
 
     // bench lookup based on linked list
     printf("bench cache based on linked list...\n");
@@ -319,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...\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++)
     {
@@ -334,9 +349,26 @@ int main(int /*argc*/, char* /*argv*/[])
     printf("%lld us\n", elapsed);
     printf("t = %lld\n", tmp);
 
+    // bench lookup based on hash table
+    printf("bench cache based on hash table (current version)...\n");
+    gettimeofday(&ts1, NULL);
+    for (j = 0; j < bench_sz; j++)
+    {
+        for (i = 0; i < lookup_seq_sz; i++)
+        {
+            item = localCache.get(lookup_seq[i]);
+            tmp += item->origin_x;
+        }
+    }
+    gettimeofday(&ts2, NULL);
+    elapsed = timevalcmp(&ts2, &ts1);
+    printf("%lld us\n", elapsed);
+    printf("t = %lld\n", tmp);
+
     // cleanup
     globalCacheA.clear();
     globalCacheB.clear();
+    globalCache.clear();
     return 0;
 }
 

crengine/src/lvtinydom.cpp

@@ -11476,8 +11476,8 @@ ldomNode * ldomNode::persist()
         } else {
             // TEXT->PTEXT
             lString8 utf8 = _data._text_ptr->getText();
-            delete _data._text_ptr;
             lUInt32 parentIndex = _data._text_ptr->getParentIndex();
+            delete _data._text_ptr;
             _handle._dataIndex = (_handle._dataIndex & ~0xF) | NT_PTEXT;
             _data._ptext_addr = getDocument()->_textStorage.allocText(_handle._dataIndex, parentIndex, utf8 );
             // change type

tinydict/tinydict.cpp

@@ -604,9 +604,9 @@ TinyDictZStream::~TinyDictZStream()
     if ( unp_buffer )
         free( unp_buffer );
     if ( chunks )
-        delete chunks;
+        delete [] chunks;
     if ( offsets )
-        delete offsets;
+        delete [] offsets;
 }
 
 bool TinyDictZStream::open( FILE * file )