oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/nfs/Blocking, neighbor/smbclient: pass std::chrono::duration to Cond::timed_wait()

Browse Source
This commit is contained in:
Max Kellermann 2016-12-29 11:37:18 +01:00
parent 837134daef
commit 7ec707927d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/nfs/Blocking.cxx
View File

@ -22,6 +22,8 @@
#include "Connection.hxx" #include "Connection.hxx"
#include "event/Call.hxx" #include "event/Call.hxx"
constexpr std::chrono::steady_clock::duration BlockingNfsOperation::timeout;
void void
BlockingNfsOperation::Run() BlockingNfsOperation::Run()
{ {

5
src/lib/nfs/Blocking.hxx
View File

@ -36,7 +36,8 @@ class NfsConnection;
* thread, and method Run() waits for completion. * thread, and method Run() waits for completion.
*/ */
class BlockingNfsOperation : protected NfsCallback, NfsLease { class BlockingNfsOperation : protected NfsCallback, NfsLease {
static constexpr unsigned timeout_ms = 60000; static constexpr std::chrono::steady_clock::duration timeout =
std::chrono::minutes(1);
Mutex mutex; Mutex mutex;
Cond cond; Cond cond;
@ -61,7 +62,7 @@ private:
bool LockWaitFinished() { bool LockWaitFinished() {
const ScopeLock protect(mutex); const ScopeLock protect(mutex);
while (!finished) while (!finished)
if (!cond.timed_wait(mutex, timeout_ms)) if (!cond.timed_wait(mutex, timeout))
return false; return false;
return true; return true;

2
src/neighbor/plugins/SmbclientNeighborPlugin.cxx
View File

@ -251,7 +251,7 @@ SmbclientNeighborExplorer::ThreadFunc()
break; break;
// TODO: sleep for how long? // TODO: sleep for how long?
cond.timed_wait(mutex, 10000); cond.timed_wait(mutex, std::chrono::seconds(10));
} }
mutex.unlock(); mutex.unlock();