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

Merge branch 'fiber-mt' of github.com:olk/boost-fiber into fiber-mt.

Browse Source 
Oliver delegated platform specificity of detail::scheduler::instance_ to
boost::thread_specific_ptr.
This commit is contained in:
Nat Goodspeed
2013-11-01 16:12:57 -04:00
parent 2d79ce67a0 beab239538
commit 5ed6652276
2 changed files with 17 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
include/boost/fiber/detail/scheduler.hpp
View File

@@ -6,11 +6,8 @@
#ifndef BOOST_FIBERS_DETAIL_SCHEDULER_H
#define BOOST_FIBERS_DETAIL_SCHEDULER_H
#if defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
#include <pthread.h> // pthread_key_create, pthread_[gs]etspecific
#endif
#include <boost/config.hpp>
#include <boost/thread/tss.hpp>
#include <boost/utility.hpp>
#include <boost/fiber/algorithm.hpp>
@@ -29,83 +26,20 @@ namespace boost {
namespace fibers {
namespace detail {
// thread_local_ptr was contributed by Nat Goodspeed
#if defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
template <typename T>
class thread_local_ptr : private noncopyable
{
private:
struct dummy
{ void nonnull() {} };
typedef void ( dummy::*safe_bool)();
::pthread_key_t key_;
public:
thread_local_ptr() BOOST_NOEXCEPT
{ BOOST_ASSERT( ! ::pthread_key_create( & key_, 0) ); }
T * get() const BOOST_NOEXCEPT
{ return static_cast< T * >( ::pthread_getspecific( key_) ); }
thread_local_ptr & operator=( T * ptr) BOOST_NOEXCEPT
{
::pthread_setspecific( key_, ptr);
return * this;
}
T & operator*() const BOOST_NOEXCEPT
{ return * get(); }
T * operator->() const BOOST_NOEXCEPT
{ return get(); }
operator T * () const BOOST_NOEXCEPT
{ return get(); }
operator safe_bool() const BOOST_NOEXCEPT
{ return get() ? &dummy::nonnull : 0; }
bool operator!() const BOOST_NOEXCEPT
{ return ! get(); }
bool operator==( thread_local_ptr const& other) BOOST_NOEXCEPT
{ return this->get() == other.get(); }
bool operator!=( thread_local_ptr const& other) BOOST_NOEXCEPT
{ return ! ( * this == other); }
};
#endif // __APPLE__ && BOOST_HAS_PTHREADS
class scheduler : private noncopyable
{
private:
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) || \
(defined(__ICC) && defined(BOOST_WINDOWS))
static __declspec(thread) algorithm * instance_;
#elif defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
static detail::thread_local_ptr<algorithm> instance_;
#else
static __thread algorithm * instance_;
#endif
static thread_specific_ptr< algorithm > instance_;
public:
template< typename F >
static fiber_base::ptr_t extract( F const& f) {
return f.impl_;
}
static fiber_base::ptr_t extract( F const& f)
{ return f.impl_; }
static algorithm * instance() BOOST_NOEXCEPT
{ return instance_; }
{ return instance_.get(); }
static algorithm * replace( algorithm * other) BOOST_NOEXCEPT
{
algorithm * old = instance_;
instance_ = other;
return old;
}
static algorithm * replace( algorithm * other) BOOST_NOEXCEPT;
};
}}}

20
src/detail/scheduler.cpp
View File

@@ -15,15 +15,17 @@ namespace boost {
namespace fibers {
namespace detail {
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) || \
(defined(__ICC) && defined(BOOST_WINDOWS))
__declspec(thread) algorithm * scheduler::instance_ = 0;
#elif defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
detail::thread_local_ptr<algorithm> scheduler::instance_;
#else
//algorithm * scheduler::instance_ = 0;
__thread algorithm * scheduler::instance_ = 0;
#endif
static void cleanup_function( algorithm *) {}
thread_specific_ptr< algorithm > scheduler::instance_( cleanup_function);
algorithm *
scheduler::replace( algorithm * other) BOOST_NOEXCEPT
{
algorithm * old = instance_.release();
instance_.reset( other);
return old;
}
}}}