#include <boost/noncopyable.hpp>
#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
+#include <boost/thread/condition_variable.hpp>
namespace caspar {
{
mutable boost::mutex mutex_;
unsigned int permits_;
- boost::condition_variable permits_available_;
+ boost::condition_variable_any permits_available_;
public:
/**
* Constructor.
*
* @param permits The initial number of permits.
*/
- semaphore(unsigned int permits)
+ explicit semaphore(unsigned int permits)
: permits_(permits)
{
}
*/
void release()
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
++permits_;
*/
void release(unsigned int permits)
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
permits_ += permits;
*/
void acquire()
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
while (permits_ == 0u)
{
*/
void acquire(unsigned int permits)
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
auto num_acquired = 0u;
- while (permits_ == 0u && num_acquired < permits)
+ while (true)
{
+ auto num_wanted = permits - num_acquired;
+ auto to_drain = std::min(num_wanted, permits_);
+
+ permits_ -= to_drain;
+ num_acquired += to_drain;
+
+ if (num_acquired == permits)
+ break;
+
permits_available_.wait(lock);
+ }
+ }
+
+ /**
+ * Acquire a number of permits. Will block until the given number of
+ * permits has been acquired if not enough permits are currently available
+ * or the timeout has passed.
+ *
+ * @param permits The number of permits to acquire.
+ * @param timeout The timeout (will be used for each permit).
+ *
+ * @return whether successfully acquired within timeout or not.
+ */
+ template <typename Rep, typename Period>
+ bool try_acquire(unsigned int permits, const boost::chrono::duration<Rep, Period>& timeout)
+ {
+ boost::unique_lock<boost::mutex> lock(mutex_);
+ auto num_acquired = 0u;
+ while (true)
+ {
auto num_wanted = permits - num_acquired;
auto to_drain = std::min(num_wanted, permits_);
permits_ -= to_drain;
num_acquired += to_drain;
+
+ if (num_acquired == permits)
+ break;
+
+ if (permits_available_.wait_for(lock, timeout) == boost::cv_status::timeout)
+ {
+ lock.unlock();
+ release(num_acquired);
+ return false;
+ }
}
+
+ return true;
}
/**
*/
bool try_acquire()
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
if (permits_ == 0u)
return false;
*/
unsigned int permits() const
{
- boost::mutex::scoped_lock lock(mutex_);
+ boost::unique_lock<boost::mutex> lock(mutex_);
return permits_;
}