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

epwing:replace qthreadpool with qtconcurrent

Browse source
This commit is contained in:
Xiao YiFang 2023-04-08 12:13:41 +08:00 committed by xiaoyifang
parent f69f248c00
commit 4ffff72698
1 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
epwing.cc
View file

@ -843,8 +843,8 @@ void EpwingArticleRequest::getBuiltInArticle( wstring const & word_,
void EpwingDictionary::getHeadwordPos( wstring const & word_, QVector< int > & pg, QVector< int > & off )
{
try {
Mutex::Lock _( eBook.getLibMutex() );
eBook.getArticlePos( gd::toQString( word_ ), pg, off );
Mutex::Lock _( eBook.getLibMutex() );
eBook.getArticlePos( gd::toQString( word_ ), pg, off );
}
catch ( ... ) {
//ignore
@ -862,69 +862,37 @@ sptr< Dictionary::DataRequest > EpwingDictionary::getArticle( wstring const & wo
//// EpwingDictionary::getResource()
class EpwingResourceRequest;
class EpwingResourceRequestRunnable: public QRunnable
{
EpwingResourceRequest & r;
QSemaphore & hasExited;
public:
EpwingResourceRequestRunnable( EpwingResourceRequest & r_,
QSemaphore & hasExited_ ): r( r_ ),
hasExited( hasExited_ )
{}
~EpwingResourceRequestRunnable()
{
hasExited.release();
}
void run() override;
};
class EpwingResourceRequest: public Dictionary::DataRequest
{
friend class EpwingResourceRequestRunnable;
EpwingDictionary & dict;
string resourceName;
QAtomicInt isCancelled;
QSemaphore hasExited;
QFuture< void > f;
public:
EpwingResourceRequest( EpwingDictionary & dict_,
string const & resourceName_ ):
EpwingResourceRequest( EpwingDictionary & dict_, string const & resourceName_ ):
dict( dict_ ),
resourceName( resourceName_ )
{
QThreadPool::globalInstance()->start(
new EpwingResourceRequestRunnable( *this, hasExited ) );
f = QtConcurrent::run( [ this ]() {
this->run();
} );
}
void run(); // Run from another thread by EpwingResourceRequestRunnable
void cancel() override
{
isCancelled.ref();
}
void cancel() override { isCancelled.ref(); }
~EpwingResourceRequest()
{
isCancelled.ref();
hasExited.acquire();
f.waitForFinished();
}
};
void EpwingResourceRequestRunnable::run()
{
r.run();
}
void EpwingResourceRequest::run()
{
// Some runnables linger enough that they are cancelled before they start