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

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

View File

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

View File

@ -36,7 +36,8 @@ class NfsConnection;
* thread, and method Run() waits for completion.
*/
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;
Cond cond;
@ -61,7 +62,7 @@ private:
bool LockWaitFinished() {
const ScopeLock protect(mutex);
while (!finished)
if (!cond.timed_wait(mutex, timeout_ms))
if (!cond.timed_wait(mutex, timeout))
return false;
return true;

View File

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