From patchwork Thu Sep 22 13:30:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 15904 Received: (qmail 83542 invoked by alias); 22 Sep 2016 13:31:10 -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 83466 invoked by uid 89); 22 Sep 2016 13:31:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=Days, Components, 3811, microsecond X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: carlos@redhat.com, joseph@codesourcery.com Subject: [PATCH 5/6] Installed-header hygiene (BZ#20366): time.h types. Date: Thu, 22 Sep 2016 09:30:53 -0400 Message-Id: <20160922133054.22210-13-zackw@panix.com> In-Reply-To: <20160922133054.22210-12-zackw@panix.com> References: <20160922133054.22210-1-zackw@panix.com> <20160922133054.22210-2-zackw@panix.com> <20160922133054.22210-3-zackw@panix.com> <20160922133054.22210-4-zackw@panix.com> <20160922133054.22210-5-zackw@panix.com> <20160922133054.22210-6-zackw@panix.com> <20160922133054.22210-7-zackw@panix.com> <20160922133054.22210-8-zackw@panix.com> <20160922133054.22210-9-zackw@panix.com> <20160922133054.22210-10-zackw@panix.com> <20160922133054.22210-11-zackw@panix.com> <20160922133054.22210-12-zackw@panix.com> MIME-Version: 1.0 Many headers are expected to expose a subset of the type definitions in time.h. time.h has a whole bunch of messy logic for conditionally defining some its types and structs, but, as best I can tell, this has never worked 100%. In particular, __need_timespec is ineffective if _TIME_H has already been defined, which means that if you compile #include #include with e.g. -fsyntax-only -std=c89 -Wall -Wsystem-headers, you will get In file included from test.c:2:0: /usr/include/sched.h:74:57: warning: "struct timespec" declared inside parameter list will not be visible outside of this definition or declaration extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW; ^~~~~~~~ And if you want to _use_ sched_rr_get_interval in a TU compiled that way, you're hosed. This patch replaces all of that with small bits/types/TYPE.h headers as introduced earlier. time.h and bits/time.h are now *much* simpler, and a lot of other headers are slightly simpler. * time/time.h, bits/time.h, sysdeps/unix/sysv/linux/bits/time.h: Remove all logic conditional on __need macros. Move all the conditionally defined types to their own headers... * time/bits/types/clock_t.h: Define clock_t here. * time/bits/types/clockid_t.h: Define clockid_t here. * time/bits/types/struct_itimerspec.h: Define struct itimerspec here. * time/bits/types/struct_timespec.h: Define struct timespec here. * time/bits/types/struct_timeval.h: Define struct timeval here. * time/bits/types/struct_tm.h: Define struct tm here. * time/bits/types/time_t.h: Define time_t here. * time/bits/types/timer_t.h: Define timer_t here. * time/Makefile: Install the new headers. * bits/resource.h, io/fcntl.h, io/sys/poll.h, io/sys/stat.h * io/utime.h, misc/sys/select.h, posix/sched.h, posix/sys/times.h * posix/sys/types.h, resolv/netdb.h, rt/aio.h, rt/mqueue.h * signal/signal.h, pthread/semaphore.h, sysdeps/nptl/pthread.h * sysdeps/unix/sysv/linux/alpha/bits/resource.h * sysdeps/unix/sysv/linux/alpha/sys/acct.h * sysdeps/unix/sysv/linux/bits/resource.h * sysdeps/unix/sysv/linux/bits/timex.h * sysdeps/unix/sysv/linux/mips/bits/resource.h * sysdeps/unix/sysv/linux/net/ppp_defs.h * sysdeps/unix/sysv/linux/sparc/bits/resource.h * sysdeps/unix/sysv/linux/sys/acct.h * sysdeps/unix/sysv/linux/sys/timerfd.h * sysvipc/sys/msg.h, sysvipc/sys/sem.h, sysvipc/sys/shm.h * time/sys/time.h, time/sys/timeb.h Use the new bits/types headers. * include/time.h: Remove __need logic. * include/bits/time.h * include/bits/types/clock_t.h, include/bits/types/clockid_t.h * include/bits/types/time_t.h, include/bits/types/timer_t.h * include/bits/types/struct_itimerspec.h * include/bits/types/struct_timespec.h * include/bits/types/struct_timeval.h * include/bits/types/struct_tm.h: New wrapper headers. --- bits/resource.h | 3 +- bits/time.h | 72 +++----- include/bits/types/clock_t.h | 1 + include/bits/types/clockid_t.h | 1 + include/bits/types/struct_itimerspec.h | 1 + include/bits/types/struct_timespec.h | 1 + include/bits/types/struct_timeval.h | 1 + include/bits/types/struct_tm.h | 1 + include/bits/types/time_t.h | 1 + include/bits/types/timer_t.h | 1 + include/time.h | 7 +- io/fcntl.h | 3 +- io/sys/poll.h | 3 +- io/sys/stat.h | 13 +- io/utime.h | 3 +- misc/sys/select.h | 8 +- posix/sched.h | 9 +- posix/sys/times.h | 4 +- posix/sys/types.h | 9 +- resolv/netdb.h | 3 +- rt/aio.h | 3 +- rt/mqueue.h | 3 +- signal/signal.h | 3 +- sysdeps/nptl/pthread.h | 1 + sysdeps/pthread/semaphore.h | 3 +- sysdeps/unix/sysv/linux/alpha/bits/resource.h | 3 +- sysdeps/unix/sysv/linux/alpha/sys/acct.h | 4 +- sysdeps/unix/sysv/linux/bits/resource.h | 3 +- sysdeps/unix/sysv/linux/bits/time.h | 68 +++----- sysdeps/unix/sysv/linux/bits/timex.h | 1 + sysdeps/unix/sysv/linux/mips/bits/resource.h | 3 +- sysdeps/unix/sysv/linux/net/ppp_defs.h | 4 +- sysdeps/unix/sysv/linux/sparc/bits/resource.h | 3 +- sysdeps/unix/sysv/linux/sys/acct.h | 3 +- sysdeps/unix/sysv/linux/sys/timerfd.h | 1 + sysvipc/sys/msg.h | 3 +- sysvipc/sys/sem.h | 3 +- sysvipc/sys/shm.h | 3 +- time/Makefile | 7 +- time/bits/types/clock_t.h | 15 ++ time/bits/types/clockid_t.h | 9 + time/bits/types/struct_itimerspec.h | 14 ++ time/bits/types/struct_timespec.h | 14 ++ time/bits/types/struct_timeval.h | 13 ++ time/bits/types/struct_tm.h | 33 ++++ time/bits/types/time_t.h | 14 ++ time/bits/types/timer_t.h | 9 + time/sys/time.h | 9 +- time/sys/timeb.h | 4 +- time/time.h | 237 +++++++------------------- 50 files changed, 294 insertions(+), 344 deletions(-) create mode 100644 include/bits/types/clock_t.h create mode 100644 include/bits/types/clockid_t.h create mode 100644 include/bits/types/struct_itimerspec.h create mode 100644 include/bits/types/struct_timespec.h create mode 100644 include/bits/types/struct_timeval.h create mode 100644 include/bits/types/struct_tm.h create mode 100644 include/bits/types/time_t.h create mode 100644 include/bits/types/timer_t.h create mode 100644 time/bits/types/clock_t.h create mode 100644 time/bits/types/clockid_t.h create mode 100644 time/bits/types/struct_itimerspec.h create mode 100644 time/bits/types/struct_timespec.h create mode 100644 time/bits/types/struct_timeval.h create mode 100644 time/bits/types/struct_tm.h create mode 100644 time/bits/types/time_t.h create mode 100644 time/bits/types/timer_t.h diff --git a/bits/resource.h b/bits/resource.h index 7d2d66c..5cd2fe5 100644 --- a/bits/resource.h +++ b/bits/resource.h @@ -129,8 +129,7 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN }; -#define __need_timeval -#include /* For `struct timeval'. */ +#include /* Structure which says how much of each resource has been used. */ struct rusage diff --git a/bits/time.h b/bits/time.h index 19c7ab0..84e0e94 100644 --- a/bits/time.h +++ b/bits/time.h @@ -20,9 +20,10 @@ * Never include this file directly; use instead. */ -#ifndef __need_timeval -# ifndef _BITS_TIME_H -# define _BITS_TIME_H 1 +#ifndef _BITS_TIME_H +#define _BITS_TIME_H 1 + +#include /* ISO/IEC 9899:1999 7.23.1: Components of time The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is @@ -30,51 +31,34 @@ /* CAE XSH, Issue 4, Version 2: The value of CLOCKS_PER_SEC is required to be 1 million on all XSI-conformant systems. */ -# define CLOCKS_PER_SEC ((clock_t) 1000000) +#define CLOCKS_PER_SEC ((__clock_t) 1000000) -# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K +#if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \ + && !defined __USE_XOPEN2K /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK presents the real value for clock ticks per second for the system. */ -# include extern long int __sysconf (int); -# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */ -# endif - -# ifdef __USE_POSIX199309 -/* Identifier for system-wide realtime clock. */ -# define CLOCK_REALTIME 0 -/* Monotonic system-wide clock. */ -# define CLOCK_MONOTONIC 1 -/* High-resolution timer from the CPU. */ -# define CLOCK_PROCESS_CPUTIME_ID 2 -/* Thread-specific CPU-time clock. */ -# define CLOCK_THREAD_CPUTIME_ID 3 -/* Monotonic system-wide clock, not adjusted for frequency scaling. */ -# define CLOCK_MONOTONIC_RAW 4 -/* Identifier for system-wide realtime clock, updated only on ticks. */ -# define CLOCK_REALTIME_COARSE 5 -/* Monotonic system-wide clock, updated only on ticks. */ -# define CLOCK_MONOTONIC_COARSE 6 - -/* Flag to indicate time is absolute. */ -# define TIMER_ABSTIME 1 -# endif - -# endif /* bits/time.h */ +# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */ #endif -#ifdef __need_timeval -# undef __need_timeval -# ifndef _STRUCT_TIMEVAL -# define _STRUCT_TIMEVAL 1 -# include +#ifdef __USE_POSIX199309 +/* Identifier for system-wide realtime clock. */ +# define CLOCK_REALTIME 0 +/* Monotonic system-wide clock. */ +# define CLOCK_MONOTONIC 1 +/* High-resolution timer from the CPU. */ +# define CLOCK_PROCESS_CPUTIME_ID 2 +/* Thread-specific CPU-time clock. */ +# define CLOCK_THREAD_CPUTIME_ID 3 +/* Monotonic system-wide clock, not adjusted for frequency scaling. */ +# define CLOCK_MONOTONIC_RAW 4 +/* Identifier for system-wide realtime clock, updated only on ticks. */ +# define CLOCK_REALTIME_COARSE 5 +/* Monotonic system-wide clock, updated only on ticks. */ +# define CLOCK_MONOTONIC_COARSE 6 -/* A time value that is accurate to the nearest - microsecond but also has a range of years. */ -struct timeval - { - __time_t tv_sec; /* Seconds. */ - __suseconds_t tv_usec; /* Microseconds. */ - }; -# endif /* struct timeval */ -#endif /* need timeval */ +/* Flag to indicate time is absolute. */ +# define TIMER_ABSTIME 1 +#endif + +#endif /* bits/time.h */ diff --git a/include/bits/types/clock_t.h b/include/bits/types/clock_t.h new file mode 100644 index 0000000..a08940d --- /dev/null +++ b/include/bits/types/clock_t.h @@ -0,0 +1 @@ +#include "../../time/bits/types/clock_t.h" diff --git a/include/bits/types/clockid_t.h b/include/bits/types/clockid_t.h new file mode 100644 index 0000000..fb0a514 --- /dev/null +++ b/include/bits/types/clockid_t.h @@ -0,0 +1 @@ +#include "../../time/bits/types/clockid_t.h" diff --git a/include/bits/types/struct_itimerspec.h b/include/bits/types/struct_itimerspec.h new file mode 100644 index 0000000..7d325d6 --- /dev/null +++ b/include/bits/types/struct_itimerspec.h @@ -0,0 +1 @@ +#include "../../time/bits/types/struct_itimerspec.h" diff --git a/include/bits/types/struct_timespec.h b/include/bits/types/struct_timespec.h new file mode 100644 index 0000000..b8ec6a3 --- /dev/null +++ b/include/bits/types/struct_timespec.h @@ -0,0 +1 @@ +#include "../../time/bits/types/struct_timespec.h" diff --git a/include/bits/types/struct_timeval.h b/include/bits/types/struct_timeval.h new file mode 100644 index 0000000..5d2cb78 --- /dev/null +++ b/include/bits/types/struct_timeval.h @@ -0,0 +1 @@ +#include "../../time/bits/types/struct_timeval.h" diff --git a/include/bits/types/struct_tm.h b/include/bits/types/struct_tm.h new file mode 100644 index 0000000..b70ac52 --- /dev/null +++ b/include/bits/types/struct_tm.h @@ -0,0 +1 @@ +#include "../../time/bits/types/struct_tm.h" diff --git a/include/bits/types/time_t.h b/include/bits/types/time_t.h new file mode 100644 index 0000000..16e75e1 --- /dev/null +++ b/include/bits/types/time_t.h @@ -0,0 +1 @@ +#include "../../time/bits/types/time_t.h" diff --git a/include/bits/types/timer_t.h b/include/bits/types/timer_t.h new file mode 100644 index 0000000..e6b279b --- /dev/null +++ b/include/bits/types/timer_t.h @@ -0,0 +1 @@ +#include "../../time/bits/types/timer_t.h" diff --git a/include/time.h b/include/time.h index 8dd10dc..684ceb8 100644 --- a/include/time.h +++ b/include/time.h @@ -1,8 +1,7 @@ #ifndef _TIME_H -#if defined __need_time_t || defined __need_clock_t || defined __need_timespec || defined _ISOMAC -# include