mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-03 20:53:13 +03:00
d0d8eb4328
This patch continues the process of unifying sys/procfs.h headers for architectures using the Linux kernel. A bits/procfs-id.h header is added to define __pr_uid_t and __pr_gid_t for the types of pr_uid and pr_gid; the default version of this header uses unsigned int. On some architectures, sys/procfs.h has copies of 32-bit structures for 64-bit builds; those move into a bits/procfs-extra.h header (they can't go in bits/procfs.h because they have to come *after* other declarations from sys/procfs.h). Given appropriate versions of these headers, six more architectures can then move to providing only bits/procfs*.h without duplicating the rest of the contents of sys/procfs.h. Only alpha needs a further bits/ header to be added before it can stop having its own sys/procfs.h. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/sys/procfs.h: Include <bits/procfs-id.h> and <bits/procfs-extra.h>. (struct elf_prpsinfo): Use __pr_uid_t and __pr_gid_t as types of pr_uid and pr_gid. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/procfs-id.h and bits/procfs-extra.h. * sysdeps/unix/sysv/linux/bits/procfs-extra.h: New file. * sysdeps/unix/sysv/linux/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/arm/sys/procfs.h: Remove file. * sysdeps/unix/sysv/linux/m68k/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/sys/procfs.h: Likewise.
76 lines
2.5 KiB
C
76 lines
2.5 KiB
C
/* Extra sys/procfs.h definitions. S/390 version.
|
|
Copyright (C) 2000-2018 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_PROCFS_H
|
|
# error "Never include <bits/procfs-extra.h> directly; use <sys/procfs.h> instead."
|
|
#endif
|
|
|
|
#if __WORDSIZE == 64
|
|
|
|
/* Provide 32-bit variants so that BFD can read 32-bit
|
|
core files. */
|
|
#define ELF_NGREG32 36
|
|
typedef unsigned int elf_greg_t32;
|
|
typedef elf_greg_t32
|
|
elf_gregset_t32[ELF_NGREG32] __attribute__ ((__aligned__ (8)));
|
|
typedef elf_fpregset_t elf_fpregset_t32;
|
|
|
|
struct elf_prstatus32
|
|
{
|
|
struct elf_siginfo pr_info; /* Info associated with signal. */
|
|
short int pr_cursig; /* Current signal. */
|
|
unsigned int pr_sigpend; /* Set of pending signals. */
|
|
unsigned int pr_sighold; /* Set of held signals. */
|
|
__pid_t pr_pid;
|
|
__pid_t pr_ppid;
|
|
__pid_t pr_pgrp;
|
|
__pid_t pr_sid;
|
|
struct
|
|
{
|
|
int tv_sec, tv_usec;
|
|
} pr_utime, /* User time. */
|
|
pr_stime, /* System time. */
|
|
pr_cutime, /* Cumulative user time. */
|
|
pr_cstime; /* Cumulative system time. */
|
|
elf_gregset_t32 pr_reg; /* GP registers. */
|
|
int pr_fpvalid; /* True if math copro being used. */
|
|
};
|
|
|
|
struct elf_prpsinfo32
|
|
{
|
|
char pr_state; /* Numeric process state. */
|
|
char pr_sname; /* Char for pr_state. */
|
|
char pr_zomb; /* Zombie. */
|
|
char pr_nice; /* Nice val. */
|
|
unsigned int pr_flag; /* Flags. */
|
|
unsigned short int pr_uid;
|
|
unsigned short int pr_gid;
|
|
int pr_pid, pr_ppid, pr_pgrp, pr_sid;
|
|
/* Lots missing */
|
|
char pr_fname[16]; /* Filename of executable. */
|
|
char pr_psargs[ELF_PRARGSZ]; /* Initial part of arg list. */
|
|
};
|
|
|
|
typedef elf_gregset_t32 prgregset32_t;
|
|
typedef elf_fpregset_t32 prfpregset32_t;
|
|
|
|
typedef struct elf_prstatus32 prstatus32_t;
|
|
typedef struct elf_prpsinfo32 prpsinfo32_t;
|
|
|
|
#endif
|