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

thread/*Cond: rename methods to match std::condition_variable

Browse Source
This commit is contained in:
Max Kellermann
2019-04-25 18:33:09 +02:00
parent 5bc8cd0ecb
commit b51bae5500
25 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/thread/PosixCond.hxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2015 Max Kellermann <max.kellermann@gmail.com>
* Copyright 2009-2019 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -62,11 +62,11 @@ public:
PosixCond(const PosixCond &other) = delete;
PosixCond &operator=(const PosixCond &other) = delete;
void signal() noexcept {
void notify_one() noexcept {
pthread_cond_signal(&cond);
}
void broadcast() noexcept {
void notify_all() noexcept {
pthread_cond_broadcast(&cond);
}
@@ -75,7 +75,7 @@ public:
}
private:
bool timed_wait(PosixMutex &mutex, uint_least32_t timeout_us) noexcept {
bool wait_for(PosixMutex &mutex, uint_least32_t timeout_us) noexcept {
struct timeval now;
gettimeofday(&now, nullptr);
@@ -92,15 +92,15 @@ private:
}
public:
bool timed_wait(PosixMutex &mutex,
std::chrono::steady_clock::duration timeout) noexcept {
bool wait_for(PosixMutex &mutex,
std::chrono::steady_clock::duration timeout) noexcept {
auto timeout_us = std::chrono::duration_cast<std::chrono::microseconds>(timeout).count();
if (timeout_us < 0)
timeout_us = 0;
else if (timeout_us > std::numeric_limits<uint_least32_t>::max())
timeout_us = std::numeric_limits<uint_least32_t>::max();
return timed_wait(mutex, timeout_us);
return wait_for(mutex, timeout_us);
}
};

16
src/thread/WindowsCond.hxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2013 Max Kellermann <max.kellermann@gmail.com>
* Copyright 2009-2019 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -48,29 +48,29 @@ public:
WindowsCond(const WindowsCond &other) = delete;
WindowsCond &operator=(const WindowsCond &other) = delete;
void signal() noexcept {
void notify_one() noexcept {
WakeConditionVariable(&cond);
}
void broadcast() noexcept {
void notify_all() noexcept {
WakeAllConditionVariable(&cond);
}
private:
bool timed_wait(CriticalSection &mutex, DWORD timeout_ms) noexcept {
bool wait_for(CriticalSection &mutex, DWORD timeout_ms) noexcept {
return SleepConditionVariableCS(&cond, &mutex.critical_section,
timeout_ms);
}
public:
bool timed_wait(CriticalSection &mutex,
std::chrono::steady_clock::duration timeout) noexcept {
bool wait_for(CriticalSection &mutex,
std::chrono::steady_clock::duration timeout) noexcept {
auto timeout_ms = std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count();
return timed_wait(mutex, timeout_ms);
return wait_for(mutex, timeout_ms);
}
void wait(CriticalSection &mutex) noexcept {
timed_wait(mutex, INFINITE);
wait_for(mutex, INFINITE);
}
};