[15/23] nptl: Remove unused nptl/pthread_getcpuclockid.c implementation

Message ID 1d6f16c3bc28ca3aef112c41f7cf2a4f796c0dae.1620838411.git.fweimer@redhat.com
State New
Headers show
Series
  • nptl: Move almost all remaining functions into libc
Related show

Commit Message

Mark Brown via Libc-alpha May 12, 2021, 4:58 p.m.
---
 nptl/pthread_getcpuclockid.c | 54 ------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 nptl/pthread_getcpuclockid.c

-- 
2.31.1

Comments

Mark Brown via Libc-alpha May 13, 2021, 8:22 p.m. | #1
On 12/05/2021 13:58, Florian Weimer via Libc-alpha wrote:
> ---


LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>


>  nptl/pthread_getcpuclockid.c | 54 ------------------------------------

>  1 file changed, 54 deletions(-)

>  delete mode 100644 nptl/pthread_getcpuclockid.c

> 

> diff --git a/nptl/pthread_getcpuclockid.c b/nptl/pthread_getcpuclockid.c

> deleted file mode 100644

> index ebc48d59ea..0000000000

> --- a/nptl/pthread_getcpuclockid.c

> +++ /dev/null

> @@ -1,54 +0,0 @@

> -/* Copyright (C) 2000-2021 Free Software Foundation, Inc.

> -   This file is part of the GNU C Library.

> -

> -   The GNU C Library is free software; you can redistribute it and/or

> -   modify it under the terms of the GNU Lesser General Public License as

> -   published by the Free Software Foundation; either version 2.1 of the

> -   License, or (at your option) any later version.

> -

> -   The GNU C 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

> -   Lesser General Public License for more details.

> -

> -   You should have received a copy of the GNU Lesser General Public

> -   License along with the GNU C Library; see the file COPYING.LIB.  If

> -   not, see <https://www.gnu.org/licenses/>.  */

> -

> -#include <errno.h>

> -#include <pthreadP.h>

> -#include <sys/time.h>

> -#include <tls.h>

> -

> -

> -int

> -pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid)

> -{

> -  struct pthread *pd = (struct pthread *) threadid;

> -

> -  /* Make sure the descriptor is valid.  */

> -  if (INVALID_TD_P (pd))

> -    /* Not a valid thread handle.  */

> -    return ESRCH;

> -

> -#ifdef CLOCK_THREAD_CPUTIME_ID

> -  /* We need to store the thread ID in the CLOCKID variable together

> -     with a number identifying the clock.  We reserve the low 3 bits

> -     for the clock ID and the rest for the thread ID.  This is

> -     problematic if the thread ID is too large.  But 29 bits should be

> -     fine.

> -

> -     If some day more clock IDs are needed the ID part can be

> -     enlarged.  The IDs are entirely internal.  */

> -  if (pd->tid >= 1 << (8 * sizeof (*clockid) - CLOCK_IDFIELD_SIZE))

> -    return ERANGE;

> -

> -  /* Store the number.  */

> -  *clockid = CLOCK_THREAD_CPUTIME_ID | (pd->tid << CLOCK_IDFIELD_SIZE);

> -

> -  return 0;

> -#else

> -  /* We don't have a timer for that.  */

> -  return ENOENT;

> -#endif

> -}

>

Patch

diff --git a/nptl/pthread_getcpuclockid.c b/nptl/pthread_getcpuclockid.c
deleted file mode 100644
index ebc48d59ea..0000000000
--- a/nptl/pthread_getcpuclockid.c
+++ /dev/null
@@ -1,54 +0,0 @@ 
-/* Copyright (C) 2000-2021 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthreadP.h>
-#include <sys/time.h>
-#include <tls.h>
-
-
-int
-pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid)
-{
-  struct pthread *pd = (struct pthread *) threadid;
-
-  /* Make sure the descriptor is valid.  */
-  if (INVALID_TD_P (pd))
-    /* Not a valid thread handle.  */
-    return ESRCH;
-
-#ifdef CLOCK_THREAD_CPUTIME_ID
-  /* We need to store the thread ID in the CLOCKID variable together
-     with a number identifying the clock.  We reserve the low 3 bits
-     for the clock ID and the rest for the thread ID.  This is
-     problematic if the thread ID is too large.  But 29 bits should be
-     fine.
-
-     If some day more clock IDs are needed the ID part can be
-     enlarged.  The IDs are entirely internal.  */
-  if (pd->tid >= 1 << (8 * sizeof (*clockid) - CLOCK_IDFIELD_SIZE))
-    return ERANGE;
-
-  /* Store the number.  */
-  *clockid = CLOCK_THREAD_CPUTIME_ID | (pd->tid << CLOCK_IDFIELD_SIZE);
-
-  return 0;
-#else
-  /* We don't have a timer for that.  */
-  return ENOENT;
-#endif
-}