From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 117327 invoked by alias); 8 Apr 2015 19:38:15 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 117310 invoked by uid 89); 8 Apr 2015 19:38:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 08 Apr 2015 19:38:10 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id AE2728E3FB; Wed, 8 Apr 2015 19:38:09 +0000 (UTC) Received: from localhost (ovpn-116-120.ams2.redhat.com [10.36.116.120]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t38Jc8hc007598; Wed, 8 Apr 2015 15:38:09 -0400 Date: Wed, 08 Apr 2015 19:38:00 -0000 From: Jonathan Wakely To: Torvald Riegel Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [patch] Fix shared_timed_mutex::try_lock_until() et al Message-ID: <20150408193808.GR9755@redhat.com> References: <20150407142830.GG9755@redhat.com> <1428512373.924.26.camel@triegel.csb> <20150408191159.GQ9755@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="95n2dZZDVPvlnkUw" Content-Disposition: inline In-Reply-To: <20150408191159.GQ9755@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-04/txt/msg00351.txt.bz2 --95n2dZZDVPvlnkUw Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 674 On 08/04/15 20:11 +0100, Jonathan Wakely wrote: >We can get rid of the _Mutex type then, and just use std::mutex, and >that also means we can provide the timed locking functions even when >!defined(_GTHREAD_USE_MUTEX_TIMEDLOCK). > >And so maybe we should use this fallback implementation instead of the >pthread_rwlock_t one when !defined(_GTHREAD_USE_MUTEX_TIMEDLOCK), so >that they have a complete std::shared_timed_mutex (this applies to at >least Darwin, not sure which other targets). Here's a further patch to do that (which really needs to go into 5.0 too, so we don't switch Darwin to the new pthread_rwlock_t version and then have to swtich it back again in 6.0). --95n2dZZDVPvlnkUw Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 4770 commit 20f08d3eac6ec88c83becb8f0cb2e65c10d3fe20 Author: Jonathan Wakely Date: Wed Apr 8 20:25:45 2015 +0100 * include/std/shared_mutex (shared_timed_mutex): Only use pthread_rwlock_t when the POSIX Timeouts option is supported. * testsuite/30_threads/shared_lock/cons/5.cc: Remove dg-require-gthreads-timed. * testsuite/30_threads/shared_lock/cons/6.cc: Likewise. * testsuite/30_threads/shared_lock/locking/3.cc: Likewise. * testsuite/30_threads/shared_lock/locking/4.cc: Likewise. diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex index 7f26465..351a4f6 100644 --- a/libstdc++-v3/include/std/shared_mutex +++ b/libstdc++-v3/include/std/shared_mutex @@ -57,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// shared_timed_mutex class shared_timed_mutex { -#ifdef _GLIBCXX_USE_PTHREAD_RWLOCK_T +#if defined(_GLIBCXX_USE_PTHREAD_RWLOCK_T) && _GTHREAD_USE_MUTEX_TIMEDLOCK typedef chrono::system_clock __clock_t; #ifdef PTHREAD_RWLOCK_INITIALIZER @@ -116,7 +116,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; } -#if _GTHREAD_USE_MUTEX_TIMEDLOCK template bool try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time) @@ -158,7 +157,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const auto __s_atime = __s_entry + __delta; return try_lock_until(__s_atime); } -#endif void unlock() @@ -200,7 +198,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; } -#if _GTHREAD_USE_MUTEX_TIMEDLOCK template bool try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time) @@ -258,7 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const auto __s_atime = __s_entry + __delta; return try_lock_shared_until(__s_atime); } -#endif void unlock_shared() @@ -266,7 +262,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION unlock(); } -#else // ! _GLIBCXX_USE_PTHREAD_RWLOCK_T +#else // ! (_GLIBCXX_USE_PTHREAD_RWLOCK_T && _GTHREAD_USE_MUTEX_TIMEDLOCK) // Must use the same clock as condition_variable typedef chrono::system_clock __clock_t; @@ -459,7 +455,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_gate1.notify_one(); } } -#endif // ! _GLIBCXX_USE_PTHREAD_RWLOCK_T +#endif // _GLIBCXX_USE_PTHREAD_RWLOCK_T && _GTHREAD_USE_MUTEX_TIMEDLOCK }; #endif // _GLIBCXX_HAS_GTHREADS diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc index 63ab514..9ec0498 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc @@ -3,7 +3,6 @@ // { dg-options " -std=gnu++14 -pthreads" { target *-*-solaris* } } // { dg-options " -std=gnu++14 " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } -// { dg-require-gthreads-timed "" } // Copyright (C) 2013-2015 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc index 8b2bcd5..2074bbe 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc @@ -3,7 +3,6 @@ // { dg-options " -std=gnu++14 -pthreads" { target *-*-solaris* } } // { dg-options " -std=gnu++14 " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } -// { dg-require-gthreads-timed "" } // Copyright (C) 2013-2015 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc index b67022a..4b653ea 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc @@ -3,7 +3,6 @@ // { dg-options " -std=gnu++14 -pthreads" { target *-*-solaris* } } // { dg-options " -std=gnu++14 " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } -// { dg-require-gthreads-timed "" } // Copyright (C) 2013-2015 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc index e87d0dd..afeefa2 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc @@ -3,7 +3,6 @@ // { dg-options " -std=gnu++14 -pthreads" { target *-*-solaris* } } // { dg-options " -std=gnu++14 " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } -// { dg-require-gthreads-timed "" } // Copyright (C) 2013-2015 Free Software Foundation, Inc. // --95n2dZZDVPvlnkUw--