
2009-02-20 Benjamin Kosnik <bkoz@redhat.com> * doc/doxygen/user.cfg.in: Tweaks. * doc/doxygen/doxygroups.cc: Prefer markup that can be elsewhere, be elsewhere. * include/tr1_impl/unordered_map: Just use most specialized container module. * include/tr1_impl/unordered_set: Same. * include/tr1_impl/array: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_queue.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_stack.h: Same. * include/bits/forward_list.h: Same. * include/bits/basic_string.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_vector.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/stl_bvector.h: Same. * include/backward/binders.h: Change binder module to binders. * include/std/complex: Add complex_numers module. * include/tr1_impl/complex: Same. * include/std/valarray: Add numeric_arrays module. * include/bits/gslice_array.h: Same. * include/bits/gslice.h: Same. * include/bits/mask_array.h: Same. * include/bits/slice_array.h: Same. * include/bits/indirect_array.h: Same. * include/bits/allocator.h: Add allocators module. * include/ext/throw_allocator.h * include/ext/pool_allocator.h * include/ext/bitmap_allocator.h * include/ext/new_allocator.h * include/ext/malloc_allocator.h * include/ext/array_allocator.h * include/ext/mt_allocator.h * include/ext/debug_allocator.h * include/ext/extptr_allocator.h * include/tr1_impl/functional: Move namespace markup here. * include/tr1_impl/regex: Same. * include/tr1_impl/type_traits: Add metaprogramming module. * include/std/type_traits: Same. * include/std/memory: Add memory module. * include/std/ratio: Add ratio module. * include/std/chrono: Move namespace markup here, add time module. * include/std/thread: Move namespace markup here, add concurrency module. * include/std/mutex: Use concurrency module. * include/std/condition_variable: Same. * include/bits/ios_base.h: Refine io module. * include/bits/basic_ios.h: Same. * include/std/fstream: Same. * include/std/istream: Same. * include/std/ostream: Same. * include/std/sstream: Same. * include/ext/vstring.h: Correct parameter markup. * include/bits/shared_ptr.h: Add pointer_abstractions module. * include/bits/unique_ptr.h: Same. * include/bits/algorithmfwd.h: Add mutating_algorithms, non_mutating_algorithms, sorting_algorithms. Adjust nesting. * include/bits/stl_heap.h: Add markup for new groupings. * include/bits/stl_algobase.h: Same. * include/bits/stl_algo.h: Same. * include/c_compatibility/stdatomic.h: Add atomics module. * include/c_global/cstdatomic: Same. * libsupc++/exception: Add exceptions module. * libsupc++/typeinfo: Same. * libsupc++/new: Same. * libsupc++/exception_ptr.h: Same. * include/std/system_error: Same. * include/std/stdexcept: Same. * libsupc++/cxxabi.h: Move doxygroups.cc markup here. * libsupc++/cxxabi-forced.h: Same. * testsuite/27_io/ios_base/cons/assign_neg.cc: Fix up line numbers. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. * testsuite/30_threads/condition_variable_any/cons/assign_neg.cc: Same. * testsuite/30_threads/condition_variable_any/cons/copy_neg.cc: Same. * testsuite/30_threads/mutex/cons/assign_neg.cc: Same. * testsuite/30_threads/mutex/cons/copy_neg.cc: Same. * testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Same. * testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Same. * testsuite/30_threads/thread/cons/assign_neg.cc: Same. * testsuite/30_threads/thread/cons/copy_neg.cc: Same. * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Same. * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Same. * testsuite/30_threads/condition_variable/cons/assign_neg.cc: Same. * testsuite/30_threads/condition_variable/cons/copy_neg.cc: Same. * testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc: Same. * testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc: Same. * testsuite/29_atomics/atomic/cons/assign_neg.cc: Same. * testsuite/29_atomics/atomic/cons/copy_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/insert_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/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_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/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_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/20_util/duration/cons/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/unique_ptr/modifiers/reset_neg.cc: Same. * testsuite/20_util/unique_ptr/assign/assign.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.cc: Same. * testsuite/20_util/ratio/operations/ops_overflow.cc: Same. From-SVN: r144343
230 lines
6.4 KiB
C++
230 lines
6.4 KiB
C++
// <condition_variable> -*- C++ -*-
|
|
|
|
// Copyright (C) 2008, 2009 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 2, 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.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this library; see the file COPYING. If not, write to
|
|
// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
// Boston, MA 02110-1301, USA.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
/** @file 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 <c++0x_warning.h>
|
|
#else
|
|
|
|
#include <chrono>
|
|
#include <mutex> // unique_lock
|
|
|
|
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
|
|
|
|
namespace std
|
|
{
|
|
/**
|
|
* @defgroup condition_variables Condition Variables
|
|
* @ingroup concurrency
|
|
*
|
|
* Classes for condition_variable support.
|
|
* @{
|
|
*/
|
|
|
|
/// 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();
|
|
~condition_variable();
|
|
|
|
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>
|
|
bool
|
|
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>
|
|
bool
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
{
|
|
// DR 887 - Sync unknown clock to known clock.
|
|
typename _Clock::time_point __c_entry = _Clock::now();
|
|
__clock_t::time_point __s_entry = __clock_t::now();
|
|
chrono::nanoseconds __delta = __atime - __c_entry;
|
|
__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))
|
|
return __p();
|
|
|
|
return true;
|
|
}
|
|
|
|
template<typename _Rep, typename _Period>
|
|
bool
|
|
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>
|
|
bool
|
|
__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;
|
|
}
|
|
};
|
|
|
|
/// condition_variable_any
|
|
// Like above, only mutex may not have try_lock.
|
|
class condition_variable_any
|
|
{
|
|
typedef __gthread_cond_t __native_type;
|
|
__native_type _M_cond;
|
|
|
|
public:
|
|
typedef __native_type* native_handle_type;
|
|
|
|
condition_variable_any();
|
|
~condition_variable_any();
|
|
|
|
condition_variable_any(const condition_variable_any&) = delete;
|
|
condition_variable_any& operator=(const condition_variable_any&) = delete;
|
|
|
|
void
|
|
notify_one();
|
|
|
|
void
|
|
notify_all();
|
|
|
|
template<typename _Lock>
|
|
void
|
|
wait(_Lock& __lock);
|
|
|
|
template<typename _Lock, typename _Predicate>
|
|
void
|
|
wait(_Lock& __lock, _Predicate __p);
|
|
|
|
template<typename _Lock, typename _Clock, typename _Duration>
|
|
bool
|
|
wait_until(_Lock& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime);
|
|
|
|
template<typename _Lock, typename _Clock,
|
|
typename _Duration, typename _Predicate>
|
|
bool
|
|
wait_until(_Lock& __lock,
|
|
const chrono::time_point<_Clock, _Duration>& __atime,
|
|
_Predicate __p);
|
|
|
|
template<typename _Lock, typename _Rep, typename _Period>
|
|
bool
|
|
wait_for(_Lock& __lock, const chrono::duration<_Rep, _Period>& __rtime);
|
|
|
|
template<typename _Lock, typename _Rep,
|
|
typename _Period, typename _Predicate>
|
|
bool
|
|
wait_for(_Lock& __lock,
|
|
const chrono::duration<_Rep, _Period>& __rtime, _Predicate __p);
|
|
|
|
native_handle_type
|
|
native_handle()
|
|
{ return &_M_cond; }
|
|
};
|
|
|
|
// @} group condition_variables
|
|
}
|
|
|
|
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
#endif // _GLIBCXX_CONDITION_VARIABLE
|