12ffa22844
2011-01-30 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/36104 part four * include/bits/c++config (_GLIBCXX_STD): Remove. (_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C. (_GLIBCXX_P): Now _GLIBCXX_STD_A. (_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL, _GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove. (_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL, _GLIBCXX_INLINE_PROFILE): Remove. (_GLIBCXX_BEGIN_NAMESPACE(X)): Remove. (_GLIBCXX_END_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove. (_GLIBCXX_END_NESTED_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add. (_GLIBCXX_END_NAMESPACE_ALGO): Add. (_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add. (_GLIBCXX_END_NAMESPACE_CONTAINER): Add. (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add. (_GLIBCXX_END_NAMESPACE_VERSION): Add. (_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL. (_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL. (_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY. * include/*: Use new macros for namespace scope. * config/*: Same. * src/*: Same. * src/Makefile.am (sources): Remove debug_list.cc, add compatibility-debug_list-2.cc. (parallel_sources): Remove parallel_list.cc, add compatibility-parallel_list-2.cc. (compatibility-parallel_list-2.[o,lo]): New rule. * src/Makefile.in: Regenerate. * src/debug_list.cc: Remove. * src/parallel_list.cc: Remove. * src/compatibility-list-2.cc: New. * src/compatibility-debug_list-2.cc: New. * src/compatibility-parallel_list-2.cc: New. * doc/doxygen/user.cfg.in: Adjust macros. * testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros. * testsuite/20_util/declval/requirements/1_neg.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same. * testsuite/20_util/forward/c_neg.cc: Same. * testsuite/20_util/forward/f_neg.cc: Same. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same. * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/forward_list/capacity/1.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ assign_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Same. * testsuite/23_containers/list/capacity/29134.cc: Same. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/vector/bool/capacity/29134.cc: Same. * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. * testsuite/25_algorithms/sort/35588.cc: Same. * testsuite/27_io/ios_base/cons/assign_neg.cc: Same. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. * testsuite/ext/profile/mutex_extensions_neg.cc: Same. * testsuite/ext/profile/profiler_algos.cc: Same. * testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. From-SVN: r169421
267 lines
7.3 KiB
C++
267 lines
7.3 KiB
C++
// <condition_variable> -*- C++ -*-
|
|
|
|
// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file include/condition_variable
|
|
* This is a Standard C++ Library header.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_CONDITION_VARIABLE
|
|
#define _GLIBCXX_CONDITION_VARIABLE 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
|
# include <bits/c++0x_warning.h>
|
|
#else
|
|
|
|
#include <chrono>
|
|
#include <mutex> // unique_lock
|
|
|
|
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
/**
|
|
* @defgroup condition_variables Condition Variables
|
|
* @ingroup concurrency
|
|
*
|
|
* Classes for condition_variable support.
|
|
* @{
|
|
*/
|
|
|
|
/// cv_status
|
|
enum class cv_status { no_timeout, timeout };
|
|
|
|
/// condition_variable
|
|
class condition_variable
|
|
{
|
|
typedef chrono::system_clock __clock_t;
|
|
typedef __gthread_cond_t __native_type;
|
|
__native_type _M_cond;
|
|
|
|
public:
|
|
typedef __native_type* native_handle_type;
|
|
|
|
condition_variable() throw ();
|
|
~condition_variable() throw ();
|
|
|
|
condition_variable(const condition_variable&) = delete;
|
|
condition_variable& operator=(const condition_variable&) = delete;
|
|
|
|
void
|
|
notify_one();
|
|
|
|
void
|
|
notify_all();
|
|
|
|
void
|
|
wait(unique_lock<mutex>& __lock);
|
|
|
|
template<typename _Predicate>
|
|
void
|
|
wait(unique_lock<mutex>& __lock, _Predicate __p)
|
|
{
|
|
while (!__p())
|
|
wait(__lock);
|
|
}
|
|
|
|
template<typename _Duration>
|
|
cv_status
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
const chrono::time_point<__clock_t, _Duration>& __atime)
|
|
{ return __wait_until_impl(__lock, __atime); }
|
|
|
|
template<typename _Clock, typename _Duration>
|
|
cv_status
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
{
|
|
// DR 887 - Sync unknown clock to known clock.
|
|
const typename _Clock::time_point __c_entry = _Clock::now();
|
|
const __clock_t::time_point __s_entry = __clock_t::now();
|
|
const chrono::nanoseconds __delta = __atime - __c_entry;
|
|
const __clock_t::time_point __s_atime = __s_entry + __delta;
|
|
|
|
return __wait_until_impl(__lock, __s_atime);
|
|
}
|
|
|
|
template<typename _Clock, typename _Duration, typename _Predicate>
|
|
bool
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime,
|
|
_Predicate __p)
|
|
{
|
|
while (!__p())
|
|
if (wait_until(__lock, __atime) == cv_status::timeout)
|
|
return __p();
|
|
return true;
|
|
}
|
|
|
|
template<typename _Rep, typename _Period>
|
|
cv_status
|
|
wait_for(unique_lock<mutex>& __lock,
|
|
const chrono::duration<_Rep, _Period>& __rtime)
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime); }
|
|
|
|
template<typename _Rep, typename _Period, typename _Predicate>
|
|
bool
|
|
wait_for(unique_lock<mutex>& __lock,
|
|
const chrono::duration<_Rep, _Period>& __rtime,
|
|
_Predicate __p)
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
|
|
|
|
native_handle_type
|
|
native_handle()
|
|
{ return &_M_cond; }
|
|
|
|
private:
|
|
template<typename _Clock, typename _Duration>
|
|
cv_status
|
|
__wait_until_impl(unique_lock<mutex>& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
{
|
|
chrono::time_point<__clock_t, chrono::seconds> __s =
|
|
chrono::time_point_cast<chrono::seconds>(__atime);
|
|
|
|
chrono::nanoseconds __ns =
|
|
chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
|
|
|
|
__gthread_time_t __ts =
|
|
{
|
|
static_cast<std::time_t>(__s.time_since_epoch().count()),
|
|
static_cast<long>(__ns.count())
|
|
};
|
|
|
|
__gthread_cond_timedwait(&_M_cond, __lock.mutex()->native_handle(),
|
|
&__ts);
|
|
|
|
return (_Clock::now() < __atime
|
|
? cv_status::no_timeout : cv_status::timeout);
|
|
}
|
|
};
|
|
|
|
/// condition_variable_any
|
|
// Like above, but mutex is not required to have try_lock.
|
|
class condition_variable_any
|
|
{
|
|
typedef chrono::system_clock __clock_t;
|
|
condition_variable _M_cond;
|
|
mutex _M_mutex;
|
|
|
|
public:
|
|
typedef condition_variable::native_handle_type native_handle_type;
|
|
|
|
condition_variable_any() throw ();
|
|
~condition_variable_any() throw ();
|
|
|
|
condition_variable_any(const condition_variable_any&) = delete;
|
|
condition_variable_any& operator=(const condition_variable_any&) = delete;
|
|
|
|
void
|
|
notify_one()
|
|
{
|
|
lock_guard<mutex> __lock(_M_mutex);
|
|
_M_cond.notify_one();
|
|
}
|
|
|
|
void
|
|
notify_all()
|
|
{
|
|
lock_guard<mutex> __lock(_M_mutex);
|
|
_M_cond.notify_all();
|
|
}
|
|
|
|
template<typename _Lock>
|
|
void
|
|
wait(_Lock& __lock)
|
|
{
|
|
unique_lock<mutex> __my_lock(_M_mutex);
|
|
__lock.unlock();
|
|
_M_cond.wait(__my_lock);
|
|
__lock.lock();
|
|
}
|
|
|
|
|
|
template<typename _Lock, typename _Predicate>
|
|
void
|
|
wait(_Lock& __lock, _Predicate __p)
|
|
{
|
|
while (!__p())
|
|
wait(__lock);
|
|
}
|
|
|
|
template<typename _Lock, typename _Clock, typename _Duration>
|
|
cv_status
|
|
wait_until(_Lock& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
{
|
|
unique_lock<mutex> __my_lock(_M_mutex);
|
|
__lock.unlock();
|
|
cv_status __status = _M_cond.wait_until(__my_lock, __atime);
|
|
__lock.lock();
|
|
return __status;
|
|
}
|
|
|
|
template<typename _Lock, typename _Clock,
|
|
typename _Duration, typename _Predicate>
|
|
bool
|
|
wait_until(_Lock& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime,
|
|
_Predicate __p)
|
|
{
|
|
while (!__p())
|
|
if (wait_until(__lock, __atime) == cv_status::timeout)
|
|
return __p();
|
|
return true;
|
|
}
|
|
|
|
template<typename _Lock, typename _Rep, typename _Period>
|
|
cv_status
|
|
wait_for(_Lock& __lock, const chrono::duration<_Rep, _Period>& __rtime)
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime); }
|
|
|
|
template<typename _Lock, typename _Rep,
|
|
typename _Period, typename _Predicate>
|
|
bool
|
|
wait_for(_Lock& __lock,
|
|
const chrono::duration<_Rep, _Period>& __rtime, _Predicate __p)
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
|
|
|
|
native_handle_type
|
|
native_handle()
|
|
{ return _M_cond.native_handle(); }
|
|
};
|
|
|
|
// @} group condition_variables
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace
|
|
|
|
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
#endif // _GLIBCXX_CONDITION_VARIABLE
|