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

Nat's patch applied (Mac OS X related stuff)

Browse Source
This commit is contained in:
Oliver Kowalke
2013-09-26 19:25:24 +02:00
parent 5be0757ffd
commit 60031f8ec1
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ 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:
@@ -45,26 +46,26 @@ public:
thread_local_ptr() BOOST_NOEXCEPT
{ BOOST_ASSERT( ! ::pthread_key_create( & key_, 0) ); }
algorithm * get() const BOOST_NOEXCEPT
{ return static_cast< algorithm * >( ::pthread_getspecific( key_) ); }
T * get() const BOOST_NOEXCEPT
{ return static_cast< T * >( ::pthread_getspecific( key_) ); }
thread_local_ptr & operator=( algorithm * ptr) BOOST_NOEXCEPT
thread_local_ptr & operator=( T * ptr) BOOST_NOEXCEPT
{
::pthread_setspecific( key_, ptr);
return * this;
}
algorithm & operator*() const BOOST_NOEXCEPT
T & operator*() const BOOST_NOEXCEPT
{ return * get(); }
algorithm * operator->() const BOOST_NOEXCEPT
T * operator->() const BOOST_NOEXCEPT
{ return get(); }
operator algorithm * () const BOOST_NOEXCEPT
operator T * () const BOOST_NOEXCEPT
{ return get(); }
operator safe_bool() const BOOST_NOEXCEPT
{ return get() ? 0 : & dummy::nonnull; }
{ return get() ? &dummy::nonnull : 0; }
bool operator!() const BOOST_NOEXCEPT
{ return ! get(); }
@@ -76,8 +77,7 @@ public:
{ return ! ( * this == other); }
};
}
#endif
#endif // __APPLE__ && BOOST_HAS_PTHREADS
class scheduler : private noncopyable
{
@@ -85,8 +85,8 @@ private:
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) || \
(defined(__ICC) && defined(BOOST_WINDOWS))
static __declspec(thread) algorithm * instance_;
#elif defined(BOOST_MAC_PTHREADS)
static detail::thread_local_ptr instance_;
#elif defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
static detail::thread_local_ptr<algorithm> instance_;
#else
static __thread algorithm * instance_;
#endif

4
src/detail/scheduler.cpp
View File

@@ -18,8 +18,8 @@ namespace detail {
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) || \
(defined(__ICC) && defined(BOOST_WINDOWS))
__declspec(thread) algorithm * scheduler::instance_ = 0;
#elif defined(BOOST_MAC_PTHREADS)
detail::thread_local_ptr scheduler::instance_ = 0;
#elif defined(__APPLE__) && defined(BOOST_HAS_PTHREADS)
detail::thread_local_ptr<algorithm> scheduler::instance_ = 0;
#else
//algorithm * scheduler::instance_ = 0;
__thread algorithm * scheduler::instance_ = 0;

13
src/fiber.cpp
View File

@@ -59,14 +59,11 @@ fiber::join()
system::errc::invalid_argument, "boost fiber: fiber not joinable") );
}
try
{ detail::scheduler::instance()->join( impl_); }
catch (...)
{
impl_.reset();
throw;
}
impl_.reset();
ptr_t impl_old;
// reset impl_ now, BEFORE calling join(), so it's reset even if join()
// throws
impl_old.swap(impl_);
detail::scheduler::instance()->join(impl_old);
}
void