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

fix: reduce wait time on socket

Browse source
This commit is contained in:
YiFang Xiao 2023-10-13 20:18:33 +08:00
parent e8a2eadade
commit 5ec6d50167
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dict/dictserver.cc
View file

@ -62,9 +62,8 @@ bool connectToServer( QTcpSocket & socket, QString const & url, QString & errorS
return false; return false;
socket.connectToHost( serverUrl.host(), port ); socket.connectToHost( serverUrl.host(), port );
if ( socket.state() != QTcpSocket::ConnectedState ) { if ( socket.state() != QTcpSocket::ConnectedState ) {
if ( !socket.waitForConnected( 5000 ) ) if ( !socket.waitForConnected( 100 ) )
break; break;
} }
@ -335,6 +334,7 @@ void DictServerDictionary::getServerDatabases()
if ( !errorString.isEmpty() ) if ( !errorString.isEmpty() )
gdWarning( "Retrieving databases from \"%s\" fault: %s\n", getName().c_str(), errorString.toUtf8().data() ); gdWarning( "Retrieving databases from \"%s\" fault: %s\n", getName().c_str(), errorString.toUtf8().data() );
delete socket; delete socket;
socket = nullptr;
} }
class DictServerWordSearchRequest: public Dictionary::WordSearchRequest class DictServerWordSearchRequest: public Dictionary::WordSearchRequest
@ -482,7 +482,7 @@ void DictServerWordSearchRequest::run()
if ( count ) { if ( count ) {
QMutexLocker _( &dataMutex ); QMutexLocker _( &dataMutex );
for ( int x = 0; x < count; x++ ) for ( int x = 0; x < count; x++ )
matches.push_back( gd::toWString( matchesList.at( x ) ) ); matches.emplace_back( gd::toWString( matchesList.at( x ) ) );
} }
} }
} }
@ -496,6 +496,7 @@ void DictServerWordSearchRequest::run()
disconnectFromServer( *socket ); disconnectFromServer( *socket );
delete socket; delete socket;
socket = nullptr;
if ( !Utils::AtomicInt::loadAcquire( isCancelled ) ) if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
finish(); finish();
} }
@ -503,8 +504,6 @@ void DictServerWordSearchRequest::run()
void DictServerWordSearchRequest::cancel() void DictServerWordSearchRequest::cancel()
{ {
isCancelled.ref(); isCancelled.ref();
QMutexLocker _( &dataMutex );
finish(); finish();
} }
@ -793,6 +792,7 @@ void DictServerArticleRequest::run()
disconnectFromServer( *socket ); disconnectFromServer( *socket );
delete socket; delete socket;
socket = nullptr;
if ( !Utils::AtomicInt::loadAcquire( isCancelled ) ) if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
finish(); finish();
} }
@ -801,7 +801,6 @@ void DictServerArticleRequest::cancel()
{ {
isCancelled.ref(); isCancelled.ref();
QMutexLocker _( &dataMutex );
finish(); finish();
} }