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

add mutex to scopedmemmap

Browse source
This commit is contained in:
Xiao YiFang 2022-06-19 13:26:41 +08:00
parent 3c02fb7499
commit 4edd3b3987
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ftshelpers.cc
View file

@ -807,6 +807,7 @@ void FTSResultsRequest::combinedIndexSearch( BtreeIndexing::BtreeIndex & ftsInde
{
if( Utils::AtomicInt::loadAcquire( isCancelled ) )
{
Mutex::Lock _( dataMutex );
sets << tmp;
return;
}

24
mdx.cc
View file

@ -173,17 +173,23 @@ public:
return false;
}
ScopedMemMap compressed( mddFile, indexEntry.compressedBlockPos, indexEntry.compressedBlockSize );
if ( !compressed.startAddress() )
{
return false;
}
QByteArray decompressed;
if ( !MdictParser::parseCompressedBlock( indexEntry.compressedBlockSize, ( char * )compressed.startAddress(),
indexEntry.decompressedBlockSize, decompressed ) )
{
return false;
Mutex::Lock _( idxMutex );
ScopedMemMap compressed( mddFile, indexEntry.compressedBlockPos, indexEntry.compressedBlockSize );
if( !compressed.startAddress() )
{
return false;
}
if( !MdictParser::parseCompressedBlock( indexEntry.compressedBlockSize,
(char *)compressed.startAddress(),
indexEntry.decompressedBlockSize,
decompressed ) )
{
return false;
}
}
result.resize( indexEntry.recordSize );