mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-24 21:08:04 +03:00
11160cb76f
The types u_char, u_short, u_int, u_long, ushort, uint, ulong, u_int8_t,
u_int16_t, u_int32_t, u_int64_t, quad_t, and u_quad_t are BSDisms that
have never been standardized. While glibc should continue to *provide*
these types for compatibility's sake, its public headers should not
use them.
The meat of this change was mechanically generated by the following
shell command:
perl -pi~ -e '
s/\b(__)?u_char\b/unsigned char/g;
s/\b(__)?u_?short\b/unsigned short/g;
s/\b(__)?u_?int\b/unsigned int/g;
s/\b(__)?u_?long\b/unsigned long/g;
s/\b(__)?u_int8_t\b/uint8_t/g;
s/\b(__)?u_int16_t\b/uint16_t/g;
s/\b(__)?u_int32_t\b/uint32_t/g;
s/\b(__)?u_int64_t\b/uint64_t/g;
s/\b(__)?u_quad_t\b/uint64_t/g;
s/\b(__)?quad_t\b/uint64_t/g;
' $(grep -lE -e '\<((__)?(quad_t|u(short|int|long|_(char|short|int([0-9]+_t)?|long|quad_t))))\>' \
$(grep -LE '\<(_(SYS|BITS)_TYPES_H|rpc/(rpc|rpc_msg|types|xdr)\.h)\>' \
$(find . \( -false $(sed 's/^/-o -name /' all-installed-headers) \
\) -printf '%P\n' | sort -u)))
where 'all-installed-headers' was a list of the basenames of all installed
header files, manually extracted from the Makefiles. Non-installed
wrapper headers in include/ are also adjusted, for consistency.
I then manually fixed up indentation and line-wrapping.
sys/types.h and bits/types.h are excluded because they must continue
to define the u_* types (under __USE_MISC) for compatibility with
applications. They do not use these types themselves.
All headers that (transitively) include rpc/types.h are also excluded,
for three reasons. First, the u_* types are defined by rpc/types.h,
unconditionally (not just under __USE_MISC) so they are logically part
of the SunRPC API. Second, many of those headers appear to be
machine-generated. Third, it's my understanding that we are getting
rid of as much of SunRPC as possible in the near future.
(The one file under sunrpc/ that's touched, sunrpc/rpc/rpc_des.h, does
*not* include rpc/types.h. This may itself be a bug.)
After changing from u_intNN_t to uintNN_t, a number of headers now
need to include stdint.h to pick up those types. It might be more
hygenic, namespace-wise, to use __uintNN_t instead, but none of these
headers are bound by ISO or POSIX to do so, and it's unlikely that
anyone using them will be bothered. (The two files that were using
__-prefixed versions of the u_types, sysdeps/mach/hurd/net/route.h and
sysdeps/unix/sysv/linux/net/route.h, both already also contained uses of
the unprefixed versions.)
Some of these files directly included features.h and/or sys/cdefs.h,
which I removed, as the style generally seems to be to let sys/types.h
do that for us. (This does not change the set of definitions exposed
by any header; sys/types.h unconditionally includes both features.h
and sys/cdefs.h.)
One file included asm/types.h unnecessarily.
* bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h
* inet/protocols/routed.h, inet/protocols/talkd.h
* inet/protocols/timed.h, io/fts.h, nptl_db/thread_db.h
* resolv/arpa/nameser.h, resolv/resolv.h, sunrpc/rpc/rpc_des.h
* sysdeps/generic/netinet/if_ether.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/generic/netinet/ip.h, sysdeps/generic/netinet/tcp.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h, sysdeps/mach/hurd/net/ethernet.h
* sysdeps/mach/hurd/net/if_arp.h
* sysdeps/mach/hurd/net/if_ppp.h
* sysdeps/mach/hurd/net/route.h, sysdeps/mach/sys/reboot.h
* sysdeps/unix/sysv/linux/bits/in.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/net/route.h
* sysdeps/unix/sysv/linux/netinet/if_ether.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Change all uses of u_char to unsigned char,
u_short and ushort to unsigned short, u_int and uint to unsigned int,
u_long and ulong to unsigned long, u_int8_t to uint8_t,
u_int16_t to uint16_t, u_int32_t to uint32_t, quad_t to int64_t,
and u_int64_t and u_quad_t to uint64_t.
* mach/sys/reboot.h: Remove two casts of integer literals
to the types they already have.
* bits/in.h: Correct error in description of IP_MULTICAST_LOOP.
* sysdeps/unix/sysv/linux/bits/in.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/if_ether.h: Change a comment
from referring to 'unsigned char' to 'uint8_t' for consistency with
the macro definition below.
* gmon/sys/gmon.h, inet/netinet/igmp.h, inet/protocols/talkd.h
* io/fts.h, resolv/arpa/nameser.h, resolv/resolv.h
* sunrpc/rpc/rpc_des.h, sysdeps/generic/netinet/ip.h
* sysdeps/gnu/netinet/tcp.h, sysdeps/gnu/netinet/udp.h
* sysdeps/mach/hurd/net/if_ppp.h, sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Fix indentation disrupted by mechanical edits.
* inet/protocols/talkd.h, resolv/arpa/nameser.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
Include stdint.h for uintNN_t definitions.
Don't include sys/cdefs.h, features.h, or asm/types.h directly.
108 lines
3.2 KiB
C
108 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>
|
|
#define __need_time_t
|
|
#include <time.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 */
|