29ba06b9ed
In the UAPI header files, __BIG_ENDIAN and __LITTLE_ENDIAN must be compared against __BYTE_ORDER in preprocessor conditionals where these are exposed to userspace (that is they're not inside __KERNEL__ conditionals). However, in the main kernel the norm is to check for "defined(__XXX_ENDIAN)" rather than comparing against __BYTE_ORDER and this has incorrectly leaked into the userspace headers. The definition of ACCT_BYTEORDER in linux/acct.h is wrong in this way. Note that userspace will likely interpret this incorrectly as the big-endian variant on little-endian machines - depending on header inclusion order. [!!!] NOTE [!!!] This patch may adversely change the userspace API. It might be better to fix the value of ACCT_BYTEORDER. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
124 lines
3.8 KiB
C
124 lines
3.8 KiB
C
/*
|
|
* BSD Process Accounting for Linux - Definitions
|
|
*
|
|
* Author: Marco van Wieringen (mvw@planets.elm.net)
|
|
*
|
|
* This header file contains the definitions needed to implement
|
|
* BSD-style process accounting. The kernel accounting code and all
|
|
* user-level programs that try to do something useful with the
|
|
* process accounting log must include this file.
|
|
*
|
|
* Copyright (C) 1995 - 1997 Marco van Wieringen - ELM Consultancy B.V.
|
|
*
|
|
*/
|
|
|
|
#ifndef _UAPI_LINUX_ACCT_H
|
|
#define _UAPI_LINUX_ACCT_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/param.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
/*
|
|
* comp_t is a 16-bit "floating" point number with a 3-bit base 8
|
|
* exponent and a 13-bit fraction.
|
|
* comp2_t is 24-bit with 5-bit base 2 exponent and 20 bit fraction
|
|
* (leading 1 not stored).
|
|
* See linux/kernel/acct.c for the specific encoding systems used.
|
|
*/
|
|
|
|
typedef __u16 comp_t;
|
|
typedef __u32 comp2_t;
|
|
|
|
/*
|
|
* accounting file record
|
|
*
|
|
* This structure contains all of the information written out to the
|
|
* process accounting file whenever a process exits.
|
|
*/
|
|
|
|
#define ACCT_COMM 16
|
|
|
|
struct acct
|
|
{
|
|
char ac_flag; /* Flags */
|
|
char ac_version; /* Always set to ACCT_VERSION */
|
|
/* for binary compatibility back until 2.0 */
|
|
__u16 ac_uid16; /* LSB of Real User ID */
|
|
__u16 ac_gid16; /* LSB of Real Group ID */
|
|
__u16 ac_tty; /* Control Terminal */
|
|
__u32 ac_btime; /* Process Creation 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 */
|
|
/* m68k had no padding here. */
|
|
#if !defined(CONFIG_M68K) || !defined(__KERNEL__)
|
|
__u16 ac_ahz; /* AHZ */
|
|
#endif
|
|
__u32 ac_exitcode; /* Exitcode */
|
|
char ac_comm[ACCT_COMM + 1]; /* Command Name */
|
|
__u8 ac_etime_hi; /* Elapsed Time MSB */
|
|
__u16 ac_etime_lo; /* Elapsed Time LSB */
|
|
__u32 ac_uid; /* Real User ID */
|
|
__u32 ac_gid; /* Real Group ID */
|
|
};
|
|
|
|
struct acct_v3
|
|
{
|
|
char ac_flag; /* Flags */
|
|
char ac_version; /* Always set to ACCT_VERSION */
|
|
__u16 ac_tty; /* Control Terminal */
|
|
__u32 ac_exitcode; /* Exitcode */
|
|
__u32 ac_uid; /* Real User ID */
|
|
__u32 ac_gid; /* Real Group ID */
|
|
__u32 ac_pid; /* Process ID */
|
|
__u32 ac_ppid; /* Parent Process ID */
|
|
__u32 ac_btime; /* Process Creation Time */
|
|
#ifdef __KERNEL__
|
|
__u32 ac_etime; /* Elapsed Time */
|
|
#else
|
|
float ac_etime; /* Elapsed Time */
|
|
#endif
|
|
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 */
|
|
};
|
|
|
|
/*
|
|
* accounting flags
|
|
*/
|
|
/* bit set when the process ... */
|
|
#define AFORK 0x01 /* ... executed fork, but did not exec */
|
|
#define ASU 0x02 /* ... used super-user privileges */
|
|
#define ACOMPAT 0x04 /* ... used compatibility mode (VAX only not used) */
|
|
#define ACORE 0x08 /* ... dumped core */
|
|
#define AXSIG 0x10 /* ... was killed by a signal */
|
|
|
|
#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
|
|
#define ACCT_BYTEORDER 0x80 /* accounting file is big endian */
|
|
#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
|
|
#define ACCT_BYTEORDER 0x00 /* accounting file is little endian */
|
|
#else
|
|
#error unspecified endianness
|
|
#endif
|
|
|
|
#ifndef __KERNEL__
|
|
#define ACCT_VERSION 2
|
|
#define AHZ (HZ)
|
|
#endif /* __KERNEL */
|
|
|
|
|
|
#endif /* _UAPI_LINUX_ACCT_H */
|