boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-12 12:02:54 +00:00
Code Issues Projects Releases Wiki Activity

condition uses int for state

Browse Source
This commit is contained in:
Oliver Kowalke
2013-02-23 14:41:33 +01:00
parent 8f0ba61854
commit 34b7c7b621
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/fiber/condition.hpp
View File

@@ -3,8 +3,6 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// based on boost::interprocess::sync::interprocess_condition
#ifndef BOOST_FIBERS_CONDITION_H
#define BOOST_FIBERS_CONDITION_H
@@ -38,15 +36,13 @@
# pragma warning(disable:4355 4251 4275)
# endif
#include <cstdio>
namespace boost {
namespace fibers {
class BOOST_FIBERS_DECL condition : private noncopyable
{
private:
detail::spinlock waiting_mtx_;
detail::spinlock splk_;
std::deque< detail::notify::ptr_t > waiting_;
public:
@@ -74,7 +70,7 @@ public:
if ( n)
{
// store this fiber in order to be notified later
unique_lock< detail::spinlock > lk( waiting_mtx_);
unique_lock< detail::spinlock > lk( splk_);
waiting_.push_back( n);
lt.unlock();
@@ -89,24 +85,22 @@ public:
// notifier for main-fiber
n = detail::scheduler::instance().notifier();
// store this fiber in order to be notified later
unique_lock< detail::spinlock > lk( waiting_mtx_);
unique_lock< detail::spinlock > lk( splk_);
waiting_.push_back( n);
lk.unlock();
lt.unlock();
while ( ! n->is_ready() )
{
fprintf(stdout, "condition: main-fiber not woken-up\n");
// run scheduler
detail::scheduler::instance().run();
}
fprintf(stdout, "condition: main-fiber woken-up\n");
}
}
catch (...)
{
// remove fiber from waiting_
unique_lock< detail::spinlock > lk( waiting_mtx_);
unique_lock< detail::spinlock > lk( splk_);
waiting_.erase(
std::find( waiting_.begin(), waiting_.end(), n) );
throw;

8
src/condition.cpp
View File

@@ -3,8 +3,6 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// based on boost::interprocess::sync::interprocess_condition
#define BOOST_FIBERS_SOURCE
@@ -22,7 +20,7 @@ namespace boost {
namespace fibers {
condition::condition() :
waiting_mtx_(),
splk_(),
waiting_()
{}
@@ -34,7 +32,7 @@ condition::notify_one()
{
detail::notify::ptr_t n;
unique_lock< detail::spinlock > lk( waiting_mtx_);
unique_lock< detail::spinlock > lk( splk_);
if ( ! waiting_.empty() ) {
n.swap( waiting_.front() );
waiting_.pop_front();
@@ -50,7 +48,7 @@ condition::notify_all()
{
std::deque< detail::notify::ptr_t > waiting;
unique_lock< detail::spinlock > lk( waiting_mtx_);
unique_lock< detail::spinlock > lk( splk_);
waiting.swap( waiting_);
lk.unlock();