AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-26 15:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-04-29  Ralf Baechle  <ralf@gnu.org>

	* sysdeps/unix/sysv/linux/mips/bits/sem.h: Make structure
	definitions match the kernel definitions.
	* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
This commit is contained in:
Andreas Jaeger 2001-04-30 07:20:48 +00:00
parent ba77ce24a6
commit b7dd38e6e7
4 changed files with 136 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-29 Ralf Baechle <ralf@gnu.org>
* sysdeps/unix/sysv/linux/mips/bits/sem.h: Make structure
definitions match the kernel definitions.
* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
2001-04-29 Ben Collins <bcollins@debian.org> 2001-04-29 Ben Collins <bcollins@debian.org>
* sysdeps/sparc/sparc64/dl-machine.h: Fix multiline strings * sysdeps/sparc/sparc64/dl-machine.h: Fix multiline strings

54
sysdeps/unix/sysv/linux/mips/bits/ipc.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. /* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -8,23 +8,23 @@
The GNU C Library is distributed in the hope that it will be useful, The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Library General Public 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, 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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#ifndef _SYS_IPC_H #ifndef _SYS_IPC_H
# error "Never use <bits/ipc.h> directly; include <sys/ipc.h> instead." # error "Never use <bits/ipc.h> directly; include <sys/ipc.h> instead."
#endif #endif
#include <sys/types.h> #include <bits/types.h>
/* Mode bits for `msgget', `semget', and `shmget'. */ /* Mode bits for `msgget', `semget', and `shmget'. */
#define IPC_CREAT 01000 /* Create key if key does not exist. */ #define IPC_CREAT 01000 /* Create key if key does not exist. */
#define IPC_EXCL 02000 /* Fail if key exists. */ #define IPC_EXCL 02000 /* Fail if key exists. */
#define IPC_NOWAIT 04000 /* Return error on wait. */ #define IPC_NOWAIT 04000 /* Return error on wait. */
/* Control commands for `msgctl', `semctl', and `shmctl'. */ /* Control commands for `msgctl', `semctl', and `shmctl'. */
@ -35,42 +35,20 @@
# define IPC_INFO 3 /* See ipcs. */ # define IPC_INFO 3 /* See ipcs. */
#endif #endif
/* Special key values. */ /* Special key values. */
#define IPC_PRIVATE ((__key_t) 0) /* Private key. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */
/* Data structure used to pass permission information to IPC operations. */ /* Data structure used to pass permission information to IPC operations. */
struct ipc_perm struct ipc_perm
{ {
__key_t __key; /* Key. */ unsigned int uid; /* Owner's user ID. */
long int uid; /* Owner's user ID. */ unsigned int gid; /* Owner's group ID. */
long int gid; /* Owner's group ID. */ unsigned int cuid; /* Creator's user ID. */
long int cuid; /* Creator's user ID. */ unsigned int cgid; /* Creator's group ID. */
long int cgid; /* Creator's group ID. */ unsigned int mode; /* Read/write permission. */
unsigned long int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */ unsigned short int __seq; /* Sequence number. */
}; unsigned short int __pad1;
unsigned long int __unused1;
unsigned long int __unused2;
__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) __THROW;
__END_DECLS
#ifdef __USE_GNU
/* 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

85
sysdeps/unix/sysv/linux/mips/bits/sem.h Normal file
View File

@ -0,0 +1,85 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 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. */
#ifndef _SYS_SEM_H
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
#endif
#include <sys/types.h>
/* Flags for `semop'. */
#define SEM_UNDO 0x1000 /* undo the operation on exit */
/* Commands for `semctl'. */
#define GETPID 11 /* get sempid */
#define GETVAL 12 /* get semval */
#define GETALL 13 /* get all semval's */
#define GETNCNT 14 /* get semncnt */
#define GETZCNT 15 /* get semzcnt */
#define SETVAL 16 /* set semval */
#define SETALL 17 /* set all semval's */
/* Data structure describing a set of semaphores. */
struct semid_ds
{
struct ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
unsigned long int sem_nsems; /* number of semaphores in set */
unsigned long int __unused1;
unsigned long int __unused2;
};
/* The user should define a union like the following to use it for arguments
for `semctl'.
union semun
{
int val; <= value for SETVAL
struct semid_ds *buf; <= buffer for IPC_STAT & IPC_SET
unsigned short int *array; <= array for GETALL & SETALL
struct seminfo *__buf; <= buffer for IPC_INFO
};
Previous versions of this file used to define this union but this is
incorrect. One can test the macro _SEM_SEMUN_UNDEFINED to see whether
one must define the union or not. */
#define _SEM_SEMUN_UNDEFINED 1
#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 */

51
sysdeps/unix/sysv/linux/mips/bits/shm.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. /* Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -20,7 +20,7 @@
# error "Never include <bits/shm.h> directly; use <sys/shm.h> instead." # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
#endif #endif
#include <sys/types.h> #include <bits/types.h>
/* Permission flag for shmget. */ /* Permission flag for shmget. */
#define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */ #define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */
@ -35,50 +35,55 @@
#define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
/* Type to count number of attaches. */
typedef unsigned long int shmatt_t;
/* Data structure describing a set of semaphores. */ /* Data structure describing a set of semaphores. */
struct shmid_ds struct shmid_ds
{ {
struct ipc_perm shm_perm; /* operation permission struct */ struct ipc_perm shm_perm; /* operation permission struct */
int shm_segsz; /* size of segment in bytes */ size_t shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */ __time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */ __time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */ __time_t shm_ctime; /* time of last change by shmctl() */
long int shm_cpid; /* pid of creator */ __pid_t shm_cpid; /* pid of creator */
long int shm_lpid; /* pid of last shmop */ __pid_t shm_lpid; /* pid of last shmop */
unsigned short int shm_nattch; /* number of current attaches */ shmatt_t shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */ unsigned long int __unused1;
unsigned long int *__unbounded __shm_pages; /* array of ptrs to frames -> SHMMAX */ unsigned long int __unused2;
struct vm_area_struct *__unbounded __attaches; /* descriptors for attaches */
}; };
#ifdef __USE_MISC #ifdef __USE_MISC
/* ipcs ctl commands */ /* ipcs ctl commands */
# define SHM_STAT 13 # define SHM_STAT 13
# define SHM_INFO 14 # define SHM_INFO 14
/* shm_mode upper byte flags */ /* shm_mode upper byte flags */
# define SHM_DEST 01000 /* segment will be destroyed on last detach */ # define SHM_DEST 01000 /* segment will be destroyed on last detach */
# define SHM_LOCKED 02000 /* segment will not be swapped */ # define SHM_LOCKED 02000 /* segment will not be swapped */
struct shminfo struct shminfo
{ {
int shmmax; unsigned long int shmmax;
int shmmin; unsigned long int shmmin;
int shmmni; unsigned long int shmmni;
int shmseg; unsigned long int shmseg;
int shmall; unsigned long int shmall;
unsigned long int __unused1;
unsigned long int __unused2;
unsigned long int __unused3;
unsigned long int __unused4;
}; };
struct shm_info struct shm_info
{ {
int used_ids; int used_ids;
ulong shm_tot; /* total allocated shm */ unsigned long int shm_tot; /* total allocated shm */
ulong shm_rss; /* total resident shm */ unsigned long int shm_rss; /* total resident shm */
ulong shm_swp; /* total swapped shm */ unsigned long int shm_swp; /* total swapped shm */
ulong swap_attempts; unsigned long int swap_attempts;
ulong swap_successes; unsigned long int swap_successes;
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */