mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00: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.
202 lines
6.1 KiB
C
202 lines
6.1 KiB
C
/*-
|
|
* Copyright (c) 1982, 1986, 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)gmon.h 8.2 (Berkeley) 1/4/94
|
|
*/
|
|
|
|
#ifndef _SYS_GMON_H
|
|
#define _SYS_GMON_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
/*
|
|
* See gmon_out.h for gmon.out format.
|
|
*/
|
|
|
|
/* structure emitted by "gcc -a". This must match struct bb in
|
|
gcc/libgcc2.c. It is OK for gcc to declare a longer structure as
|
|
long as the members below are present. */
|
|
struct __bb
|
|
{
|
|
long zero_word;
|
|
const char *filename;
|
|
long *counts;
|
|
long ncounts;
|
|
struct __bb *next;
|
|
const unsigned long *addresses;
|
|
};
|
|
|
|
extern struct __bb *__bb_head;
|
|
|
|
/*
|
|
* histogram counters are unsigned shorts (according to the kernel).
|
|
*/
|
|
#define HISTCOUNTER unsigned short
|
|
|
|
/*
|
|
* fraction of text space to allocate for histogram counters here, 1/2
|
|
*/
|
|
#define HISTFRACTION 2
|
|
|
|
/*
|
|
* Fraction of text space to allocate for from hash buckets.
|
|
* The value of HASHFRACTION is based on the minimum number of bytes
|
|
* of separation between two subroutine call points in the object code.
|
|
* Given MIN_SUBR_SEPARATION bytes of separation the value of
|
|
* HASHFRACTION is calculated as:
|
|
*
|
|
* HASHFRACTION = MIN_SUBR_SEPARATION / (2 * sizeof(short) - 1);
|
|
*
|
|
* For example, on the VAX, the shortest two call sequence is:
|
|
*
|
|
* calls $0,(r0)
|
|
* calls $0,(r0)
|
|
*
|
|
* which is separated by only three bytes, thus HASHFRACTION is
|
|
* calculated as:
|
|
*
|
|
* HASHFRACTION = 3 / (2 * 2 - 1) = 1
|
|
*
|
|
* Note that the division above rounds down, thus if MIN_SUBR_FRACTION
|
|
* is less than three, this algorithm will not work!
|
|
*
|
|
* In practice, however, call instructions are rarely at a minimal
|
|
* distance. Hence, we will define HASHFRACTION to be 2 across all
|
|
* architectures. This saves a reasonable amount of space for
|
|
* profiling data structures without (in practice) sacrificing
|
|
* any granularity.
|
|
*/
|
|
#define HASHFRACTION 2
|
|
|
|
/*
|
|
* Percent of text space to allocate for tostructs.
|
|
* This is a heuristic; we will fail with a warning when profiling programs
|
|
* with a very large number of very small functions, but that's
|
|
* normally OK.
|
|
* 2 is probably still a good value for normal programs.
|
|
* Profiling a test case with 64000 small functions will work if
|
|
* you raise this value to 3 and link statically (which bloats the
|
|
* text size, thus raising the number of arcs expected by the heuristic).
|
|
*/
|
|
#define ARCDENSITY 3
|
|
|
|
/*
|
|
* Always allocate at least this many tostructs. This
|
|
* hides the inadequacy of the ARCDENSITY heuristic, at least
|
|
* for small programs.
|
|
*/
|
|
#define MINARCS 50
|
|
|
|
/*
|
|
* The type used to represent indices into gmonparam.tos[].
|
|
*/
|
|
#define ARCINDEX unsigned long
|
|
|
|
/*
|
|
* Maximum number of arcs we want to allow.
|
|
* Used to be max representable value of ARCINDEX minus 2, but now
|
|
* that ARCINDEX is a long, that's too large; we don't really want
|
|
* to allow a 48 gigabyte table.
|
|
* The old value of 1<<16 wasn't high enough in practice for large C++
|
|
* programs; will 1<<20 be adequate for long? FIXME
|
|
*/
|
|
#define MAXARCS (1 << 20)
|
|
|
|
struct tostruct {
|
|
unsigned long selfpc;
|
|
long count;
|
|
ARCINDEX link;
|
|
};
|
|
|
|
/*
|
|
* a raw arc, with pointers to the calling site and
|
|
* the called site and a count.
|
|
*/
|
|
struct rawarc {
|
|
unsigned long raw_frompc;
|
|
unsigned long raw_selfpc;
|
|
long raw_count;
|
|
};
|
|
|
|
/*
|
|
* general rounding functions.
|
|
*/
|
|
#define ROUNDDOWN(x,y) (((x)/(y))*(y))
|
|
#define ROUNDUP(x,y) ((((x)+(y)-1)/(y))*(y))
|
|
|
|
/*
|
|
* The profiling data structures are housed in this structure.
|
|
*/
|
|
struct gmonparam {
|
|
long int state;
|
|
unsigned short *kcount;
|
|
unsigned long kcountsize;
|
|
ARCINDEX *froms;
|
|
unsigned long fromssize;
|
|
struct tostruct *tos;
|
|
unsigned long tossize;
|
|
long tolimit;
|
|
unsigned long lowpc;
|
|
unsigned long highpc;
|
|
unsigned long textsize;
|
|
unsigned long hashfraction;
|
|
long log_hashfraction;
|
|
};
|
|
|
|
/*
|
|
* Possible states of profiling.
|
|
*/
|
|
#define GMON_PROF_ON 0
|
|
#define GMON_PROF_BUSY 1
|
|
#define GMON_PROF_ERROR 2
|
|
#define GMON_PROF_OFF 3
|
|
|
|
/*
|
|
* Sysctl definitions for extracting profiling information from the kernel.
|
|
*/
|
|
#define GPROF_STATE 0 /* int: profiling enabling variable */
|
|
#define GPROF_COUNT 1 /* struct: profile tick count buffer */
|
|
#define GPROF_FROMS 2 /* struct: from location hash bucket */
|
|
#define GPROF_TOS 3 /* struct: destination/count structure */
|
|
#define GPROF_GMONPARAM 4 /* struct: profiling parameters (see above) */
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Set up data structures and start profiling. */
|
|
extern void __monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW;
|
|
extern void monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW;
|
|
|
|
/* Clean up profiling and write out gmon.out. */
|
|
extern void _mcleanup (void) __THROW;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/gmon.h */
|