From patchwork Sat Nov 2 10:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Crowe X-Patchwork-Id: 35576 Received: (qmail 65882 invoked by alias); 2 Nov 2019 10:53:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 65874 invoked by uid 89); 2 Nov 2019 10:53:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: avasout02.plus.net X-Clacks-Overhead: "GNU Terry Pratchett" X-CM-Score: 0.00 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mcrowe.com; s=20191005; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: In-Reply-To:References; bh=iIy9GeFSN+nd8cpeWrnGmLg+eGnHGbqJO8m6zselxG4=; b=Fe GpsxJ8d8oAHyNNZSfWytISL3o2p2cOLmMJhKkBy2WdI08udTWwQWl78G7BUg64HnsWqsvbRr3ME0L r/5evrpc4Gf+p4GGmDB5I3Wq5S+ayBZIBX5RSjPCHCaHbp6Y0IdcH8mCnwr0Vq1aZiLzKW9ah5v1P aQB3iAtXVVzFSCN+hhfqw2r/LIuMv4rdobcRTi3FLXVtqO7pB0Ri7qPdl5ZWCiO+TwNd577vWzMmb AUL4VG2Q/f/h6O8o0hSLYlS9mSJ7WNvJgpnX7cObRlTzIxBPiyc2YilMkWMwQhhiJ37zBC2NRc1HJ TsW+5DfReaa9L8TaJ82tmyaTIpXfmSAg==; From: Mike Crowe To: libc-alpha@sourceware.org Cc: Mike Crowe , Adhemerval Zanella , Joseph Myers , Rafal Luzynski , Florian Weimer Subject: [PATCH v2] nptl: Fix niggles with pthread_clockjoin_np Date: Sat, 2 Nov 2019 10:52:48 +0000 Message-Id: MIME-Version: 1.0 Joseph Myers spotted[1] that 69ca4b54c151cec42ccca5e05790efc1a8206b47 added pthread_clockjoin_np to sysdeps/nptl/pthread.h but not to its hppa-specific equivalent sysdeps/unix/sysv/linux/hppa/pthread.h. Rafal Luzynski spotted[2] typos in the NEWS entry and manual updates too. Florian Weimer spotted[3] that the clockid parameter was not using a reserved identifier in pthread.h. [1] https://sourceware.org/ml/libc-alpha/2019-11/msg00016.html [2] https://sourceware.org/ml/libc-alpha/2019-11/msg00019.html [3] https://sourceware.org/ml/libc-alpha/2019-11/msg00022.html Fixes: 69ca4b54c151cec42ccca5e05790efc1a8206b47 --- NEWS | 2 +- manual/threads.texi | 2 +- sysdeps/nptl/pthread.h | 2 +- sysdeps/unix/sysv/linux/hppa/pthread.h | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) base-commit: 42893aa38fd6041d349ea0427c4d5ccbacd9a2be diff --git a/NEWS b/NEWS index 3006b1a..2fc1f89 100644 --- a/NEWS +++ b/NEWS @@ -35,7 +35,7 @@ Major new features: tz_dsttime fields are zero. * The function pthread_clockjoin_np has been added, enabling join with a - terminated thread with an specific clock. It allows waiting against + terminated thread with a specific clock. It allows waiting against CLOCK_MONOTONIC and CLOCK_REALTIME. This function is a GNU extension. Deprecated and removed features, and other changes affecting compatibility: diff --git a/manual/threads.texi b/manual/threads.texi index e40b55c..0858ef8 100644 --- a/manual/threads.texi +++ b/manual/threads.texi @@ -759,7 +759,7 @@ will wait forever in the same way as @code{pthread_join}. const struct timespec *@var{abstime}) @standards{GNU, pthread.h} @safety{@prelim{}@mtsafe{}@asunsafe{@asulock{}}@acunsafe{@aculock{}}} -Behaves like @code{pthread_timedjoin_np} except that time absolute time in +Behaves like @code{pthread_timedjoin_np} except that the absolute time in @var{abstime} is measured against the clock specified by @var{clockid}. @end deftypefun diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index d2fe6b7..a4ff323 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -272,7 +272,7 @@ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, This function is a cancellation point and therefore not marked with __THROW. */ extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, - clockid_t clockid, + clockid_t __clockid, const struct timespec *__abstime); #endif diff --git a/sysdeps/unix/sysv/linux/hppa/pthread.h b/sysdeps/unix/sysv/linux/hppa/pthread.h index 424135c..300c187 100644 --- a/sysdeps/unix/sysv/linux/hppa/pthread.h +++ b/sysdeps/unix/sysv/linux/hppa/pthread.h @@ -238,6 +238,17 @@ extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW; __THROW. */ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, const struct timespec *__abstime); + +/* Make calling thread wait for termination of the thread TH, but only + until TIMEOUT measured against the clock specified by CLOCKID. The + exit status of the thread is stored in *THREAD_RETURN, if + THREAD_RETURN is not NULL. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, + clockid_t __clockid, + const struct timespec *__abstime); #endif /* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.