mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 12:41:05 +00:00
05b68e14b1
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 <time.h>
#include <sched.h>
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.
65 lines
2.4 KiB
C
65 lines
2.4 KiB
C
/* System-dependent timing definitions. Generic version.
|
|
Copyright (C) 1996-2016 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; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
* Never include this file directly; use <time.h> instead.
|
|
*/
|
|
|
|
#ifndef _BITS_TIME_H
|
|
#define _BITS_TIME_H 1
|
|
|
|
#include <bits/types.h>
|
|
|
|
/* ISO/IEC 9899:1999 7.23.1: Components of time
|
|
The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
|
|
the number per second of the value returned by the `clock' function. */
|
|
/* CAE XSH, Issue 4, Version 2: <time.h>
|
|
The value of CLOCKS_PER_SEC is required to be 1 million on all
|
|
XSI-conformant systems. */
|
|
#define CLOCKS_PER_SEC ((__clock_t) 1000000)
|
|
|
|
#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. */
|
|
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 */
|