mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 04:01:10 +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.
107 lines
3.2 KiB
C
107 lines
3.2 KiB
C
/* 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/>. */
|
|
|
|
#ifndef _SYS_ACCT_H
|
|
#define _SYS_ACCT_H 1
|
|
|
|
#include <sys/types.h>
|
|
#include <stdint.h>
|
|
#include <endian.h>
|
|
#include <bits/types/time_t.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#define ACCT_COMM 16
|
|
|
|
/*
|
|
comp_t is a 16-bit "floating" point number with a 3-bit base 8
|
|
exponent and a 13-bit fraction. See linux/kernel/acct.c for the
|
|
specific encoding system used.
|
|
*/
|
|
|
|
typedef uint16_t comp_t;
|
|
|
|
struct acct
|
|
{
|
|
char ac_flag; /* Flags. */
|
|
uint16_t ac_uid; /* Real user ID. */
|
|
uint16_t ac_gid; /* Real group ID. */
|
|
uint16_t ac_tty; /* Controlling terminal. */
|
|
uint32_t ac_btime; /* Beginning time. */
|
|
comp_t ac_utime; /* User time. */
|
|
comp_t ac_stime; /* System time. */
|
|
comp_t ac_etime; /* Elapsed time. */
|
|
comp_t ac_mem; /* Average memory usage. */
|
|
comp_t ac_io; /* Chars transferred. */
|
|
comp_t ac_rw; /* Blocks read or written. */
|
|
comp_t ac_minflt; /* Minor pagefaults. */
|
|
comp_t ac_majflt; /* Major pagefaults. */
|
|
comp_t ac_swaps; /* Number of swaps. */
|
|
uint32_t ac_exitcode; /* Process exitcode. */
|
|
char ac_comm[ACCT_COMM+1]; /* Command name. */
|
|
char ac_pad[10]; /* Padding bytes. */
|
|
};
|
|
|
|
|
|
struct acct_v3
|
|
{
|
|
char ac_flag; /* Flags */
|
|
char ac_version; /* Always set to ACCT_VERSION */
|
|
uint16_t ac_tty; /* Control Terminal */
|
|
uint32_t ac_exitcode; /* Exitcode */
|
|
uint32_t ac_uid; /* Real User ID */
|
|
uint32_t ac_gid; /* Real Group ID */
|
|
uint32_t ac_pid; /* Process ID */
|
|
uint32_t ac_ppid; /* Parent Process ID */
|
|
uint32_t ac_btime; /* Process Creation Time */
|
|
float ac_etime; /* Elapsed Time */
|
|
comp_t ac_utime; /* User Time */
|
|
comp_t ac_stime; /* System Time */
|
|
comp_t ac_mem; /* Average Memory Usage */
|
|
comp_t ac_io; /* Chars Transferred */
|
|
comp_t ac_rw; /* Blocks Read or Written */
|
|
comp_t ac_minflt; /* Minor Pagefaults */
|
|
comp_t ac_majflt; /* Major Pagefaults */
|
|
comp_t ac_swaps; /* Number of Swaps */
|
|
char ac_comm[ACCT_COMM]; /* Command Name */
|
|
};
|
|
|
|
|
|
enum
|
|
{
|
|
AFORK = 0x01, /* Has executed fork, but no exec. */
|
|
ASU = 0x02, /* Used super-user privileges. */
|
|
ACORE = 0x08, /* Dumped core. */
|
|
AXSIG = 0x10 /* Killed by a signal. */
|
|
};
|
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define ACCT_BYTEORDER 0x80 /* Accounting file is big endian. */
|
|
#else
|
|
# define ACCT_BYTEORDER 0x00 /* Accounting file is little endian. */
|
|
#endif
|
|
|
|
#define AHZ 100
|
|
|
|
|
|
/* Switch process accounting on and off. */
|
|
extern int acct (const char *__filename) __THROW;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/acct.h */
|