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

use ws_queue in round_robin

Browse Source
This commit is contained in:
Oliver Kowalke
2013-10-24 18:42:38 +02:00
parent 98f54ad0e4
commit a77b36c413
3 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
include/boost/fiber/detail/ws_queue.hpp Normal file
View File

@@ -0,0 +1,63 @@
// Copyright Oliver Kowalke 2013.
// 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)
#ifndef BOOST_FIBERS_DETAIL_WS_QUEUE_H
#define BOOST_FIBERS_DETAIL_WS_QUEUE_H
#include <deque>
#include <boost/config.hpp>
#include <boost/thread/lock_types.hpp>
#include <boost/fiber/detail/config.hpp>
#include <boost/fiber/detail/fiber_base.hpp>
#include <boost/fiber/detail/spinlock.hpp>
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX
#endif
namespace boost {
namespace fibers {
namespace detail {
class ws_queue
{
private:
typedef std::deque< fiber_base::ptr_t > queue_t;
spinlock splk_;
queue_t queue_;
public:
ws_queue() :
splk_(),
queue_()
{}
void push( fiber_base::ptr_t const& f)
{
unique_lock< spinlock > lk( splk_);
queue_.push_back( f);
}
bool try_pop( fiber_base::ptr_t & f)
{
unique_lock< spinlock > lk( splk_);
if ( queue_.empty() ) return false;
f.swap( queue_.front() );
queue_.pop_front();
return true;
}
};
}}}
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_SUFFIX
#endif
#endif // BOOST_FIBERS_DETAIL_WS_QUEUE_H

5
include/boost/fiber/round_robin.hpp
View File

@@ -20,6 +20,7 @@
#include <boost/fiber/detail/config.hpp>
#include <boost/fiber/detail/fiber_base.hpp>
#include <boost/fiber/detail/spinlock.hpp>
#include <boost/fiber/detail/ws_queue.hpp>
#include <boost/fiber/fiber.hpp>
#ifdef BOOST_HAS_ABI_HEADERS
@@ -50,12 +51,10 @@ private:
};
typedef std::deque< schedulable > wqueue_t;
typedef std::deque< detail::fiber_base::ptr_t > rqueue_t;
detail::fiber_base::ptr_t active_fiber_;
wqueue_t wqueue_;
rqueue_t rqueue_;
detail::spinlock splk_;
detail::ws_queue rqueue_;
public:
round_robin() BOOST_NOEXCEPT;

25
src/round_robin.cpp
View File

@@ -31,8 +31,7 @@ namespace fibers {
round_robin::round_robin() BOOST_NOEXCEPT :
active_fiber_(),
wqueue_(),
rqueue_(),
splk_()
rqueue_()
{}
round_robin::~round_robin() BOOST_NOEXCEPT
@@ -87,10 +86,7 @@ round_robin::run()
if ( f->interruption_requested() )
f->set_ready();
if ( f->is_ready() )
{
unique_lock< detail::spinlock > lk( splk_);
rqueue_.push_back( f);
}
rqueue_.push( f);
else wqueue.push_back( s);
}
// exchange local with global waiting queue
@@ -101,12 +97,7 @@ round_robin::run()
detail::fiber_base::ptr_t f;
do
{
unique_lock< detail::spinlock > lk( splk_);
if ( rqueue_.empty() ) return false;
f.swap( rqueue_.front() );
rqueue_.pop_front();
lk.unlock();
if ( ! rqueue_.try_pop( f) ) return false;
if ( f->is_ready() ) break;
else BOOST_ASSERT_MSG( false, "fiber with invalid state in ready-queue");
}
@@ -223,15 +214,7 @@ fiber
round_robin::steal_from()
{
detail::fiber_base::ptr_t f;
unique_lock< detail::spinlock > lk( splk_);
if ( ! rqueue_.empty() )
{
f.swap( rqueue_.back() );
rqueue_.pop_back();
}
lk.unlock();
if ( ! rqueue_.try_pop( f) ) return fiber();
return fiber( f);
}