This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
On Sat, Jan 22, 2000 at 12:06:01PM +0100, Andreas Jaeger wrote: > >>>>> Jakub Jelinek writes: > > > On Mon, Jan 17, 2000 at 09:53:34PM -0800, Ulrich Drepper wrote: > >> One more thing: I think the definitions protected by > >> __LIBC_IPC_INTERNAL should be moved into an internal header and not > >> being public. If they have to be able for some user-level code then > >> the symbol name should be changed. > > > The IPCOP_* definitions can be very easily moved into a non-public header > > because they are identical on all platforms anyway. > > With the __old_* structure definitions, I wonder if they can stay > > unprotected in the public headers or whether I should write sys/msgpriv.h > > and the like headers which will include sys/msg.h and declare the private > > things. Having both structures in the same file makes things more readable > > and easier to compare how it has changed, but if it would be a problem, I > > can move it away. > > Since <bits/msq.h> gets installed, I would prefer to not have internal > declarations in there. Could you move the structures around? Ok, what about this? __LIBC_IPC_INTERNAL is gone and private declarations are moved to private headers which will not be exported to /usr/include. The patch is untested though, have to fix gcc first so that I can compile 64bit glibc again. 2000-01-24 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/bits/ipc.h: Move private decls... * sysdeps/unix/sysv/linux/bits/ipc_priv.h: ...here. * sysdeps/unix/sysv/linux/bits/msq.h: Move private decls... * sysdeps/unix/sysv/linux/bits/msq_compat.h: ...here. * sysdeps/unix/sysv/linux/bits/sem.h: Move private decls... * sysdeps/unix/sysv/linux/bits/sem_compat.h: ...here. * sysdeps/unix/sysv/linux/bits/shm.h: Move private decls... * sysdeps/unix/sysv/linux/bits/shm_compat.h: ...here. * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Move private decls... * sysdeps/unix/sysv/linux/alpha/bits/ipc_priv.h: ...here. * sysdeps/unix/sysv/linux/alpha/bits/msq.h: Remove private decls. * sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Include bits/ipc_priv.h. * sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/msgget.c: Likewise. * sysdeps/unix/sysv/linux/msgrcv.c: Likewise. * sysdeps/unix/sysv/linux/msgsnd.c: Likewise. * sysdeps/unix/sysv/linux/semget.c: Likewise. * sysdeps/unix/sysv/linux/semop.c: Likewise. * sysdeps/unix/sysv/linux/shmat.c: Likewise. * sysdeps/unix/sysv/linux/shmdt.c: Likewise. * sysdeps/unix/sysv/linux/shmget.c: Likewise. * sysdeps/unix/sysv/linux/msgctl.c: Include bits/msq_compat.h. * sysdeps/unix/sysv/linux/semctl.c: Include bits/sem_compat.h. * sysdeps/unix/sysv/linux/shmctl.c: Include bits/shm_compat.h. --- libc/sysdeps/unix/sysv/linux/alpha/bits/ipc.h.jj Wed Jan 19 21:41:30 2000 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/ipc.h Mon Jan 24 10:53:59 2000 @@ -51,39 +51,3 @@ struct ipc_perm unsigned long int __unused1; unsigned long int __unused2; }; - -#ifdef __LIBC_IPC_INTERNAL - -struct __old_ipc_perm - { - __key_t __key; /* Key. */ - unsigned int uid; /* Owner's user ID. */ - unsigned int gid; /* Owner's group ID. */ - unsigned int cuid; /* Creator's user ID. */ - unsigned int cgid; /* Creator's group ID. */ - unsigned int mode; /* Read/write permission. */ - unsigned short int __seq; /* Sequence number. */ - }; - -__BEGIN_DECLS - -/* The actual system call: all functions are multiplexed by this. */ -extern int __ipc (int __call, int __first, int __second, int __third, - void *__ptr); - -__END_DECLS - -/* The codes for the functions to use the multiplexer `__ipc'. */ -#define IPCOP_semop 1 -#define IPCOP_semget 2 -#define IPCOP_semctl 3 -#define IPCOP_msgsnd 11 -#define IPCOP_msgrcv 12 -#define IPCOP_msgget 13 -#define IPCOP_msgctl 14 -#define IPCOP_shmat 21 -#define IPCOP_shmdt 22 -#define IPCOP_shmget 23 -#define IPCOP_shmctl 24 - -#endif --- libc/sysdeps/unix/sysv/linux/alpha/bits/msq.h.jj Tue Jan 18 05:27:05 2000 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/msq.h Mon Jan 24 10:42:36 2000 @@ -44,25 +44,6 @@ struct msqid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_msqid_ds -{ - struct __old_ipc_perm msg_perm; /* structure describing operation permission */ - struct msg *__msg_first; /* pointer to first message on queue */ - struct msg *__msg_last; /* pointer to last message on queue */ - __time_t msg_stime; /* time of last msgsnd command */ - __time_t msg_rtime; /* time of last msgrcv command */ - __time_t msg_ctime; /* time of last change */ - struct wait_queue *__wwait; /* ??? */ - struct wait_queue *__rwait; /* ??? */ - unsigned short int __msg_cbytes; /* current number of bytes on queue */ - unsigned short int msg_qnum; /* number of messages currently on queue */ - unsigned short int msg_qbytes; /* max number of bytes allowed on queue */ - __ipc_pid_t msg_lspid; /* pid of last msgsnd() */ - __ipc_pid_t msg_lrpid; /* pid of last msgrcv() */ -}; -#endif - #ifdef __USE_MISC # define msg_cbytes __msg_cbytes --- libc/sysdeps/unix/sysv/linux/alpha/bits/sem.h.jj Tue Jan 18 05:27:12 2000 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/sem.h Mon Jan 24 10:44:06 2000 @@ -46,20 +46,6 @@ struct semid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_semid_ds -{ - struct __old_ipc_perm sem_perm; /* operation permission struct */ - __time_t sem_otime; /* last semop() time */ - __time_t sem_ctime; /* last time changed by semctl() */ - struct sem *__sembase; /* ptr to first semaphore in array */ - struct sem_queue *__sem_pending; /* pending operations */ - struct sem_queue *__sem_pending_last; /* last pending operation */ - struct sem_undo *__undo; /* ondo requests on this array */ - unsigned short int sem_nsems; /* number of semaphores in set */ -}; -#endif - /* The user should define a union like the following to use it for arguments for `semctl'. --- libc/sysdeps/unix/sysv/linux/alpha/bits/shm.h.jj Tue Jan 18 05:27:20 2000 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/shm.h Mon Jan 24 10:44:53 2000 @@ -51,23 +51,6 @@ struct shmid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_shmid_ds - { - struct __old_ipc_perm shm_perm; /* operation permission struct */ - int shm_segsz; /* size of segment in bytes */ - __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() */ - __ipc_pid_t shm_cpid; /* pid of creator */ - __ipc_pid_t shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ - unsigned short int __shm_npages; /* size of segment (pages) */ - unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ - }; -#endif - #ifdef __USE_MISC /* ipcs ctl commands */ @@ -89,15 +72,6 @@ struct shminfo unsigned long int __unused2; unsigned long int __unused3; unsigned long int __unused4; - }; - -struct __old_shminfo - { - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; }; struct shm_info --- libc/sysdeps/unix/sysv/linux/alpha/bits/ipc_priv.h.jj Mon Jan 24 10:19:31 2000 +++ libc/sysdeps/unix/sysv/linux/alpha/bits/ipc_priv.h Mon Jan 24 10:54:11 2000 @@ -0,0 +1,54 @@ +/* Copyright (C) 1995-1999, 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/ipc.h> + +#define __IPC_64 0x100 + +struct __old_ipc_perm +{ + __key_t __key; /* Key. */ + unsigned int uid; /* Owner's user ID. */ + unsigned int gid; /* Owner's group ID. */ + unsigned int cuid; /* Creator's user ID. */ + unsigned int cgid; /* Creator's group ID. */ + unsigned int mode; /* Read/write permission. */ + unsigned short int __seq; /* Sequence number. */ +}; + + +__BEGIN_DECLS + +/* The actual system call: all functions are multiplexed by this. */ +extern int __syscall_ipc (int __call, int __first, int __second, + int __third, void *__ptr); + +__END_DECLS + +/* The codes for the functions to use the multiplexer `__syscall_ipc'. */ +#define IPCOP_semop 1 +#define IPCOP_semget 2 +#define IPCOP_semctl 3 +#define IPCOP_msgsnd 11 +#define IPCOP_msgrcv 12 +#define IPCOP_msgget 13 +#define IPCOP_msgctl 14 +#define IPCOP_shmat 21 +#define IPCOP_shmdt 22 +#define IPCOP_shmget 23 +#define IPCOP_shmctl 24 --- libc/sysdeps/unix/sysv/linux/bits/ipc.h.jj Tue Jan 18 05:27:35 2000 +++ libc/sysdeps/unix/sysv/linux/bits/ipc.h Mon Jan 24 10:53:24 2000 @@ -36,8 +36,6 @@ /* Special key values. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */ -#define __IPC_64 0x100 - /* Data structure used to pass permission information to IPC operations. */ struct ipc_perm @@ -54,39 +52,3 @@ struct ipc_perm unsigned long int __unused1; unsigned long int __unused2; }; - -#ifdef __LIBC_IPC_INTERNAL -struct __old_ipc_perm - { - __key_t __key; /* Key. */ - unsigned short int uid; /* Owner's user ID. */ - unsigned short int gid; /* Owner's group ID. */ - unsigned short int cuid; /* Creator's user ID. */ - unsigned short int cgid; /* Creator's group ID. */ - unsigned short int mode; /* Read/write permission. */ - unsigned short int __seq; /* Sequence number. */ - }; - -__BEGIN_DECLS - -/* The actual system call: all functions are multiplexed by this. */ -extern int __syscall_ipc (int __call, int __first, int __second, - int __third, void *__ptr); - -__END_DECLS - - -/* The codes for the functions to use the multiplexer `__syscall_ipc'. */ -#define IPCOP_semop 1 -#define IPCOP_semget 2 -#define IPCOP_semctl 3 -#define IPCOP_msgsnd 11 -#define IPCOP_msgrcv 12 -#define IPCOP_msgget 13 -#define IPCOP_msgctl 14 -#define IPCOP_shmat 21 -#define IPCOP_shmdt 22 -#define IPCOP_shmget 23 -#define IPCOP_shmctl 24 - -#endif /* __LIBC_IPC_INTERNAL */ --- libc/sysdeps/unix/sysv/linux/bits/shm_compat.h.jj Mon Jan 24 10:34:41 2000 +++ libc/sysdeps/unix/sysv/linux/bits/shm_compat.h Mon Jan 24 11:01:29 2000 @@ -0,0 +1,44 @@ +/* Copyright (C) 1995-1999, 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/shm.h> +#include <bits/ipc_priv.h> + +struct __old_shmid_ds +{ + struct __old_ipc_perm shm_perm; /* operation permission struct */ + int shm_segsz; /* size of segment in bytes */ + __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() */ + __ipc_pid_t shm_cpid; /* pid of creator */ + __ipc_pid_t shm_lpid; /* pid of last shmop */ + unsigned short int shm_nattch; /* number of current attaches */ + unsigned short int __shm_npages; /* size of segment (pages) */ + unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ + struct vm_area_struct *__attaches; /* descriptors for attaches */ +}; + +struct __old_shminfo +{ + int shmmax; + int shmmin; + int shmmni; + int shmseg; + int shmall; +}; --- libc/sysdeps/unix/sysv/linux/bits/msq.h.jj Tue Jan 18 05:27:43 2000 +++ libc/sysdeps/unix/sysv/linux/bits/msq.h Mon Jan 24 10:22:13 2000 @@ -47,25 +47,6 @@ struct msqid_ds unsigned long int __unused5; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_msqid_ds -{ - struct __old_ipc_perm msg_perm; /* structure describing operation permission */ - struct msg *__msg_first; /* pointer to first message on queue */ - struct msg *__msg_last; /* pointer to last message on queue */ - __time_t msg_stime; /* time of last msgsnd command */ - __time_t msg_rtime; /* time of last msgrcv command */ - __time_t msg_ctime; /* time of last change */ - struct wait_queue *__wwait; /* ??? */ - struct wait_queue *__rwait; /* ??? */ - unsigned short int __msg_cbytes; /* current number of bytes on queue */ - unsigned short int msg_qnum; /* number of messages currently on queue */ - unsigned short int msg_qbytes; /* max number of bytes allowed on queue */ - __ipc_pid_t msg_lspid; /* pid of last msgsnd() */ - __ipc_pid_t msg_lrpid; /* pid of last msgrcv() */ -}; -#endif - #ifdef __USE_MISC # define msg_cbytes __msg_cbytes --- libc/sysdeps/unix/sysv/linux/bits/sem.h.jj Tue Jan 18 05:27:50 2000 +++ libc/sysdeps/unix/sysv/linux/bits/sem.h Mon Jan 24 10:24:43 2000 @@ -48,20 +48,6 @@ struct semid_ds unsigned long int __unused4; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_semid_ds -{ - struct __old_ipc_perm sem_perm; /* operation permission struct */ - __time_t sem_otime; /* last semop() time */ - __time_t sem_ctime; /* last time changed by semctl() */ - struct sem *__sembase; /* ptr to first semaphore in array */ - struct sem_queue *__sem_pending; /* pending operations */ - struct sem_queue *__sem_pending_last; /* last pending operation */ - struct sem_undo *__undo; /* ondo requests on this array */ - unsigned short int sem_nsems; /* number of semaphores in set */ -}; -#endif - /* The user should define a union like the following to use it for arguments for `semctl'. --- libc/sysdeps/unix/sysv/linux/bits/shm.h.jj Tue Jan 18 05:27:56 2000 +++ libc/sysdeps/unix/sysv/linux/bits/shm.h Mon Jan 24 10:25:40 2000 @@ -54,23 +54,6 @@ struct shmid_ds unsigned long int __unused5; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_shmid_ds - { - struct __old_ipc_perm shm_perm; /* operation permission struct */ - int shm_segsz; /* size of segment in bytes */ - __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() */ - __ipc_pid_t shm_cpid; /* pid of creator */ - __ipc_pid_t shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ - unsigned short int __shm_npages; /* size of segment (pages) */ - unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ - }; -#endif - #ifdef __USE_MISC /* ipcs ctl commands */ @@ -92,15 +75,6 @@ struct shminfo unsigned long int __unused2; unsigned long int __unused3; unsigned long int __unused4; - }; - -struct __old_shminfo - { - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; }; struct shm_info --- libc/sysdeps/unix/sysv/linux/bits/sem_compat.h.jj Mon Jan 24 10:34:41 2000 +++ libc/sysdeps/unix/sysv/linux/bits/sem_compat.h Mon Jan 24 11:01:20 2000 @@ -0,0 +1,32 @@ +/* Copyright (C) 1995-1999, 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/sem.h> +#include <bits/ipc_priv.h> + +struct __old_semid_ds +{ + struct __old_ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ + struct sem *__sembase; /* ptr to first semaphore in array */ + struct sem_queue *__sem_pending; /* pending operations */ + struct sem_queue *__sem_pending_last; /* last pending operation */ + struct sem_undo *__undo; /* ondo requests on this array */ + unsigned short int sem_nsems; /* number of semaphores in set */ +}; --- libc/sysdeps/unix/sysv/linux/bits/ipc_priv.h.jj Mon Jan 24 10:19:31 2000 +++ libc/sysdeps/unix/sysv/linux/bits/ipc_priv.h Mon Jan 24 10:53:40 2000 @@ -0,0 +1,54 @@ +/* Copyright (C) 1995-1999, 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/ipc.h> + +#define __IPC_64 0x100 + +struct __old_ipc_perm +{ + __key_t __key; /* Key. */ + unsigned short int uid; /* Owner's user ID. */ + unsigned short int gid; /* Owner's group ID. */ + unsigned short int cuid; /* Creator's user ID. */ + unsigned short int cgid; /* Creator's group ID. */ + unsigned short int mode; /* Read/write permission. */ + unsigned short int __seq; /* Sequence number. */ +}; + + +__BEGIN_DECLS + +/* The actual system call: all functions are multiplexed by this. */ +extern int __syscall_ipc (int __call, int __first, int __second, + int __third, void *__ptr); + +__END_DECLS + +/* The codes for the functions to use the multiplexer `__syscall_ipc'. */ +#define IPCOP_semop 1 +#define IPCOP_semget 2 +#define IPCOP_semctl 3 +#define IPCOP_msgsnd 11 +#define IPCOP_msgrcv 12 +#define IPCOP_msgget 13 +#define IPCOP_msgctl 14 +#define IPCOP_shmat 21 +#define IPCOP_shmdt 22 +#define IPCOP_shmget 23 +#define IPCOP_shmctl 24 --- libc/sysdeps/unix/sysv/linux/bits/msq_compat.h.jj Mon Jan 24 10:34:41 2000 +++ libc/sysdeps/unix/sysv/linux/bits/msq_compat.h Mon Jan 24 11:01:07 2000 @@ -0,0 +1,37 @@ +/* Copyright (C) 1995-1999, 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/msq.h> +#include <bits/ipc_priv.h> + +struct __old_msqid_ds +{ + struct __old_ipc_perm msg_perm; /* structure describing operation permission */ + struct msg *__msg_first; /* pointer to first message on queue */ + struct msg *__msg_last; /* pointer to last message on queue */ + __time_t msg_stime; /* time of last msgsnd command */ + __time_t msg_rtime; /* time of last msgrcv command */ + __time_t msg_ctime; /* time of last change */ + struct wait_queue *__wwait; /* ??? */ + struct wait_queue *__rwait; /* ??? */ + unsigned short int __msg_cbytes; /* current number of bytes on queue */ + unsigned short int msg_qnum; /* number of messages currently on queue */ + unsigned short int msg_qbytes; /* max number of bytes allowed on queue */ + __ipc_pid_t msg_lspid; /* pid of last msgsnd() */ + __ipc_pid_t msg_lrpid; /* pid of last msgrcv() */ +}; --- libc/sysdeps/unix/sysv/linux/sparc/bits/ipc.h.jj Tue Jan 18 05:30:59 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/bits/ipc.h Mon Jan 24 10:54:30 2000 @@ -37,8 +37,6 @@ /* Special key values. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */ -#define __IPC_64 0x100 - /* Data structure used to pass permission information to IPC operations. */ struct ipc_perm @@ -60,39 +58,3 @@ struct ipc_perm unsigned long long int __unused1; unsigned long long int __unused2; }; - -#ifdef __LIBC_IPC_INTERNAL -struct __old_ipc_perm - { - __key_t __key; /* Key. */ - unsigned short int uid; /* Owner's user ID. */ - unsigned short int gid; /* Owner's group ID. */ - unsigned short int cuid; /* Creator's user ID. */ - unsigned short int cgid; /* Creator's group ID. */ - unsigned short int mode; /* Read/write permission. */ - unsigned short int __seq; /* Sequence number. */ - }; - -__BEGIN_DECLS - -/* The actual system call: all functions are multiplexed by this. */ -extern int __syscall_ipc (int __call, int __first, int __second, - int __third, void *__ptr); - -__END_DECLS - - -/* The codes for the functions to use the multiplexer `__syscall_ipc'. */ -#define IPCOP_semop 1 -#define IPCOP_semget 2 -#define IPCOP_semctl 3 -#define IPCOP_msgsnd 11 -#define IPCOP_msgrcv 12 -#define IPCOP_msgget 13 -#define IPCOP_msgctl 14 -#define IPCOP_shmat 21 -#define IPCOP_shmdt 22 -#define IPCOP_shmget 23 -#define IPCOP_shmctl 24 - -#endif /* __LIBC_IPC_INTERNAL */ --- libc/sysdeps/unix/sysv/linux/sparc/bits/msq.h.jj Tue Jan 18 05:31:06 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/bits/msq.h Mon Jan 24 10:55:02 2000 @@ -54,27 +54,6 @@ struct msqid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL - -struct __old_msqid_ds -{ - struct __old_ipc_perm msg_perm; /* structure describing operation permission */ - struct msg *__msg_first; /* pointer to first message on queue */ - struct msg *__msg_last; /* pointer to last message on queue */ - __time_t msg_stime; /* time of last msgsnd command */ - __time_t msg_rtime; /* time of last msgrcv command */ - __time_t msg_ctime; /* time of last change */ - struct wait_queue *__wwait; /* ??? */ - struct wait_queue *__rwait; /* ??? */ - unsigned short int __msg_cbytes; /* current number of bytes on queue */ - unsigned short int msg_qnum; /* number of messages currently on queue */ - unsigned short int msg_qbytes; /* max number of bytes allowed on queue */ - __ipc_pid_t msg_lspid; /* pid of last msgsnd() */ - __ipc_pid_t msg_lrpid; /* pid of last msgrcv() */ -}; - -#endif - #ifdef __USE_MISC # define msg_cbytes __msg_cbytes --- libc/sysdeps/unix/sysv/linux/sparc/bits/sem.h.jj Tue Jan 18 05:31:12 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/bits/sem.h Mon Jan 24 10:55:43 2000 @@ -53,20 +53,6 @@ struct semid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_semid_ds -{ - struct __old_ipc_perm sem_perm; /* operation permission struct */ - __time_t sem_otime; /* last semop() time */ - __time_t sem_ctime; /* last time changed by semctl() */ - struct sem *__sembase; /* ptr to first semaphore in array */ - struct sem_queue *__sem_pending; /* pending operations */ - struct sem_queue *__sem_pending_last; /* last pending operation */ - struct sem_undo *__undo; /* ondo requests on this array */ - unsigned short int sem_nsems; /* number of semaphores in set */ -}; -#endif - /* The user should define a union like the following to use it for arguments for `semctl'. --- libc/sysdeps/unix/sysv/linux/sparc/bits/shm.h.jj Tue Jan 18 05:31:19 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/bits/shm.h Mon Jan 24 10:56:13 2000 @@ -61,23 +61,6 @@ struct shmid_ds unsigned long int __unused2; }; -#ifdef __LIBC_IPC_INTERNAL -struct __old_shmid_ds - { - struct __old_ipc_perm shm_perm; /* operation permission struct */ - int shm_segsz; /* size of segment in bytes */ - __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() */ - __ipc_pid_t shm_cpid; /* pid of creator */ - __ipc_pid_t shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ - unsigned short int __shm_npages; /* size of segment (pages) */ - unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ - }; -#endif - #ifdef __USE_MISC /* ipcs ctl commands */ @@ -99,15 +82,6 @@ struct shminfo unsigned long __unused2; unsigned long __unused3; unsigned long __unused4; - }; - -struct __old_shminfo - { - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; }; struct shm_info --- libc/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c.jj Tue Jan 18 05:33:09 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c Mon Jan 24 11:02:58 2000 @@ -19,6 +19,7 @@ #include <errno.h> #include <sys/msg.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c.jj Tue Jan 18 05:33:20 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c Mon Jan 24 11:03:34 2000 @@ -19,6 +19,7 @@ #include <errno.h> #include <sys/shm.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c.jj Tue Jan 18 05:33:14 2000 +++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c Mon Jan 24 11:03:18 2000 @@ -20,6 +20,7 @@ #include <errno.h> #include <stdarg.h> #include <sys/sem.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/msgctl.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/msgctl.c Mon Jan 24 11:04:01 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/msg.h> +#include <bits/msq_compat.h> #include <sysdep.h> #include <string.h> --- libc/sysdeps/unix/sysv/linux/msgget.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/msgget.c Mon Jan 24 11:04:17 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/msg.h> +#include <bits/ipc_priv.h> #include <stdlib.h> /* for definition of NULL */ #include <sysdep.h> --- libc/sysdeps/unix/sysv/linux/msgrcv.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/msgrcv.c Mon Jan 24 11:04:34 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/msg.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/msgsnd.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/msgsnd.c Mon Jan 24 11:04:53 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/msg.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/semctl.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/semctl.c Mon Jan 24 11:05:14 2000 @@ -17,10 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <stdarg.h> #include <sys/sem.h> +#include <bits/sem_compat.h> #include <sysdep.h> #include <string.h> --- libc/sysdeps/unix/sysv/linux/semget.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/semget.c Mon Jan 24 11:05:41 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/sem.h> +#include <bits/ipc_priv.h> #include <stdlib.h> /* for definition of NULL */ #include <sysdep.h> --- libc/sysdeps/unix/sysv/linux/semop.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/semop.c Mon Jan 24 11:06:02 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/sem.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/shmat.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/shmat.c Mon Jan 24 11:06:18 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/shm.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/shmctl.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/shmctl.c Mon Jan 24 11:06:40 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/shm.h> +#include <bits/shm_compat.h> #include <sysdep.h> #include <string.h> --- libc/sysdeps/unix/sysv/linux/shmdt.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/shmdt.c Mon Jan 24 11:06:50 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/shm.h> +#include <bits/ipc_priv.h> #include <sysdep.h> #include <sys/syscall.h> --- libc/sysdeps/unix/sysv/linux/shmget.c.jj Wed Jan 19 21:36:10 2000 +++ libc/sysdeps/unix/sysv/linux/shmget.c Mon Jan 24 11:07:05 2000 @@ -17,9 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __LIBC_IPC_INTERNAL #include <errno.h> #include <sys/shm.h> +#include <bits/ipc_priv.h> #include <stdlib.h> /* for definition of NULL */ #include <sysdep.h> Cheers, Jakub ___________________________________________________________________ Jakub Jelinek | jakub@redhat.com | http://sunsite.mff.cuni.cz/~jj Linux version 2.3.40 on a sparc64 machine (1343.49 BogoMips) ___________________________________________________________________
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |