diff options
Diffstat (limited to 'boost/thread/pthread/condition_variable_fwd.hpp')
| -rw-r--r-- | boost/thread/pthread/condition_variable_fwd.hpp | 271 |
1 files changed, 123 insertions, 148 deletions
diff --git a/boost/thread/pthread/condition_variable_fwd.hpp b/boost/thread/pthread/condition_variable_fwd.hpp index 0ea34e238d..dc471d56a0 100644 --- a/boost/thread/pthread/condition_variable_fwd.hpp +++ b/boost/thread/pthread/condition_variable_fwd.hpp @@ -13,7 +13,9 @@ #include <boost/thread/mutex.hpp> #include <boost/thread/lock_types.hpp> #include <boost/thread/thread_time.hpp> -#include <boost/thread/pthread/timespec.hpp> +#include <boost/thread/detail/platform_time.hpp> +#include <boost/thread/pthread/pthread_helpers.hpp> + #if defined BOOST_THREAD_USES_DATETIME #include <boost/thread/xtime.hpp> #endif @@ -25,31 +27,12 @@ #include <boost/thread/detail/delete.hpp> #include <boost/date_time/posix_time/posix_time_duration.hpp> +#include <algorithm> + #include <boost/config/abi_prefix.hpp> namespace boost { - namespace detail { - inline int monotonic_pthread_cond_init(pthread_cond_t& cond) { - -#ifdef BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC - pthread_condattr_t attr; - int res = pthread_condattr_init(&attr); - if (res) - { - return res; - } - pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); - res=pthread_cond_init(&cond,&attr); - pthread_condattr_destroy(&attr); - return res; -#else - return pthread_cond_init(&cond,NULL); -#endif - - } - } - class condition_variable { private: @@ -61,21 +44,9 @@ namespace boost public: //private: // used by boost::thread::try_join_until - inline bool do_wait_until( + bool do_wait_until( unique_lock<mutex>& lock, - struct timespec const &timeout); - - bool do_wait_for( - unique_lock<mutex>& lock, - struct timespec const &timeout) - { -#if defined BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC - return do_wait_until(lock, boost::detail::timespec_plus(timeout, boost::detail::timespec_now_monotonic())); -#else - // old behavior was fine for monotonic - return do_wait_until(lock, boost::detail::timespec_plus(timeout, boost::detail::timespec_now_realtime())); -#endif - } + detail::internal_platform_timepoint const &timeout); public: BOOST_THREAD_NO_COPYABLE(condition_variable) @@ -93,14 +64,14 @@ namespace boost boost::throw_exception(thread_resource_error(res, "boost::condition_variable::condition_variable() constructor failed in pthread_mutex_init")); } //#endif - res = detail::monotonic_pthread_cond_init(cond); + res = pthread::cond_init(cond); if (res) { //#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS // ditto BOOST_VERIFY(!pthread_mutex_destroy(&internal_mutex)); //#endif - boost::throw_exception(thread_resource_error(res, "boost::condition_variable::condition_variable() constructor failed in detail::monotonic_pthread_cond_init")); + boost::throw_exception(thread_resource_error(res, "boost::condition_variable::condition_variable() constructor failed in pthread::cond_init")); } } ~condition_variable() @@ -124,20 +95,35 @@ namespace boost template<typename predicate_type> void wait(unique_lock<mutex>& m,predicate_type pred) { - while(!pred()) wait(m); + while (!pred()) + { + wait(m); + } } #if defined BOOST_THREAD_USES_DATETIME - inline bool timed_wait( + bool timed_wait( unique_lock<mutex>& m, boost::system_time const& abs_time) { #if defined BOOST_THREAD_WAIT_BUG - struct timespec const timeout=detail::to_timespec(abs_time + BOOST_THREAD_WAIT_BUG); - return do_wait_until(m, timeout); + const detail::real_platform_timepoint ts(abs_time + BOOST_THREAD_WAIT_BUG); +#else + const detail::real_platform_timepoint ts(abs_time); +#endif +#if defined BOOST_THREAD_INTERNAL_CLOCK_IS_MONO + // The system time may jump while this function is waiting. To compensate for this and time + // out near the correct time, we could call do_wait_until() in a loop with a short timeout + // and recheck the time remaining each time through the loop. However, because we can't + // check the predicate each time do_wait_until() completes, this introduces the possibility + // of not exiting the function when a notification occurs, since do_wait_until() may report + // that it timed out even though a notification was received. The best this function can do + // is report correctly whether or not it reached the timeout time. + const detail::platform_duration d(ts - detail::real_platform_clock::now()); + do_wait_until(m, detail::internal_platform_clock::now() + d); + return ts > detail::real_platform_clock::now(); #else - struct timespec const timeout=detail::to_timespec(abs_time); - return do_wait_until(m, timeout); + return do_wait_until(m, ts); #endif } bool timed_wait( @@ -154,14 +140,28 @@ namespace boost { if (wait_duration.is_pos_infinity()) { - wait(m); // or do_wait(m,detail::timeout::sentinel()); + wait(m); return true; } if (wait_duration.is_special()) { return true; } - return timed_wait(m,get_system_time()+wait_duration); + detail::platform_duration d(wait_duration); +#if defined(BOOST_THREAD_HAS_MONO_CLOCK) && !defined(BOOST_THREAD_INTERNAL_CLOCK_IS_MONO) + // The system time may jump while this function is waiting. To compensate for this and time + // out near the correct time, we could call do_wait_until() in a loop with a short timeout + // and recheck the time remaining each time through the loop. However, because we can't + // check the predicate each time do_wait_until() completes, this introduces the possibility + // of not exiting the function when a notification occurs, since do_wait_until() may report + // that it timed out even though a notification was received. The best this function can do + // is report correctly whether or not it reached the timeout time. + const detail::mono_platform_timepoint ts(detail::mono_platform_clock::now() + d); + do_wait_until(m, detail::internal_platform_clock::now() + d); + return ts > detail::mono_platform_clock::now(); +#else + return do_wait_until(m, detail::internal_platform_clock::now() + d); +#endif } template<typename predicate_type> @@ -169,12 +169,26 @@ namespace boost unique_lock<mutex>& m, boost::system_time const& abs_time,predicate_type pred) { +#if defined BOOST_THREAD_WAIT_BUG + const detail::real_platform_timepoint ts(abs_time + BOOST_THREAD_WAIT_BUG); +#else + const detail::real_platform_timepoint ts(abs_time); +#endif while (!pred()) { - if(!timed_wait(m, abs_time)) - return pred(); +#if defined BOOST_THREAD_INTERNAL_CLOCK_IS_MONO + // The system time may jump while this function is waiting. To compensate for this + // and time out near the correct time, we call do_wait_until() in a loop with a + // short timeout and recheck the time remaining each time through the loop. + detail::platform_duration d(ts - detail::real_platform_clock::now()); + if (d <= detail::platform_duration::zero()) break; // timeout occurred + d = (std::min)(d, detail::platform_milliseconds(BOOST_THREAD_POLL_INTERVAL_MILLISECONDS)); + do_wait_until(m, detail::internal_platform_clock::now() + d); +#else + if (!do_wait_until(m, ts)) break; // timeout occurred +#endif } - return true; + return pred(); } template<typename predicate_type> @@ -194,7 +208,7 @@ namespace boost { while (!pred()) { - wait(m); // or do_wait(m,detail::timeout::sentinel()); + wait(m); } return true; } @@ -202,26 +216,41 @@ namespace boost { return pred(); } - return timed_wait(m,get_system_time()+wait_duration,pred); + detail::platform_duration d(wait_duration); +#if defined(BOOST_THREAD_HAS_MONO_CLOCK) && !defined(BOOST_THREAD_INTERNAL_CLOCK_IS_MONO) + // The system time may jump while this function is waiting. To compensate for this + // and time out near the correct time, we call do_wait_until() in a loop with a + // short timeout and recheck the time remaining each time through the loop. + const detail::mono_platform_timepoint ts(detail::mono_platform_clock::now() + d); + while (!pred()) + { + if (d <= detail::platform_duration::zero()) break; // timeout occurred + d = (std::min)(d, detail::platform_milliseconds(BOOST_THREAD_POLL_INTERVAL_MILLISECONDS)); + do_wait_until(m, detail::internal_platform_clock::now() + d); + d = ts - detail::mono_platform_clock::now(); + } +#else + const detail::internal_platform_timepoint ts(detail::internal_platform_clock::now() + d); + while (!pred()) + { + if (!do_wait_until(m, ts)) break; // timeout occurred + } +#endif + return pred(); } #endif -#ifndef BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC - #ifdef BOOST_THREAD_USES_CHRONO template <class Duration> cv_status wait_until( unique_lock<mutex>& lock, - const chrono::time_point<chrono::system_clock, Duration>& t) + const chrono::time_point<detail::internal_chrono_clock, Duration>& t) { - using namespace chrono; - typedef time_point<system_clock, nanoseconds> nano_sys_tmpt; - wait_until(lock, - nano_sys_tmpt(ceil<nanoseconds>(t.time_since_epoch()))); - return system_clock::now() < t ? cv_status::no_timeout : - cv_status::timeout; + const detail::internal_platform_timepoint ts(t); + if (do_wait_until(lock, ts)) return cv_status::no_timeout; + else return cv_status::timeout; } template <class Clock, class Duration> @@ -230,100 +259,44 @@ namespace boost unique_lock<mutex>& lock, const chrono::time_point<Clock, Duration>& t) { - using namespace chrono; - system_clock::time_point s_now = system_clock::now(); - typename Clock::time_point c_now = Clock::now(); - wait_until(lock, s_now + ceil<nanoseconds>(t - c_now)); - return Clock::now() < t ? cv_status::no_timeout : cv_status::timeout; + // The system time may jump while this function is waiting. To compensate for this and time + // out near the correct time, we could call do_wait_until() in a loop with a short timeout + // and recheck the time remaining each time through the loop. However, because we can't + // check the predicate each time do_wait_until() completes, this introduces the possibility + // of not exiting the function when a notification occurs, since do_wait_until() may report + // that it timed out even though a notification was received. The best this function can do + // is report correctly whether or not it reached the timeout time. + typedef typename common_type<Duration, typename Clock::duration>::type common_duration; + common_duration d(t - Clock::now()); + do_wait_until(lock, detail::internal_chrono_clock::now() + d); + if (t > Clock::now()) return cv_status::no_timeout; + else return cv_status::timeout; } - - template <class Rep, class Period> cv_status wait_for( unique_lock<mutex>& lock, const chrono::duration<Rep, Period>& d) { - using namespace chrono; - system_clock::time_point s_now = system_clock::now(); - steady_clock::time_point c_now = steady_clock::now(); - wait_until(lock, s_now + ceil<nanoseconds>(d)); - return steady_clock::now() - c_now < d ? cv_status::no_timeout : - cv_status::timeout; - - } - - inline cv_status wait_until( - unique_lock<mutex>& lk, - chrono::time_point<chrono::system_clock, chrono::nanoseconds> tp) - { - using namespace chrono; - nanoseconds d = tp.time_since_epoch(); - timespec ts = boost::detail::to_timespec(d); - if (do_wait_until(lk, ts)) return cv_status::no_timeout; - else return cv_status::timeout; + return wait_until(lock, chrono::steady_clock::now() + d); } -#endif -#else // defined BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC -#ifdef BOOST_THREAD_USES_CHRONO - - template <class Duration> - cv_status - wait_until( - unique_lock<mutex>& lock, - const chrono::time_point<chrono::steady_clock, Duration>& t) - { - using namespace chrono; - typedef time_point<steady_clock, nanoseconds> nano_sys_tmpt; - wait_until(lock, - nano_sys_tmpt(ceil<nanoseconds>(t.time_since_epoch()))); - return steady_clock::now() < t ? cv_status::no_timeout : - cv_status::timeout; - } - - template <class Clock, class Duration> - cv_status + template <class Duration, class Predicate> + bool wait_until( - unique_lock<mutex>& lock, - const chrono::time_point<Clock, Duration>& t) - { - using namespace chrono; - steady_clock::time_point s_now = steady_clock::now(); - typename Clock::time_point c_now = Clock::now(); - wait_until(lock, s_now + ceil<nanoseconds>(t - c_now)); - return Clock::now() < t ? cv_status::no_timeout : cv_status::timeout; - } - - template <class Rep, class Period> - cv_status - wait_for( - unique_lock<mutex>& lock, - const chrono::duration<Rep, Period>& d) - { - using namespace chrono; - steady_clock::time_point c_now = steady_clock::now(); - wait_until(lock, c_now + ceil<nanoseconds>(d)); - return steady_clock::now() - c_now < d ? cv_status::no_timeout : - cv_status::timeout; - } - - inline cv_status wait_until( - unique_lock<mutex>& lk, - chrono::time_point<chrono::steady_clock, chrono::nanoseconds> tp) + unique_lock<mutex>& lock, + const chrono::time_point<detail::internal_chrono_clock, Duration>& t, + Predicate pred) { - using namespace chrono; - nanoseconds d = tp.time_since_epoch(); - timespec ts = boost::detail::to_timespec(d); - if (do_wait_until(lk, ts)) return cv_status::no_timeout; - else return cv_status::timeout; + const detail::internal_platform_timepoint ts(t); + while (!pred()) + { + if (!do_wait_until(lock, ts)) break; // timeout occurred + } + return pred(); } -#endif - -#endif // defined BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC -#ifdef BOOST_THREAD_USES_CHRONO template <class Clock, class Duration, class Predicate> bool wait_until( @@ -331,12 +304,18 @@ namespace boost const chrono::time_point<Clock, Duration>& t, Predicate pred) { + // The system time may jump while this function is waiting. To compensate for this + // and time out near the correct time, we call do_wait_until() in a loop with a + // short timeout and recheck the time remaining each time through the loop. + typedef typename common_type<Duration, typename Clock::duration>::type common_duration; while (!pred()) { - if (wait_until(lock, t) == cv_status::timeout) - return pred(); + common_duration d(t - Clock::now()); + if (d <= common_duration::zero()) break; // timeout occurred + d = (std::min)(d, common_duration(chrono::milliseconds(BOOST_THREAD_POLL_INTERVAL_MILLISECONDS))); + do_wait_until(lock, detail::internal_platform_clock::now() + detail::platform_duration(d)); } - return true; + return pred(); } template <class Rep, class Period, class Predicate> @@ -346,7 +325,7 @@ namespace boost const chrono::duration<Rep, Period>& d, Predicate pred) { - return wait_until(lock, chrono::steady_clock::now() + d, boost::move(pred)); + return wait_until(lock, chrono::steady_clock::now() + d, boost::move(pred)); } #endif @@ -359,15 +338,11 @@ namespace boost void notify_one() BOOST_NOEXCEPT; void notify_all() BOOST_NOEXCEPT; - - }; BOOST_THREAD_DECL void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk); - } - #include <boost/config/abi_suffix.hpp> #endif |