hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Zim: Fix threads synchronization while full-text indexing

Browse source
This commit is contained in:
Abs62 2018-03-08 16:32:05 +03:00
parent d3d978e7c9
commit b30dc0f1a5
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zim.cc
View file

@ -985,6 +985,8 @@ void ZimDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
{ {
if( Qt4x5::AtomicInt::loadAcquire( isCancelled ) ) if( Qt4x5::AtomicInt::loadAcquire( isCancelled ) )
throw exUserAbort(); throw exUserAbort();
Mutex::Lock _( zimMutex );
offsetsWithClusters.append( QPair< uint32_t, quint32 >( getArticleCluster( df, *it ), *it ) ); offsetsWithClusters.append( QPair< uint32_t, quint32 >( getArticleCluster( df, *it ), *it ) );
} }
@ -1096,6 +1098,8 @@ void ZimDictionary::sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets,
{ {
if( Qt4x5::AtomicInt::loadAcquire( isCancelled ) ) if( Qt4x5::AtomicInt::loadAcquire( isCancelled ) )
return; return;
Mutex::Lock _( zimMutex );
offsetsWithClusters.append( QPair< uint32_t, quint32 >( getArticleCluster( df, *it ), *it ) ); offsetsWithClusters.append( QPair< uint32_t, quint32 >( getArticleCluster( df, *it ), *it ) );
} }