forked from boostorg/smart_ptr
Kill *_linux variants of atomic_count and lightweight_mutex.
[SVN r27889]
This commit is contained in:
@ -73,9 +73,6 @@
|
|||||||
// are called driven by smart_ptr interface...
|
// are called driven by smart_ptr interface...
|
||||||
//
|
//
|
||||||
|
|
||||||
// Note: atomic_count_linux.hpp has been disabled by default; see the
|
|
||||||
// comments inside for more info.
|
|
||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
|
|
||||||
#ifndef BOOST_HAS_THREADS
|
#ifndef BOOST_HAS_THREADS
|
||||||
@ -92,13 +89,11 @@ typedef long atomic_count;
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(BOOST_USE_ASM_ATOMIC_H)
|
|
||||||
# include <boost/detail/atomic_count_linux.hpp>
|
|
||||||
#elif defined(BOOST_AC_USE_PTHREADS)
|
#elif defined(BOOST_AC_USE_PTHREADS)
|
||||||
# include <boost/detail/atomic_count_pthreads.hpp>
|
# include <boost/detail/atomic_count_pthreads.hpp>
|
||||||
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
|
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
|
||||||
# include <boost/detail/atomic_count_win32.hpp>
|
# include <boost/detail/atomic_count_win32.hpp>
|
||||||
#elif defined(__GLIBCPP__)
|
#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
|
||||||
# include <boost/detail/atomic_count_gcc.hpp>
|
# include <boost/detail/atomic_count_gcc.hpp>
|
||||||
#elif defined(BOOST_HAS_PTHREADS)
|
#elif defined(BOOST_HAS_PTHREADS)
|
||||||
# define BOOST_AC_USE_PTHREADS
|
# define BOOST_AC_USE_PTHREADS
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
#ifndef BOOST_DETAIL_ATOMIC_COUNT_LINUX_HPP_INCLUDED
|
|
||||||
#define BOOST_DETAIL_ATOMIC_COUNT_LINUX_HPP_INCLUDED
|
|
||||||
|
|
||||||
//
|
|
||||||
// boost/detail/atomic_count_linux.hpp
|
|
||||||
//
|
|
||||||
// Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
|
|
||||||
//
|
|
||||||
// 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)
|
|
||||||
//
|
|
||||||
|
|
||||||
//
|
|
||||||
// This implementation uses <asm/atomic.h>. This is a kernel header;
|
|
||||||
// using kernel headers in a user program may cause a number of problems,
|
|
||||||
// and not all flavors of Linux provide the atomic instructions.
|
|
||||||
//
|
|
||||||
// This file is only provided because the performance of this implementation
|
|
||||||
// is significantly higher than the pthreads version. Use at your own risk
|
|
||||||
// (by defining BOOST_USE_ASM_ATOMIC_H.)
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <asm/atomic.h>
|
|
||||||
|
|
||||||
namespace boost
|
|
||||||
{
|
|
||||||
|
|
||||||
namespace detail
|
|
||||||
{
|
|
||||||
|
|
||||||
class atomic_count
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
explicit atomic_count(long v)
|
|
||||||
{
|
|
||||||
atomic_t init = ATOMIC_INIT(v);
|
|
||||||
value_ = init;
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator++()
|
|
||||||
{
|
|
||||||
atomic_inc(&value_);
|
|
||||||
}
|
|
||||||
|
|
||||||
long operator--()
|
|
||||||
{
|
|
||||||
return !atomic_dec_and_test(&value_);
|
|
||||||
}
|
|
||||||
|
|
||||||
operator long() const
|
|
||||||
{
|
|
||||||
return atomic_read(&value_);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
atomic_count(atomic_count const &);
|
|
||||||
atomic_count & operator=(atomic_count const &);
|
|
||||||
|
|
||||||
atomic_t value_;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace detail
|
|
||||||
|
|
||||||
} // namespace boost
|
|
||||||
|
|
||||||
#endif // #ifndef BOOST_DETAIL_ATOMIC_COUNT_LINUX_HPP_INCLUDED
|
|
@ -49,10 +49,6 @@
|
|||||||
// where a spinlock can be several orders of magnitude faster than a CRITICAL_SECTION.
|
// where a spinlock can be several orders of magnitude faster than a CRITICAL_SECTION.
|
||||||
|
|
||||||
|
|
||||||
// Note: lwm_linux.hpp has been disabled by default; see the comments
|
|
||||||
// inside for more info.
|
|
||||||
|
|
||||||
|
|
||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
|
|
||||||
// Note to implementors: if you write a platform-specific spinlock
|
// Note to implementors: if you write a platform-specific spinlock
|
||||||
@ -75,8 +71,6 @@
|
|||||||
# else
|
# else
|
||||||
# include <boost/detail/lwm_nop.hpp>
|
# include <boost/detail/lwm_nop.hpp>
|
||||||
# endif
|
# endif
|
||||||
#elif defined(BOOST_LWM_USE_SPINLOCK) && defined(BOOST_USE_ASM_ATOMIC_H)
|
|
||||||
# include <boost/detail/lwm_linux.hpp>
|
|
||||||
#elif defined(BOOST_LWM_USE_CRITICAL_SECTION)
|
#elif defined(BOOST_LWM_USE_CRITICAL_SECTION)
|
||||||
# include <boost/detail/lwm_win32_cs.hpp>
|
# include <boost/detail/lwm_win32_cs.hpp>
|
||||||
#elif defined(BOOST_LWM_USE_PTHREADS)
|
#elif defined(BOOST_LWM_USE_PTHREADS)
|
||||||
|
@ -1,84 +0,0 @@
|
|||||||
#ifndef BOOST_DETAIL_LWM_LINUX_HPP_INCLUDED
|
|
||||||
#define BOOST_DETAIL_LWM_LINUX_HPP_INCLUDED
|
|
||||||
|
|
||||||
//
|
|
||||||
// boost/detail/lwm_linux.hpp
|
|
||||||
//
|
|
||||||
// Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
|
|
||||||
//
|
|
||||||
// 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)
|
|
||||||
//
|
|
||||||
|
|
||||||
//
|
|
||||||
// This implementation uses <asm/atomic.h>. This is a kernel header;
|
|
||||||
// using kernel headers in a user program may cause a number of problems,
|
|
||||||
// and not all flavors of Linux provide the atomic instructions.
|
|
||||||
//
|
|
||||||
// This file is only provided because the performance of this implementation
|
|
||||||
// is about 3.5 times higher than the pthreads version. Use at your own risk
|
|
||||||
// (by defining BOOST_USE_ASM_ATOMIC_H.)
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <asm/atomic.h>
|
|
||||||
#include <sched.h>
|
|
||||||
|
|
||||||
namespace boost
|
|
||||||
{
|
|
||||||
|
|
||||||
namespace detail
|
|
||||||
{
|
|
||||||
|
|
||||||
class lightweight_mutex
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
atomic_t a_;
|
|
||||||
|
|
||||||
lightweight_mutex(lightweight_mutex const &);
|
|
||||||
lightweight_mutex & operator=(lightweight_mutex const &);
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
lightweight_mutex()
|
|
||||||
{
|
|
||||||
atomic_t a = ATOMIC_INIT(1);
|
|
||||||
a_ = a;
|
|
||||||
}
|
|
||||||
|
|
||||||
class scoped_lock;
|
|
||||||
friend class scoped_lock;
|
|
||||||
|
|
||||||
class scoped_lock
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
lightweight_mutex & m_;
|
|
||||||
|
|
||||||
scoped_lock(scoped_lock const &);
|
|
||||||
scoped_lock & operator=(scoped_lock const &);
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
explicit scoped_lock(lightweight_mutex & m): m_(m)
|
|
||||||
{
|
|
||||||
while( !atomic_dec_and_test(&m_.a_) )
|
|
||||||
{
|
|
||||||
atomic_inc(&m_.a_);
|
|
||||||
sched_yield();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
~scoped_lock()
|
|
||||||
{
|
|
||||||
atomic_inc(&m_.a_);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace detail
|
|
||||||
|
|
||||||
} // namespace boost
|
|
||||||
|
|
||||||
#endif // #ifndef BOOST_DETAIL_LWM_LINUX_HPP_INCLUDED
|
|
Reference in New Issue
Block a user