Move NPTL-specific code to NPTL-specific header
Commit Message
* sysdeps/pthread/timer_routines.c: Include <timer_routines.h> instead
of <nptl/pthreadP.h>
(thread_attr_compare): Move function to...
* sysdeps/nptl/timer_routines.h: ... new header.
---
ChangeLog | 4 ++++
sysdeps/nptl/timer_routines.h | 51 ++++++++++++++++++++++++++++++++++++++++
sysdeps/pthread/timer_routines.c | 27 +--------------------
3 files changed, 56 insertions(+), 26 deletions(-)
create mode 100644 sysdeps/nptl/timer_routines.h
Comments
Samuel Thibault, on dim. 18 févr. 2018 03:00:50 +0100, wrote:
> * sysdeps/pthread/timer_routines.c: Include <timer_routines.h> instead
> of <nptl/pthreadP.h>
> (thread_attr_compare): Move function to...
> * sysdeps/nptl/timer_routines.h: ... new header.
I have eventually commited it.
Samuel
> ---
> ChangeLog | 4 ++++
> sysdeps/nptl/timer_routines.h | 51 ++++++++++++++++++++++++++++++++++++++++
> sysdeps/pthread/timer_routines.c | 27 +--------------------
> 3 files changed, 56 insertions(+), 26 deletions(-)
> create mode 100644 sysdeps/nptl/timer_routines.h
>
> diff --git a/ChangeLog b/ChangeLog
> index 4e8411f9bf..158d4f2474 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -7,6 +7,10 @@
> (__ptsname_r): Move implementation to...
> (__ptsname_internal): ... new function. Add filling the STP
> structure.
> + * sysdeps/pthread/timer_routines.c: Include <timer_routines.h> instead
> + of <nptl/pthreadP.h>
> + (thread_attr_compare): Move function to...
> + * sysdeps/nptl/timer_routines.h: ... new header.
>
> 2018-02-17 John David Anglin <danglin@gcc.gnu.org>
>
> diff --git a/sysdeps/nptl/timer_routines.h b/sysdeps/nptl/timer_routines.h
> new file mode 100644
> index 0000000000..9931015684
> --- /dev/null
> +++ b/sysdeps/nptl/timer_routines.h
> @@ -0,0 +1,51 @@
> +/* Helper code for POSIX timer implementation on NPTL.
> + Copyright (C) 2000-2018 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> + Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
> +
> + 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 <http://www.gnu.org/licenses/>. */
> +
> +#ifndef _TIMER_ROUTINES_H
> +#define _TIMER_ROUTINES_H 1
> +
> +#include <internaltypes.h>
> +#include <string.h>
> +
> +/* Compare two pthread_attr_t thread attributes for exact equality.
> + Returns 1 if they are equal, otherwise zero if they are not equal
> + or contain illegal values. This version is NPTL-specific for
> + performance reason. One could use the access functions to get the
> + values of all the fields of the attribute structure. */
> +static inline int
> +thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
> +{
> + struct pthread_attr *ileft = (struct pthread_attr *) left;
> + struct pthread_attr *iright = (struct pthread_attr *) right;
> +
> + return (ileft->flags == iright->flags
> + && ileft->schedpolicy == iright->schedpolicy
> + && (ileft->schedparam.sched_priority
> + == iright->schedparam.sched_priority)
> + && ileft->guardsize == iright->guardsize
> + && ileft->stackaddr == iright->stackaddr
> + && ileft->stacksize == iright->stacksize
> + && ((ileft->cpuset == NULL && iright->cpuset == NULL)
> + || (ileft->cpuset != NULL && iright->cpuset != NULL
> + && ileft->cpusetsize == iright->cpusetsize
> + && memcmp (ileft->cpuset, iright->cpuset,
> + ileft->cpusetsize) == 0)));
> +}
> +
> +#endif /* timer_routines.h */
> diff --git a/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c
> index f059beb4c5..84861b9557 100644
> --- a/sysdeps/pthread/timer_routines.c
> +++ b/sysdeps/pthread/timer_routines.c
> @@ -29,7 +29,7 @@
> #include <sys/syscall.h>
>
> #include "posix-timer.h"
> -#include <nptl/pthreadP.h>
> +#include <internaltypes.h>
>
>
> /* Number of threads used. */
> @@ -482,31 +482,6 @@ __timer_thread_wakeup (struct thread_node *thread)
> }
>
>
> -/* Compare two pthread_attr_t thread attributes for exact equality.
> - Returns 1 if they are equal, otherwise zero if they are not equal
> - or contain illegal values. This version is NPTL-specific for
> - performance reason. One could use the access functions to get the
> - values of all the fields of the attribute structure. */
> -static int
> -thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
> -{
> - struct pthread_attr *ileft = (struct pthread_attr *) left;
> - struct pthread_attr *iright = (struct pthread_attr *) right;
> -
> - return (ileft->flags == iright->flags
> - && ileft->schedpolicy == iright->schedpolicy
> - && (ileft->schedparam.sched_priority
> - == iright->schedparam.sched_priority)
> - && ileft->guardsize == iright->guardsize
> - && ileft->stackaddr == iright->stackaddr
> - && ileft->stacksize == iright->stacksize
> - && ((ileft->cpuset == NULL && iright->cpuset == NULL)
> - || (ileft->cpuset != NULL && iright->cpuset != NULL
> - && ileft->cpusetsize == iright->cpusetsize
> - && memcmp (ileft->cpuset, iright->cpuset,
> - ileft->cpusetsize) == 0)));
> -}
> -
>
> /* Search the list of active threads and find one which has matching
> attributes. Global mutex lock must be held by caller. */
> --
> 2.16.1
>
@@ -7,6 +7,10 @@
(__ptsname_r): Move implementation to...
(__ptsname_internal): ... new function. Add filling the STP
structure.
+ * sysdeps/pthread/timer_routines.c: Include <timer_routines.h> instead
+ of <nptl/pthreadP.h>
+ (thread_attr_compare): Move function to...
+ * sysdeps/nptl/timer_routines.h: ... new header.
2018-02-17 John David Anglin <danglin@gcc.gnu.org>
new file mode 100644
@@ -0,0 +1,51 @@
+/* Helper code for POSIX timer implementation on NPTL.
+ Copyright (C) 2000-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
+
+ 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 <http://www.gnu.org/licenses/>. */
+
+#ifndef _TIMER_ROUTINES_H
+#define _TIMER_ROUTINES_H 1
+
+#include <internaltypes.h>
+#include <string.h>
+
+/* Compare two pthread_attr_t thread attributes for exact equality.
+ Returns 1 if they are equal, otherwise zero if they are not equal
+ or contain illegal values. This version is NPTL-specific for
+ performance reason. One could use the access functions to get the
+ values of all the fields of the attribute structure. */
+static inline int
+thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
+{
+ struct pthread_attr *ileft = (struct pthread_attr *) left;
+ struct pthread_attr *iright = (struct pthread_attr *) right;
+
+ return (ileft->flags == iright->flags
+ && ileft->schedpolicy == iright->schedpolicy
+ && (ileft->schedparam.sched_priority
+ == iright->schedparam.sched_priority)
+ && ileft->guardsize == iright->guardsize
+ && ileft->stackaddr == iright->stackaddr
+ && ileft->stacksize == iright->stacksize
+ && ((ileft->cpuset == NULL && iright->cpuset == NULL)
+ || (ileft->cpuset != NULL && iright->cpuset != NULL
+ && ileft->cpusetsize == iright->cpusetsize
+ && memcmp (ileft->cpuset, iright->cpuset,
+ ileft->cpusetsize) == 0)));
+}
+
+#endif /* timer_routines.h */
@@ -29,7 +29,7 @@
#include <sys/syscall.h>
#include "posix-timer.h"
-#include <nptl/pthreadP.h>
+#include <internaltypes.h>
/* Number of threads used. */
@@ -482,31 +482,6 @@ __timer_thread_wakeup (struct thread_node *thread)
}
-/* Compare two pthread_attr_t thread attributes for exact equality.
- Returns 1 if they are equal, otherwise zero if they are not equal
- or contain illegal values. This version is NPTL-specific for
- performance reason. One could use the access functions to get the
- values of all the fields of the attribute structure. */
-static int
-thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
-{
- struct pthread_attr *ileft = (struct pthread_attr *) left;
- struct pthread_attr *iright = (struct pthread_attr *) right;
-
- return (ileft->flags == iright->flags
- && ileft->schedpolicy == iright->schedpolicy
- && (ileft->schedparam.sched_priority
- == iright->schedparam.sched_priority)
- && ileft->guardsize == iright->guardsize
- && ileft->stackaddr == iright->stackaddr
- && ileft->stacksize == iright->stacksize
- && ((ileft->cpuset == NULL && iright->cpuset == NULL)
- || (ileft->cpuset != NULL && iright->cpuset != NULL
- && ileft->cpusetsize == iright->cpusetsize
- && memcmp (ileft->cpuset, iright->cpuset,
- ileft->cpusetsize) == 0)));
-}
-
/* Search the list of active threads and find one which has matching
attributes. Global mutex lock must be held by caller. */