diff options
author | Roland McGrath <roland@gnu.org> | 1996-06-02 18:50:07 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-06-02 18:50:07 +0000 |
commit | 847242451c6e53156abead29aa47a3f56cfcc928 (patch) | |
tree | f036468f962f47af250a95e84633319dd5653a16 /sysdeps/unix | |
parent | 76060ec0b8b5d6f0a860a94f100dc6e48041bac3 (diff) | |
download | glibc-847242451c6e53156abead29aa47a3f56cfcc928.tar.gz glibc-847242451c6e53156abead29aa47a3f56cfcc928.tar.xz glibc-847242451c6e53156abead29aa47a3f56cfcc928.zip |
Wed May 29 00:57:37 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/Makefile (tests): Add test-tz. * time/test-tz.c: New test. * time/clocktest.c: Rewrite to test more meaningfully. * sysdeps/unix/sysv/linux/syscalls.list: Add bdflush, create_module, delete_module, get_kernel_syms, init_module, klogctl. * sysdeps/unix/sysv/linux/sys/param.h (MAXSYMLINKS): Define as 5 instead of SYMLOOP_MAX, which is nowhere to be found. * sysdeps/unix/sysv/linux/sys/msq_buf.h, sysdeps/unix/sysv/linux/sys/sem_buf.h, sysdeps/unix/sysv/linux/sys/shm_buf.h [__USE_MISC]: Add more control ops and datastructures. * sysdeps/unix/sysv/linux/sys/io.h: New file declaring low-level I/O related functions. * sysdeps/unix/sysv/linux/sys/kdaemon.h: New file declaring kernel daemon related functions/operations. * sysdeps/unix/sysv/linux/sys/klog.h: New file declaring kernel logging related functions/operations. * sysdeps/unix/sysv/linux/sys/module.h: New file declaring kernel module related functions/operations. * sysdeps/unix/sysv/linux/speed.c: Only do "mention this twice" hack for non-Alpha based Linux systems. * sysdeps/unix/sysv/linux/alpha/speed.c: Remove. * sysdeps/unix/sysv/linux/Makefile (headers): Add sys/module.h, sys/io.h, sys/klog.h, and sys/kdaemon.h. * sysdeps/unix/sysdep.h (END): Define empty END macro for platforms that don't need some sort of end directive at the end of functions. * sysdeps/unix/make-syscalls.sh: Emit END($strong) at end of syscall wrapper to allow correct generation of debugging information. * sysdeps/unix/alpha/sysdep.h (END): Redefine to use .end directive for both ELF and ECOFF. (ret): Delete macro. It was a dangerous macro and unnecessary since the Alpha assemblers recognizes "ret" as a macro themselves. * sysdeps/gnu/utmpbits.h (struct utmp): Move ut_tv behind ut_session to guarantee long alignment. This is important for Linux/Alpha since ut_tv.tv_sec is 32 bits and time_t is 64 bits. This will all get cleaned up as programs start to use ut_tv instead ut_time. * sysdeps/alpha/divrem.h: Include <sysdep.h> instead of <*/regdef.h>. * sysdeps/alpha/bsd-_setjmp.S (setjmp): Renamed entry point to _setjmp. * sysdeps/alpha/_mcount.S, sysdeps/alpha/bb_init_func.S, sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S, sysdeps/alpha/copysign.S, sysdeps/alpha/divrem.h, sysdeps/alpha/fabs.S, sysdeps/alpha/ffs.S, sysdeps/alpha/htonl.S, sysdeps/alpha/htons.S, sysdeps/alpha/memchr.S, sysdeps/alpha/setjmp.S, sysdeps/alpha/strlen.S, sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S, sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S, sysdeps/unix/sysv/linux/alpha/llseek.S, sysdeps/unix/sysv/linux/alpha/pipe.S, sysdeps/unix/sysv/linux/alpha/sigsuspend.S, sysdeps/unix/sysv/linux/alpha/sysdep.S: Use END macro instead of .end directive. * csu/initfini.c (_fini): Tell gcc that _fini is not a leaf function by having it contain a dummy function call. * configure.in (config_machine): Don't make ELF the default for Linux/Alpha just yet (use --with-elf instead). (.init/.fini check): Generate .text to ensure function start and end are in same section. * sysdeps/unix/bsd/osf/alpha/brk.S, sysdeps/unix/sysv/linux/alpha/brk.S (__curbrk): Store the entire break value, not just the low 32 bits to accomodate large memories. Tue May 28 10:46:04 1996 Richard Henderson <rth@tamu.edu> * sysdeps/unix/sysv/linux/alpha/brk.S: Rather than attempt to dynamically resolve _end for initializing __curbrk, support the brk(0) query idiom. * sysdeps/alpha/bb_init_func.S: Don't make `init' an external symbol. * sysdeps/alpha/bsd-_setjmp.S: The function is _setjmp not setjmp. Sun May 26 22:17:38 1996 Richard Henderson <rth@tamu.edu> * stdlib/lcong48_r.c, stdlib/seed48_r.c, stdlib/strtod.c, stdlib/strtol.c: Include <string.h> for mem* and str* fns used. Thu May 23 02:15:56 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/Makefile (headers): Add sys/io.h, sys/klog.h, and sys/kdaemon.h. * sysdeps/unix/sysv/linux/sys/io.h: New file. * sysdeps/unix/sysv/linux/sys/klog.h: Ditto. * sysdeps/unix/sysv/linux/sys/kdaemon.h: Ditto. * sysdeps/unix/alpha/sysdep.h (ret): Remove macro. It is dangerous and unnecessary since both OSF/1 as and gas define "ret" as a pseudo-instruction. Sat Jun 1 17:18:21 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * time/tzset.c (__tzset): Clear tz_rules name pointers after freeing them. Bug found by David Mosberger-Tang. * sysdeps/posix/tempname.c (__stdio_gen_tempname): Use __ptr_t instead of PTR. * extra-lib.mk (extra-objs): Use patsubst intead of $(A:=B) syntax to work around Make bug when A contains var ref. Fri May 31 18:27:52 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * string/string.h [__USE_MISC]: Declare basename; OSF/1 puts it here. * sysdeps/unix/sysv/linux/syscalls.list (getpgid, setpgid): Define __ strong names and [gs]etpgid as weak aliases. * math/math_private.h (GET_LDOUBLE_EXP): Add missing backslash.
Diffstat (limited to 'sysdeps/unix')
22 files changed, 206 insertions, 132 deletions
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 8a52f201e1..6fed4a6adf 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -97,7 +97,9 @@ name/**/: \ 3: #endif -#define ret ret zero,(ra),1 +#undef END +#define END(sym) .end sym + #define r0 v0 #define r1 a4 diff --git a/sysdeps/unix/bsd/osf/alpha/brk.S b/sysdeps/unix/bsd/osf/alpha/brk.S index 6e4bd2cc71..105e40100b 100644 --- a/sysdeps/unix/bsd/osf/alpha/brk.S +++ b/sysdeps/unix/bsd/osf/alpha/brk.S @@ -41,7 +41,7 @@ ENTRY(__brk) /* Update __curbrk and exit cleanly. */ /* ldgp gp, 0(t12) */ - stl a0, __curbrk + stq a0, __curbrk mov zero, v0 ret diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index ff4b082b11..5251e84cb9 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -61,7 +61,8 @@ EOF \$(foreach o,\$(object-suffixes),\$(objpfx)$file\$o): \$(objpfx)s-proto.d (echo '#include <sysdep.h>'; \\ echo 'PSEUDO ($strong, $syscall, $nargs)'; \\ - echo ' ret'; \\" + echo ' ret'; \\ + echo 'END($strong)'; \\" # Append any weak aliases defined for this syscall function. for name in $weak; do diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h index 456970638c..0dde0b04a6 100644 --- a/sysdeps/unix/sysdep.h +++ b/sysdeps/unix/sysdep.h @@ -54,3 +54,7 @@ Cambridge, MA 02139, USA. */ #else #define SYS_ify(syscall_name) SYS_/**/syscall_name #endif + +/* Terminate a function named SYM. This is used on some platforms to + generate correct debugging information. */ +#define END(sym) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 406c338025..412227a320 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,9 @@ endif ifeq ($(subdir), misc) sysdep_routines += mount umount xmknod s_ptrace s_sysctl sysctl llseek \ setfsgid setfsuid sysinfo uselib s_reboot -headers += sys/mount.h sys/sysinfo.h sys/acct.h sys/sysctl.h + +headers += sys/mount.h sys/sysinfo.h sys/acct.h sys/sysctl.h sys/module.h \ + sys/io.h sys/klog.h sys/kdaemon.h install-others += $(includedir)/sys/syscall.h diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S index 4582539bc1..1c4a4f9217 100644 --- a/sysdeps/unix/sysv/linux/alpha/brk.S +++ b/sysdeps/unix/sysv/linux/alpha/brk.S @@ -23,17 +23,7 @@ break value (instead of the new, requested one). */ #include <sysdep.h> #include <errnos.h> -#ifndef HAVE_GNU_LD -#define _end end -#endif - - .extern _end,8 - - .data - - .globl __curbrk -__curbrk: - .quad _end +.comm __curbrk, 8 .text LEAF(__brk, 0) @@ -42,11 +32,15 @@ LEAF(__brk, 0) ldi v0, __NR_brk call_pal PAL_callsys + + /* Correctly handle the brk(0) query case. */ + cmoveq a0, v0, a0 + subq a0, v0, t0 bne t0, error /* Update __curbrk and return cleanly. */ - stl a0, __curbrk + stq a0, __curbrk mov zero, v0 ret @@ -54,6 +48,6 @@ LEAF(__brk, 0) error: ldi v0, ENOMEM jmp zero, syscall_error - .end __brk + END(__brk) weak_alias (__brk, brk) diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S index c3486acc1a..52c945aec2 100644 --- a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S +++ b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S @@ -41,6 +41,6 @@ error: lda sp, 8(sp) 1: ldgp gp, 0(gp) jmp zero, syscall_error - .end __ieee_get_fp_control + END(__ieee_get_fp_control) weak_alias (__ieee_get_fp_control, ieee_get_fp_control) diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S index 507b5d5cab..d72585daf1 100644 --- a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S +++ b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S @@ -39,6 +39,6 @@ error: br gp, 1f 1: ldgp gp, 0(gp) jmp zero, syscall_error - .end __ieee_set_fp_control + END(__ieee_set_fp_control) weak_alias (__ieee_set_fp_control, ieee_set_fp_control) diff --git a/sysdeps/unix/sysv/linux/alpha/llseek.S b/sysdeps/unix/sysv/linux/alpha/llseek.S index 7f2a49172a..bd8c6595c9 100644 --- a/sysdeps/unix/sysv/linux/alpha/llseek.S +++ b/sysdeps/unix/sysv/linux/alpha/llseek.S @@ -46,4 +46,4 @@ error: br gp, 1f 1: ldgp gp, 0(gp) jmp zero, syscall_error - .end llseek + END(llseek) diff --git a/sysdeps/unix/sysv/linux/alpha/pipe.S b/sysdeps/unix/sysv/linux/alpha/pipe.S index 40958466a4..b23803cecd 100644 --- a/sysdeps/unix/sysv/linux/alpha/pipe.S +++ b/sysdeps/unix/sysv/linux/alpha/pipe.S @@ -37,6 +37,6 @@ error: br gp, 1f 1: ldgp gp, 0(gp) jmp zero, syscall_error - .end __pipe + END(__pipe) weak_alias (__pipe, pipe) diff --git a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S index 00c02de72b..26a1869783 100644 --- a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S +++ b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S @@ -36,4 +36,4 @@ error: br gp, 1f 1: ldgp gp, 0(gp) jmp zero, syscall_error - .end sigsuspend + END(sigsuspend) diff --git a/sysdeps/unix/sysv/linux/alpha/speed.c b/sysdeps/unix/sysv/linux/alpha/speed.c deleted file mode 100644 index 40bf6c50bb..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/speed.c +++ /dev/null @@ -1,103 +0,0 @@ -/* `struct termios' speed frobnication functions. Linux version. -Copyright (C) 1991, 1992, 1993, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include <stddef.h> -#include <errno.h> -#include <termios.h> - -static const speed_t speeds[] = - { - 0, - 50, - 75, - 110, - 134, - 150, - 200, - 300, - 600, - 1200, - 1800, - 2400, - 4800, - 9600, - 19200, - 38400, - 57600, - 115200, - 230400, - 460800, - }; - - -/* Return the output baud rate stored in *TERMIOS_P. */ -speed_t -cfgetospeed (termios_p) - const struct termios *termios_p; -{ - speed_t retval = termios_p->c_cflag & (CBAUD | CBAUDEX); - - if (retval & CBAUDEX) - { - retval &= ~CBAUDEX; - retval |= CBAUD + 1; - } - - return retval; -} - -/* Return the input baud rate stored in *TERMIOS_P. - For Linux there is no difference between input and output speed. */ -strong_alias (cfgetospeed, cfgetispeed); - -/* Set the output baud rate stored in *TERMIOS_P to SPEED. */ -int -cfsetospeed (termios_p, speed) - struct termios *termios_p; - speed_t speed; -{ - register unsigned int i; - - if (termios_p == NULL) - { - errno = EINVAL; - return -1; - } - - /* This allows either B1200 or 1200 to work. XXX - Do we really want to try to support this, given that - fetching the speed must return one or the other? */ - - for (i = 0; i < sizeof (speeds) / sizeof (speeds[0]); ++i) - if (i == speed || speeds[i] == speed) - { - termios_p->c_cflag &= ~(CBAUD | CBAUDEX); - termios_p->c_cflag |= (i & CBAUD); - if (i & ~CBAUD) - termios_p->c_cflag |= CBAUDEX; - return 0; - } - - errno = EINVAL; - return -1; -} - -/* Set the input baud rate stored in *TERMIOS_P to SPEED. - For Linux there is no difference between input and output speed. */ -strong_alias (cfsetospeed, cfsetispeed); diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c index d229f766f9..0ad48a23d8 100644 --- a/sysdeps/unix/sysv/linux/speed.c +++ b/sysdeps/unix/sysv/linux/speed.c @@ -39,7 +39,9 @@ static const speed_t speeds[] = 9600, 19200, 38400, +#ifndef __alpha__ 38400, /* Mention this twice here is a trick. */ +#endif 57600, 115200, 230400, diff --git a/sysdeps/unix/sysv/linux/sys/io.h b/sysdeps/unix/sysv/linux/sys/io.h new file mode 100644 index 0000000000..d44850f025 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sys/io.h @@ -0,0 +1,39 @@ +/* Copyright (C) 1996 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#ifndef _SYS_IO_H +#define _SYS_IO_H + +#include <asm/io.h> + +/* If TURN_ON is TRUE, request for permission to do direct i/o on the + port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O + permission off for that range. This call requires root privileges. + + Portability note: not all Linux platforms support this call. Most + platforms based on the PC I/O architecture probably will, however. + E.g., Linux/Alpha for Alpha PCs supports this. */ +extern int ioperm __P((unsigned long __from, unsigned long __num, + int __turn_on)); + +/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to + access any I/O port is granted. This call requires root + privileges. */ +extern int iopl __P((int __level)); + +#endif /* _SYS_IO_H */ diff --git a/sysdeps/unix/sysv/linux/sys/kdaemon.h b/sysdeps/unix/sysv/linux/sys/kdaemon.h new file mode 100644 index 0000000000..fce169fe6b --- /dev/null +++ b/sysdeps/unix/sysv/linux/sys/kdaemon.h @@ -0,0 +1,9 @@ +/* Interfaces to control the various kernel daemons. */ + +#ifndef _SYS_KDAEMON_H +#define _SYS_KDAEMON_H + +/* Start, flush, or tune the kernel's buffer flushing daemon. */ +extern int bdflush (int func, long data); + +#endif /* _SYS_KDAEMON_H */ diff --git a/sysdeps/unix/sysv/linux/sys/klog.h b/sysdeps/unix/sysv/linux/sys/klog.h new file mode 100644 index 0000000000..b8a39d6492 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sys/klog.h @@ -0,0 +1,10 @@ +#ifndef _SYS_KLOG_H +#define _SYS_KLOG_H + +/* Control the kernel's logging facility. This corresponds exactly to + the kernel's syslog system call, but that name is easily confused + with the user-level syslog facility, which is something completely + different. */ +extern int klogctl __P((int type, char *bufp, int len)); + +#endif /* _SYS_KLOG_H */ diff --git a/sysdeps/unix/sysv/linux/sys/module.h b/sysdeps/unix/sysv/linux/sys/module.h new file mode 100644 index 0000000000..5c4dbcea37 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sys/module.h @@ -0,0 +1,36 @@ +#ifndef _SYS_MODULE_H +#define _SYS_MODULE_H + +#include <features.h> + +#include <linux/module.h> + +/* Return number of kernel symbols if TABLE == NULL, otherwise, return + kernel symbols in TABLE. TABLE must be large enough to hold all + kernel symbols. */ +extern int get_kernel_syms __P((struct kernel_sym * table)); + +/* Create a new module of name MODULE_NAME and of size SIZE bytes. + The return address is the starting address of the new module or -1L + if the module cannot be created (the return value needs to be cast + to (long) to detect the error condition). */ +extern unsigned long create_module __P((const char * module_name, + size_t size)); + +/* Initialize the module called MODULE_NAME with the CONTENTSSIZE + bytes starting at address CONTENTS. CONTENTS normally contains the + text and data segment of the module (the bss is implicity zeroed). + After copying the contents, the function pointed to by + ROUTINES.init is executed. When the module is no longer needed, + ROUTINES.cleanup is executed. SYMTAB is NULL if the module does + not want to export symbols by itself, or a pointer to a symbol + table if the module wants to register its own symbols. */ +extern int init_module __P((const char * module_name, + const void * contents, size_t contentssize, + struct mod_routines * routines, + struct symbol_table * symtab)); + +/* Delete the module named MODULE_NAME from the kernel. */ +extern int delete_module __P((const char *module_name)); + +#endif /* _SYS_MODULE_H */ diff --git a/sysdeps/unix/sysv/linux/sys/msq_buf.h b/sysdeps/unix/sysv/linux/sys/msq_buf.h index 92a52d515d..6e4435dc23 100644 --- a/sysdeps/unix/sysv/linux/sys/msq_buf.h +++ b/sysdeps/unix/sysv/linux/sys/msq_buf.h @@ -49,6 +49,28 @@ struct msqid_ds __pid_t msg_lrpid; /* pid of last msgrcv() */ }; +#ifdef __USE_MISC + +#define msg_cbytes __msg_cbytes + +/* ipcs ctl commands */ +#define MSG_STAT 11 +#define MSG_INFO 12 + +/* buffer for msgctl calls IPC_INFO, MSG_INFO */ +struct msginfo { + int msgpool; + int msgmap; + int msgmax; + int msgmnb; + int msgmni; + int msgssz; + int msgtql; + ushort msgseg; +}; + +#endif /* __USE_MISC */ + __END_DECLS #endif /* sys/msq_buf.h */ diff --git a/sysdeps/unix/sysv/linux/sys/param.h b/sysdeps/unix/sysv/linux/sys/param.h index 4950d58d38..e4a8406e44 100644 --- a/sysdeps/unix/sysv/linux/sys/param.h +++ b/sysdeps/unix/sysv/linux/sys/param.h @@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA. */ #ifndef NGROUPS #define NGROUPS NGROUPS_MAX #endif -#define MAXSYMLINKS SYMLOOP_MAX +#define MAXSYMLINKS 5 #define CANBSIZ MAX_CANON #define NCARGS ARG_MAX #define MAXPATHLEN PATH_MAX diff --git a/sysdeps/unix/sysv/linux/sys/sem_buf.h b/sysdeps/unix/sysv/linux/sys/sem_buf.h index d93002ad6e..bfac9141bf 100644 --- a/sysdeps/unix/sysv/linux/sys/sem_buf.h +++ b/sysdeps/unix/sysv/linux/sys/sem_buf.h @@ -60,6 +60,27 @@ union semun struct seminfo *__buf; /* buffer for IPC_INFO */ }; +#ifdef __USE_MISC + +/* ipcs ctl cmds */ +#define SEM_STAT 18 +#define SEM_INFO 19 + +struct seminfo { + int semmap; + int semmni; + int semmns; + int semmnu; + int semmsl; + int semopm; + int semume; + int semusz; + int semvmx; + int semaem; +}; + +#endif /* __USE_MISC */ + __END_DECLS #endif /* sys/sem_buf.h */ diff --git a/sysdeps/unix/sysv/linux/sys/shm_buf.h b/sysdeps/unix/sysv/linux/sys/shm_buf.h index fa1e8235d8..048aa64dc2 100644 --- a/sysdeps/unix/sysv/linux/sys/shm_buf.h +++ b/sysdeps/unix/sysv/linux/sys/shm_buf.h @@ -38,11 +38,11 @@ __BEGIN_DECLS /* Data structure describing a set of semaphores. */ struct shmid_ds { - struct ipc_perm sem_perm; /* operation permisson struct */ + struct ipc_perm shm_perm; /* operation permisson struct */ int shm_segsz; /* size of segment in bytes */ - __time_t sem_atime; /* time of last shmat() */ - __time_t sem_dtime; /* time of last shmdt() */ - __time_t sem_ctime; /* time of last change by shmctl() */ + __time_t shm_atime; /* time of last shmat() */ + __time_t shm_dtime; /* time of last shmdt() */ + __time_t shm_ctime; /* time of last change by shmctl() */ __pid_t shm_cpid; /* pid of creator */ __pid_t shm_lpid; /* pid of last shmop */ unsigned short int shm_nattch; /* number of current attaches */ @@ -51,6 +51,35 @@ struct shmid_ds struct vm_area_struct *__attaches; /* descriptors for attaches */ }; +#ifdef __USE_MISC + +/* ipcs ctl commands */ +#define SHM_STAT 13 +#define SHM_INFO 14 + +/* shm_mode upper byte flags */ +#define SHM_DEST 01000 /* segment will be destroyed on last detach */ +#define SHM_LOCKED 02000 /* segment will not be swapped */ + +struct shminfo { + int shmmax; + int shmmin; + int shmmni; + int shmseg; + int shmall; +}; + +struct shm_info { + int used_ids; + ulong shm_tot; /* total allocated shm */ + ulong shm_rss; /* total resident shm */ + ulong shm_swp; /* total swapped shm */ + ulong swap_attempts; + ulong swap_successes; +}; + +#endif /* __USE_MISC */ + __END_DECLS #endif /* sys/shm_buf.h */ diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index f401bc8c60..db27320c93 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -1,15 +1,20 @@ # File name Caller Syscall name # args Strong name Weak names adjtimex adjtime adjtimex 1 __adjtimex +bdflush - bdflush 2 bdflush +create_module - create_module 3 create_module +delete_module - delete_module 3 delete_module fdatasync - fdatasync 1 fdatasync flock - flock 2 __flock flock fork - fork 0 __fork fork +get_kernel_syms - get_kernel_syms 1 get_kernel_syms getegid - getegid 0 __getegid getegid geteuid - geteuid 0 __geteuid geteuid -getpgid - getpgid 1 getpgid +getpgid - getpgid 1 __getpgid getpgid getpgrp - getpgrp 0 getpgrp getppid - getppid 0 __getppid getppid getsid - getsid 1 getsid +init_module - init_module 5 init_module ioperm - ioperm 3 ioperm iopl - iopl 1 iopl ipc msgget ipc 5 __ipc @@ -37,11 +42,12 @@ sched_primin - sched_get_priority_min 1 __sched_get_priority_min sched_get_prior sched_rr_gi - sched_rr_get_interval 2 __sched_rr_get_interval sched_rr_get_interval setfsgid - setfsgid 1 setfsgid setfsuid - setfsuid 1 setfsuid -setpgid - setpgid 2 setpgid +setpgid - setpgid 2 __setpgid setpgid sigpending - sigpending 1 sigpending sigprocmask - sigprocmask 3 __sigprocmask sigprocmask s_sysctl sysctl _sysctl 1 __syscall__sysctl sysinfo - sysinfo 1 sysinfo +ksyslog_ctl - syslog 3 ksyslog_ctl umount - umount 1 __umount umount uselib - uselib 1 uselib wait4 - wait4 4 __wait4 wait4 |