diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-05-20 18:23:01 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-06-12 17:11:36 -0400 |
| commit | 46ee3da55ee36af9c930556ad4fca3f69434a067 (patch) | |
| tree | b8dec7151e14b7ba37867a5a6a65c934255cfb64 /posix/Makefile | |
| parent | 4bad368d9f13c2d8b8d2b2cea89a61916223d882 (diff) | |
| download | glibc-46ee3da55ee36af9c930556ad4fca3f69434a067.zip glibc-46ee3da55ee36af9c930556ad4fca3f69434a067.tar.gz glibc-46ee3da55ee36af9c930556ad4fca3f69434a067.tar.bz2 | |
Remove __need_schedparam and __cpu_set_t_defined.
bits/sched.h has logic to expose only an impl-namespace variant of
struct sched_param (i.e. struct __sched_param), but nothing uses it,
and the only header that includes bits/sched.h is sched.h. The
__need_schedparam logic can therefore be removed.
bits/sched.h also has a great deal of code relating to cpu_set_t
objects that was *almost* the same between the two versions of
bits/sched.h in the tree; a little spelunking indicated that this is
because some bug fixes got applied to the Linux-specific bits/sched.h
but not the generic one. Introduce a new header, bits/cpu-set.h,
containing the version of that code with the bugfixes, have sched.h
include it directly, and delete all of the code from both versions of
bits/sched.h.
Also remove the unnecessary name mangling in the definition of struct
sched_param -- POSIX specifies a field 'sched_priority', so there is
no reason to define it as '__sched_priority' and then paper over that
with a macro. (Just in case someone was using the internal name,
'sched_priority' remains a macro defined to expand to itself, and
'__sched_priority' now expands to 'sched_priority'.)
Finally, as long as I'm touching these files anyway, merge new
constants from linux/sched.h into the Linux bits/sched.h.
* bits/sched.h: Remove __need_schedparam logic and replace with a
normal multiple-include guard. Change field name in struct
sched_param from __sched_priority to sched_priority. Delete
everything under #ifndef __cpu_set_t_defined.
* sysdeps/unix/sysv/linux/bits/sched.h: Likewise. Also sync with
kernel sched.h, adding SCHED_ISO and SCHED_DEADLINE constants.
* posix/sched.h: Include bits/cpu-set.h as well as bits/sched.h.
For compatibility, #define sched_priority to itself, and #define
__sched_priority as sched_priority.
* posix/bits/cpu-set.h: New file containing, verbatim, the code
that was under #ifndef __cpu_set_t_defined in
sysdeps/unix/sysv/linux/bits/sched.h.
* include/bits/cpu-set.h: New wrapper.
* posix/Makefile: Install bits/cpu-set.h.
Diffstat (limited to 'posix/Makefile')
| -rw-r--r-- | posix/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/Makefile b/posix/Makefile index 52b022c..1c328b8 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -30,8 +30,8 @@ headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \ bits/posix1_lim.h bits/posix2_lim.h bits/posix_opt.h \ bits/local_lim.h tar.h bits/utsname.h bits/confname.h \ bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h \ - bits/sched.h re_comp.h wait.h bits/environments.h cpio.h \ - spawn.h bits/unistd.h + bits/sched.h bits/cpu-set.h re_comp.h wait.h bits/environments.h \ + cpio.h spawn.h bits/unistd.h routines := \ uname \ |