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

Thread: update the externally_locked_stream interface.

Browse Source 
[SVN r84109]
This commit is contained in:
Vicente J. Botet Escriba
2013-05-02 15:32:29 +00:00
parent 2d2d1112d6
commit 5fcfd0e4e8
6 changed files with 269 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/boost/thread/externally_locked_stream.hpp
View File

@@ -21,12 +21,6 @@
namespace boost
{
// inline static recursive_mutex& terminal_mutex()
// {
// static recursive_mutex mtx;
// return mtx;
// }
template <typename Stream, typename RecursiveMutex=recursive_mutex>
class externally_locked_stream;
@@ -51,7 +45,7 @@ namespace boost
{
}
stream_guard(BOOST_THREAD_RV_REF(stream_guard) rhs)
stream_guard(BOOST_THREAD_RV_REF(stream_guard) rhs) BOOST_NOEXCEPT
: mtx_(rhs.mtx_)
{
rhs.mtx_= 0;
@@ -62,15 +56,24 @@ namespace boost
if (mtx_ != 0) mtx_->unlock();
}
bool owns_lock(mutex_type const* l) const BOOST_NOEXCEPT
bool owns_lock(const mutex_type * l) const BOOST_NOEXCEPT
{
return l == mtx_->mutex();
}
/**
* @Requires mtx_
*/
Stream& get() const
{
BOOST_THREAD_ASSERT_PRECONDITION( mtx_, lock_error() );
return mtx_->get(*this);
}
Stream& bypass() const
{
return get();
}
private:
externally_locked_stream<Stream, RecursiveMutex>* mtx_;
@@ -98,22 +101,20 @@ namespace boost
/**
* Effects: Constructs an externally locked object storing the cloaked reference object.
*/
externally_locked_stream(Stream& stream, RecursiveMutex& mtx) :
externally_locked_stream(Stream& stream, RecursiveMutex& mtx) BOOST_NOEXCEPT :
base_type(stream, mtx)
{
}
stream_guard<Stream, RecursiveMutex> hold()
stream_guard<Stream, RecursiveMutex> hold() BOOST_NOEXCEPT
{
return stream_guard<Stream, RecursiveMutex> (*this);
}
Stream& hold(strict_lock<RecursiveMutex>& lk)
Stream& bypass() const
{
return this->get(lk);
stream_guard<Stream, RecursiveMutex> lk(*this);
return get(lk);
}
};
//]

23
include/boost/thread/strict_lock.hpp
View File

@@ -73,7 +73,6 @@ namespace boost
// observers
private:
/**
* @return the owned mutex.
@@ -82,12 +81,19 @@ namespace boost
{
return &mtx_;
}
public:
/**
* @return whether this lock is locking a mutex.
*/
bool owns_lock() const BOOST_NOEXCEPT
{
return true;
}
/**
* @return whether this lock is locking that mutex.
*/
bool owns_lock(mutex_type const* l) const BOOST_NOEXCEPT
bool owns_lock(const mutex_type* l) const BOOST_NOEXCEPT
{
return l == mutex();
} /*< strict locks specific function >*/
@@ -173,7 +179,6 @@ namespace boost
}
// observers
private:
/**
* return @c the owned mutex.
*/
@@ -181,7 +186,15 @@ private:
{
return tmp_lk_.mutex();
}
public:
/**
* @return whether this lock is locking a mutex.
*/
bool owns_lock() const BOOST_NOEXCEPT
{
return true;
}
/**
* @return whether if this lock is locking that mutex.
*/