From a6df500f7daacc08cd7c66f4212cb6ab6cbe803e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 19 Nov 2003 18:50:23 +0000 Subject: * cygserver.h (client_request::request_code_t): Add CYGSERVER_REQUEST_MSG and CYGSERVER_REQUEST_SEM. (admininstrator_group_sid): Add extern declaration. * cygserver_ipc.h: Rewrite. * cygserver_msg.h: New file. * cygserver_sem.h: New file. * cygserver_shm.h: More or less rewrite. * cygwin.din: Add msgctl, msgget, msgrcv, msgsnd, semctl, semget and semop. * msg.cc: Rewrite. * safe_memory.h: Remove. * sem.cc: Rewrite. * shm.cc: Rewrite. * include/cygwin/ipc.h: Use appropriate guard. (struct ipc_perm): Add seq. (IPCID_TO_IX): New define from BSD. (IPCID_TO_SEQ): Ditto. (IXSEQ_TO_IPCID): Ditto. (IPC_R): Ditto. (IPC_W): Ditto. (IPC_M): Ditto. * include/cygwin/msg.h: Use appropriate guard. #ifdef _KERNEL all stuff not explicitely defined by SUSv3. Use signed types in structs to match types used in BSD. (msgqnum_t): Define unsigned. (msglen_t): Ditto. (struct msqid_ds): Add msg_first and msg_last. (struct msginfo): Remove msgpool. Add msgssz and msgseg. * include/cygwin/sem.h: Use appropriate guard. #ifdef _KERNEL all stuff not explicitely defined by SUSv3. Use signed types in structs to match types used in BSD. (SEM_UNDO): Define appropriately. (struct semid_ds): Add sem_base. (struct seminfo): Add semmap and semusz. (SEM_A): New define from BSD. (SEM_R): Ditto. (SEM_ALLOC): Ditto. (union semun): Define. * include/cygwin/shm.h: Use appropriate guard. #ifdef _KERNEL all stuff not explicitely defined by SUSv3. Use signed types in structs to match types used in BSD. (SHMLBA): Define using cygwin_internal(CW_GET_SHMLBA) call. (struct shmid_ds): Add shm_internal. (struct shm_info): Rename shm_ids to used_ids as in BSD. Add define for shm_ids. * include/cygwin/sysproto.h: New file. * include/cygwin/version.h: Bump API minor number. * include/sys/ipc.h: New file. * include/sys/msg.h: New file. * include/sys/queue.h: New file from BSD. * include/sys/sem.h: New file. * include/sys/shm.h: New file. * include/sys/sysproto.h: New file. --- winsup/cygwin/include/cygwin/ipc.h | 17 +- winsup/cygwin/include/cygwin/msg.h | 48 +-- winsup/cygwin/include/cygwin/sem.h | 75 +++-- winsup/cygwin/include/cygwin/shm.h | 74 +++-- winsup/cygwin/include/cygwin/sysproto.h | 94 ++++++ winsup/cygwin/include/cygwin/version.h | 3 +- winsup/cygwin/include/sys/ipc.h | 18 ++ winsup/cygwin/include/sys/msg.h | 18 ++ winsup/cygwin/include/sys/queue.h | 557 ++++++++++++++++++++++++++++++++ winsup/cygwin/include/sys/sem.h | 18 ++ winsup/cygwin/include/sys/shm.h | 18 ++ winsup/cygwin/include/sys/sysproto.h | 18 ++ 12 files changed, 883 insertions(+), 75 deletions(-) create mode 100644 winsup/cygwin/include/cygwin/sysproto.h create mode 100644 winsup/cygwin/include/sys/ipc.h create mode 100644 winsup/cygwin/include/sys/msg.h create mode 100644 winsup/cygwin/include/sys/queue.h create mode 100644 winsup/cygwin/include/sys/sem.h create mode 100644 winsup/cygwin/include/sys/shm.h create mode 100644 winsup/cygwin/include/sys/sysproto.h (limited to 'winsup/cygwin/include') diff --git a/winsup/cygwin/include/cygwin/ipc.h b/winsup/cygwin/include/cygwin/ipc.h index 8a88a1085..31b79ffd4 100644 --- a/winsup/cygwin/include/cygwin/ipc.h +++ b/winsup/cygwin/include/cygwin/ipc.h @@ -9,8 +9,8 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ -#ifndef _SYS_IPC_H -#define _SYS_IPC_H +#ifndef _CYGWIN_IPC_H +#define _CYGWIN_IPC_H #ifdef __cplusplus extern "C" @@ -25,6 +25,7 @@ struct ipc_perm gid_t cgid; /* Creator's group ID. */ mode_t mode; /* Read/write permission. */ key_t key; + unsigned short seq; }; /* Mode bits: @@ -44,10 +45,20 @@ struct ipc_perm #define IPC_STAT 0x1002 /* Get options. */ #define IPC_INFO 0x1003 /* For ipcs(8). */ +#ifdef _KERNEL +#define IPCID_TO_IX(id) ((id) & 0xffff) +#define IPCID_TO_SEQ(id) (((id) >> 16) & 0xffff) +#define IXSEQ_TO_IPCID(ix,perm) (((perm.seq) << 16) | (ix & 0xffff)) + +#define IPC_R 000400 /* read permission */ +#define IPC_W 000200 /* write/alter permission */ +#define IPC_M 010000 /* permission to change control info */ +#endif + key_t ftok (const char *path, int id); #ifdef __cplusplus } #endif -#endif /* _SYS_IPC_H */ +#endif /* _CYGWIN_IPC_H */ diff --git a/winsup/cygwin/include/cygwin/msg.h b/winsup/cygwin/include/cygwin/msg.h index 14e89f556..8679786dd 100644 --- a/winsup/cygwin/include/cygwin/msg.h +++ b/winsup/cygwin/include/cygwin/msg.h @@ -9,8 +9,8 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ -#ifndef _SYS_MSG_H -#define _SYS_MSG_H +#ifndef _CYGWIN_MSG_H +#define _CYGWIN_MSG_H #include @@ -23,18 +23,20 @@ extern "C" */ #define MSG_NOERROR 0x01 /* No error if big message. */ +#ifdef _KERNEL /* Command definitions for the semctl () function: */ #define MSG_STAT 0x2000 /* For ipcs(8) */ #define MSG_INFO 0x2001 /* For ipcs(8) */ +#endif /* _KERNEL */ /* Used for the number of messages in the message queue. */ -typedef long int msgqnum_t; +typedef unsigned long msgqnum_t; /* Used for the number of bytes allowed in a message queue. */ -typedef long int msglen_t; +typedef unsigned long msglen_t; struct msqid_ds { @@ -47,38 +49,46 @@ struct msqid_ds timestruc_t msg_stim; /* Time of last msgsnd (). */ timestruc_t msg_rtim; /* Time of last msgrcv (). */ timestruc_t msg_ctim; /* Time of last change. */ +#ifdef _KERNEL + struct msg *msg_first; + struct msg *msg_last; +#else long msg_spare4[2]; +#endif /* _KERNEL */ }; #define msg_stime msg_stim.tv_sec #define msg_rtime msg_rtim.tv_sec #define msg_ctime msg_ctim.tv_sec +#ifdef _KERNEL /* Buffer type for msgctl (IPC_INFO, ...) as used by ipcs(8). */ struct msginfo { - unsigned long msgpool; /* Maximum number of message bytes, - system wide. */ - unsigned long msgmax; /* Maximum number of bytes per - message. */ - unsigned long msgmnb; /* Maximum number of bytes on any one - message queue. */ - unsigned long msgmni; /* Maximum number of message queues, - system wide. */ - unsigned long msgtql; /* Maximum number of messages, system - wide. */ - unsigned long msg_spare[4]; + long msgmax; /* Maximum number of bytes per + message. */ + long msgmnb; /* Maximum number of bytes on any one + message queue. */ + long msgmni; /* Maximum number of message queues, + system wide. */ + long msgtql; /* Maximum number of messages, system + wide. */ + long msgssz; /* Size of a message segment, must be + small power of 2 greater than 4. */ + long msgseg; /* Number of message segments */ + long msg_spare[2]; }; /* Buffer type for msgctl (MSG_INFO, ...) as used by ipcs(8). */ struct msg_info { - unsigned long msg_ids; /* Number of allocated queues. */ - unsigned long msg_num; /* Number of messages, system wide. */ - unsigned long msg_tot; /* Size in bytes of messages, system wide. */ + long msg_ids; /* Number of allocated queues. */ + long msg_num; /* Number of messages, system wide. */ + long msg_tot; /* Size in bytes of messages, system wide. */ }; +#endif /* _KERNEL */ int msgctl (int msqid, int cmd, struct msqid_ds *buf); int msgget (key_t key, int msgflg); @@ -89,4 +99,4 @@ int msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg); } #endif -#endif /* _SYS_MSG_H */ +#endif /* _CYGWIN_MSG_H */ diff --git a/winsup/cygwin/include/cygwin/sem.h b/winsup/cygwin/include/cygwin/sem.h index a3ece9f8a..af7a42f36 100644 --- a/winsup/cygwin/include/cygwin/sem.h +++ b/winsup/cygwin/include/cygwin/sem.h @@ -9,8 +9,8 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ -#ifndef _SYS_SEM_H -#define _SYS_SEM_H +#ifndef _CYGWIN_SEM_H +#define _CYGWIN_SEM_H #include @@ -21,7 +21,7 @@ extern "C" /* Semaphore operation flags: */ -#define SEM_UNDO /* Set up adjust on exit entry. */ +#define SEM_UNDO 010000 /* Set up adjust on exit entry. */ /* Command definitions for the semctl () function: */ @@ -33,8 +33,10 @@ extern "C" #define SETVAL 0x3005 /* Set semval. */ #define SETALL 0x3006 /* Set all cases of semval. */ +#ifdef _KERNEL #define SEM_STAT 0x3010 /* For ipcs(8). */ #define SEM_INFO 0x3011 /* For ipcs(8). */ +#endif /* _KERNEL */ struct semid_ds { @@ -42,7 +44,12 @@ struct semid_ds unsigned short sem_nsems; /* Number of semaphores in set. */ timestruc_t sem_otim; /* Last semop () time. */ timestruc_t sem_ctim; /* Last time changed by semctl (). */ +#ifdef _KERNEL + struct sem *sem_base; /* pointer to first semaphore in set */ + long sem_spare4[1]; +#else long sem_spare4[2]; +#endif /* _KERNEL */ }; #define sem_otime sem_otim.tv_sec @@ -55,35 +62,61 @@ struct sembuf short sem_flg; /* Operation flags. */ }; +#ifdef _KERNEL /* Buffer type for semctl (IPC_INFO, ...) as used by ipcs(8). */ struct seminfo { - unsigned long semmni; /* Maximum number of unique semaphore - sets, system wide. */ - unsigned long semmns; /* Maximum number of semaphores, - system wide. */ - unsigned long semmsl; /* Maximum number of semaphores per - semaphore set. */ - unsigned long semopm; /* Maximum number of operations per - semop call. */ - unsigned long semmnu; /* Maximum number of undo structures, - system wide. */ - unsigned long semume; /* Maximum number of undo entries per - undo structure. */ - unsigned long semvmx; /* Maximum semaphore value. */ - unsigned long semaem; /* Maximum adjust-on-exit value. */ - unsigned long sem_spare[4]; + long semmni; /* Maximum number of unique semaphore + sets, system wide. */ + long semmns; /* Maximum number of semaphores, + system wide. */ + long semmsl; /* Maximum number of semaphores per + semaphore set. */ + long semopm; /* Maximum number of operations per + semop call. */ + long semmnu; /* Maximum number of undo structures, + system wide. */ + long semume; /* Maximum number of undo entries per + undo structure. */ + long semvmx; /* Maximum semaphore value. */ + long semaem; /* Maximum adjust-on-exit value. */ + long semmap; /* # of entries in semaphore map */ + long semusz; /* size in bytes of undo structure */ + long sem_spare[2]; }; /* Buffer type for semctl (SEM_INFO, ...) as used by ipcs(8). */ struct sem_info { - unsigned long sem_ids; /* Number of allocated semaphore sets. */ - unsigned long sem_num; /* Number of allocated semaphores. */ + long sem_ids; /* Number of allocated semaphore sets. */ + long sem_num; /* Number of allocated semaphores. */ }; +/* Permission flags */ +#define SEM_A IPC_W /* alter permission */ +#define SEM_R IPC_R /* read permission */ + +/* Internally used mode bits. */ +#define SEM_ALLOC 01000 /* semaphore is allocated */ + +#endif /* _KERNEL */ + +#ifdef _KERNEL +/* According to SUSv3, "the fourth argument [to semctl()] is optional and + depends upon the operation requested. If required, it is of type + union semun, which the application shall explicitly declare:" */ +union semun { + int val; /* value for SETVAL */ + struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */ + unsigned short *array; /* array for GETALL, SETALL */ +}; +/* Therefore this union is only declared here if building internal code. + _KERNEL must not be defined in exernal applications! Declare union + semun explicitely as required by SUSv3, please. */ +#endif /* _KERNEL */ + int semctl (int semid, int semnum, int cmd, ...); int semget (key_t key, int nsems, int semflg); int semop (int semid, struct sembuf *sops, size_t nsops); @@ -92,4 +125,4 @@ int semop (int semid, struct sembuf *sops, size_t nsops); } #endif -#endif /* _SYS_SEM_H */ +#endif /* _CYGWIN_SEM_H */ diff --git a/winsup/cygwin/include/cygwin/shm.h b/winsup/cygwin/include/cygwin/shm.h index b6b2d447c..2c882012c 100644 --- a/winsup/cygwin/include/cygwin/shm.h +++ b/winsup/cygwin/include/cygwin/shm.h @@ -9,30 +9,34 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ -#ifndef _SYS_SHM_H -#define _SYS_SHM_H +#ifndef _CYGWIN_SHM_H +#define _CYGWIN_SHM_H #include +#include #ifdef __cplusplus extern "C" { #endif -/* 64 Kb was hardcoded for x86. MS states this may change, but we need - * it in the header file. - */ -#define SHMLBA 65536 /* Segment low boundary address multiple. */ +/* Segment low boundary address multiple. + * + * 64 Kb was hardcoded for x86. MS states this may change so the constant + * expression is replaced by a function call returning the correct value. */ +#define SHMLBA (cygwin_internal (CW_GET_SHMLBA)) /* Shared memory operation flags: */ #define SHM_RDONLY 0x01 /* Attach read-only (else read-write). */ #define SHM_RND 0x02 /* Round attach address to SHMLBA. */ +#ifdef _KERNEL /* Command definitions for the semctl () function: */ #define SHM_STAT 0x4000 /* For ipcs(8) */ #define SHM_INFO 0x4001 /* For ipcs(8) */ +#endif /* _KERNEL */ /* Unsigned integer used for the number of current attaches. */ @@ -40,47 +44,55 @@ typedef unsigned int shmatt_t; struct shmid_ds { - struct ipc_perm shm_perm; /* Operation permission structure. */ - size_t shm_segsz; /* Size of segment in bytes. */ - pid_t shm_lpid; /* Process ID of last operation. */ - pid_t shm_cpid; /* Process ID of creator. */ - shmatt_t shm_nattch; /* Number of current attaches. */ - timestruc_t shm_atim; /* Time of last shmat (). */ - timestruc_t shm_dtim; /* Time of last shmdt (). */ - timestruc_t shm_ctim; /* Time of last change by shmctl (). */ - long shm_spare4[2]; + struct ipc_perm shm_perm; /* Operation permission structure. */ + size_t shm_segsz; /* Size of segment in bytes. */ + pid_t shm_lpid; /* Process ID of last operation. */ + pid_t shm_cpid; /* Process ID of creator. */ + shmatt_t shm_nattch;/* Number of current attaches. */ + timestruc_t shm_atim; /* Time of last shmat (). */ + timestruc_t shm_dtim; /* Time of last shmdt (). */ + timestruc_t shm_ctim; /* Time of last change by shmctl (). */ +#ifdef _KERNEL + struct shm_handle *shm_internal; + long shm_spare4[1]; +#else + long shm_spare4[2]; +#endif /* _KERNEL */ }; #define shm_atime shm_atim.tv_sec #define shm_dtime shm_dtim.tv_sec #define shm_ctime shm_ctim.tv_sec +#ifdef _KERNEL /* Buffer type for shmctl (IPC_INFO, ...) as used by ipcs(8). */ struct shminfo { - unsigned long shmmax; /* Maximum size in bytes of a shared - memory segment. */ - unsigned long shmmin; /* Minimum size in bytes of a shared - memory segment. */ - unsigned long shmmni; /* Maximum number of shared memory - segments, system wide. */ - unsigned long shmseg; /* Maximum number of shared memory - segments attached per process. */ - unsigned long shmall; /* Maximum number of bytes of shared - memory, system wide. */ - unsigned long shm_spare[4]; + long shmmax; /* Maximum size in bytes of a shared + memory segment. */ + long shmmin; /* Minimum size in bytes of a shared + memory segment. */ + long shmmni; /* Maximum number of shared memory + segments, system wide. */ + long shmseg; /* Maximum number of shared memory + segments attached per process. */ + long shmall; /* Maximum number of bytes of shared + memory, system wide. */ + long shm_spare[4]; }; /* Buffer type for shmctl (SHM_INFO, ...) as used by ipcs(8). */ struct shm_info { - unsigned long shm_ids; /* Number of allocated segments. */ - unsigned long shm_tot; /* Size in bytes of allocated segments. */ - unsigned long shm_atts; /* Number of attached segments, system - wide. */ +#define shm_ids used_ids + long used_ids; /* Number of allocated segments. */ + long shm_tot; /* Size in bytes of allocated segments. */ + long shm_atts; /* Number of attached segments, system + wide. */ }; +#endif /* _KERNEL */ void *shmat (int shmid, const void *shmaddr, int shmflg); int shmctl (int shmid, int cmd, struct shmid_ds *buf); @@ -91,4 +103,4 @@ int shmget (key_t key, size_t size, int shmflg); } #endif -#endif /* _SYS_SHM_H */ +#endif /* _CYGWIN_SHM_H */ diff --git a/winsup/cygwin/include/cygwin/sysproto.h b/winsup/cygwin/include/cygwin/sysproto.h new file mode 100644 index 000000000..5b551f457 --- /dev/null +++ b/winsup/cygwin/include/cygwin/sysproto.h @@ -0,0 +1,94 @@ +/* cygwin/sysproto.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* cygwin/sysproto.h header file for Cygwin. */ + +#ifndef _CYGWIN_SYSPROTO_H +#define _CYGWIN_SYSPROTO_H +#define _SYS_SYSPROTO_H_ /* Keep it, used by BSD files */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +struct msgctl_args { + int msqid; + int cmd; + struct msqid_ds *buf; +}; + +struct msgget_args { + key_t key; + int msgflg; +}; + +struct msgrcv_args { + int msqid; + void *msgp; + size_t msgsz; + long msgtyp; + int msgflg; +}; + +struct msgsnd_args { + int msqid; + const void *msgp; + size_t msgsz; + int msgflg; +}; + +struct semctl_args { + int semid; + int semnum; + int cmd; + union semun *arg; +}; + +struct semget_args { + key_t key; + int nsems; + int semflg; +}; + +struct semop_args { + int semid; + struct sembuf *sops; + size_t nsops; +}; + +struct shmat_args { + int shmid; + const void *shmaddr; + int shmflg; +}; + +struct shmctl_args { + int shmid; + int cmd; + struct shmid_ds *buf; +}; + +struct shmdt_args { + const void *shmaddr; +}; + +struct shmget_args { + key_t key; + size_t size; + int shmflg; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* _CYGWIN_SYSPROTO_H */ diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 24b9eb62a..bea535e51 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -228,13 +228,14 @@ details. */ 101: Export err, errx, verr, verrx, warn, warnx, vwarn, vwarnx. 102: CW_GET_UID_FROM_SID and CW_GET_GID_FROM_SID addition to external.cc. 103: Export getprogname, setprogname. + 104: Export msgctl, msgget, msgrcv, msgsnd, semctl, semget, semop. */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 103 +#define CYGWIN_VERSION_API_MINOR 104 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible diff --git a/winsup/cygwin/include/sys/ipc.h b/winsup/cygwin/include/sys/ipc.h new file mode 100644 index 000000000..e615bd7c2 --- /dev/null +++ b/winsup/cygwin/include/sys/ipc.h @@ -0,0 +1,18 @@ +/* sys/ipc.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* sys/ipc.h header file for Cygwin. */ + +#ifndef _SYS_IPC_H +#define _SYS_IPC_H + +#include + +#endif /* _SYS_IPC_H */ diff --git a/winsup/cygwin/include/sys/msg.h b/winsup/cygwin/include/sys/msg.h new file mode 100644 index 000000000..a554ab4f8 --- /dev/null +++ b/winsup/cygwin/include/sys/msg.h @@ -0,0 +1,18 @@ +/* sys/msg.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* sys/msg.h header file for Cygwin. */ + +#ifndef _SYS_MSG_H +#define _SYS_MSG_H + +#include + +#endif /* _SYS_MSG_H */ diff --git a/winsup/cygwin/include/sys/queue.h b/winsup/cygwin/include/sys/queue.h new file mode 100644 index 000000000..49d9b68f7 --- /dev/null +++ b/winsup/cygwin/include/sys/queue.h @@ -0,0 +1,557 @@ +/* + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)queue.h 8.5 (Berkeley) 8/20/94 + * $FreeBSD: /repoman/r/ncvs/src/sys/sys/queue.h,v 1.56 2003/08/14 14:49:26 kan Exp $ + */ + +#ifndef _SYS_QUEUE_H_ +#define _SYS_QUEUE_H_ + +#include + +/* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. + * + * A singly-linked list is headed by a single forward pointer. The elements + * are singly linked for minimum space and pointer manipulation overhead at + * the expense of O(n) removal for arbitrary elements. New elements can be + * added to the list after an existing element or at the head of the list. + * Elements being removed from the head of the list should use the explicit + * macro for this purpose for optimum efficiency. A singly-linked list may + * only be traversed in the forward direction. Singly-linked lists are ideal + * for applications with large datasets and few or no removals or for + * implementing a LIFO queue. + * + * A singly-linked tail queue is headed by a pair of pointers, one to the + * head of the list and the other to the tail of the list. The elements are + * singly linked for minimum space and pointer manipulation overhead at the + * expense of O(n) removal for arbitrary elements. New elements can be added + * to the list after an existing element, at the head of the list, or at the + * end of the list. Elements being removed from the head of the tail queue + * should use the explicit macro for this purpose for optimum efficiency. + * A singly-linked tail queue may only be traversed in the forward direction. + * Singly-linked tail queues are ideal for applications with large datasets + * and few or no removals or for implementing a FIFO queue. + * + * A list is headed by a single forward pointer (or an array of forward + * pointers for a hash table header). The elements are doubly linked + * so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before + * or after an existing element or at the head of the list. A list + * may only be traversed in the forward direction. + * + * A tail queue is headed by a pair of pointers, one to the head of the + * list and the other to the tail of the list. The elements are doubly + * linked so that an arbitrary element can be removed without a need to + * traverse the list. New elements can be added to the list before or + * after an existing element, at the head of the list, or at the end of + * the list. A tail queue may be traversed in either direction. + * + * For details on the use of these macros, see the queue(3) manual page. + * + * + * SLIST LIST STAILQ TAILQ + * _HEAD + + + + + * _HEAD_INITIALIZER + + + + + * _ENTRY + + + + + * _INIT + + + + + * _EMPTY + + + + + * _FIRST + + + + + * _NEXT + + + + + * _PREV - - - + + * _LAST - - + + + * _FOREACH + + + + + * _FOREACH_SAFE + + + + + * _FOREACH_REVERSE - - - + + * _FOREACH_REVERSE_SAFE - - - + + * _INSERT_HEAD + + + + + * _INSERT_BEFORE - + - + + * _INSERT_AFTER + + + + + * _INSERT_TAIL - - + + + * _CONCAT - - + + + * _REMOVE_HEAD + - + - + * _REMOVE + + + + + * + */ +#define QUEUE_MACRO_DEBUG 0 +#if QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define TRACEBUF +#define TRASHIT(x) +#endif /* QUEUE_MACRO_DEBUG */ + +/* + * Singly-linked List declarations. + */ +#define SLIST_HEAD(name, type) \ +struct name { \ + struct type *slh_first; /* first element */ \ +} + +#define SLIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define SLIST_ENTRY(type) \ +struct { \ + struct type *sle_next; /* next element */ \ +} + +/* + * Singly-linked List functions. + */ +#define SLIST_EMPTY(head) ((head)->slh_first == NULL) + +#define SLIST_FIRST(head) ((head)->slh_first) + +#define SLIST_FOREACH(var, head, field) \ + for ((var) = SLIST_FIRST((head)); \ + (var); \ + (var) = SLIST_NEXT((var), field)) + +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ + for ((varp) = &SLIST_FIRST((head)); \ + ((var) = *(varp)) != NULL; \ + (varp) = &SLIST_NEXT((var), field)) + +#define SLIST_INIT(head) do { \ + SLIST_FIRST((head)) = NULL; \ +} while (0) + +#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field); \ + SLIST_NEXT((slistelm), field) = (elm); \ +} while (0) + +#define SLIST_INSERT_HEAD(head, elm, field) do { \ + SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \ + SLIST_FIRST((head)) = (elm); \ +} while (0) + +#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) + +#define SLIST_REMOVE(head, elm, type, field) do { \ + if (SLIST_FIRST((head)) == (elm)) { \ + SLIST_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = SLIST_FIRST((head)); \ + while (SLIST_NEXT(curelm, field) != (elm)) \ + curelm = SLIST_NEXT(curelm, field); \ + SLIST_NEXT(curelm, field) = \ + SLIST_NEXT(SLIST_NEXT(curelm, field), field); \ + } \ +} while (0) + +#define SLIST_REMOVE_HEAD(head, field) do { \ + SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ +} while (0) + +/* + * Singly-linked Tail queue declarations. + */ +#define STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} + +#define STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + +/* + * Singly-linked Tail queue functions. + */ +#define STAILQ_CONCAT(head1, head2) do { \ + if (!STAILQ_EMPTY((head2))) { \ + *(head1)->stqh_last = (head2)->stqh_first; \ + (head1)->stqh_last = (head2)->stqh_last; \ + STAILQ_INIT((head2)); \ + } \ +} while (0) + +#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL) + +#define STAILQ_FIRST(head) ((head)->stqh_first) + +#define STAILQ_FOREACH(var, head, field) \ + for((var) = STAILQ_FIRST((head)); \ + (var); \ + (var) = STAILQ_NEXT((var), field)) + + +#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = STAILQ_FIRST((head)); \ + (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define STAILQ_INIT(head) do { \ + STAILQ_FIRST((head)) = NULL; \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_NEXT((tqelm), field) = (elm); \ +} while (0) + +#define STAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL) \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ + STAILQ_FIRST((head)) = (elm); \ +} while (0) + +#define STAILQ_INSERT_TAIL(head, elm, field) do { \ + STAILQ_NEXT((elm), field) = NULL; \ + *(head)->stqh_last = (elm); \ + (head)->stqh_last = &STAILQ_NEXT((elm), field); \ +} while (0) + +#define STAILQ_LAST(head, type, field) \ + (STAILQ_EMPTY((head)) ? \ + NULL : \ + ((struct type *) \ + ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) + +#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) + +#define STAILQ_REMOVE(head, elm, type, field) do { \ + if (STAILQ_FIRST((head)) == (elm)) { \ + STAILQ_REMOVE_HEAD((head), field); \ + } \ + else { \ + struct type *curelm = STAILQ_FIRST((head)); \ + while (STAILQ_NEXT(curelm, field) != (elm)) \ + curelm = STAILQ_NEXT(curelm, field); \ + if ((STAILQ_NEXT(curelm, field) = \ + STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\ + (head)->stqh_last = &STAILQ_NEXT((curelm), field);\ + } \ +} while (0) + +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +#define STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do { \ + if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + +/* + * List declarations. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + +#define LIST_HEAD_INITIALIZER(head) \ + { NULL } + +#define LIST_ENTRY(type) \ +struct { \ + struct type *le_next; /* next element */ \ + struct type **le_prev; /* address of previous next element */ \ +} + +/* + * List functions. + */ + +#define LIST_EMPTY(head) ((head)->lh_first == NULL) + +#define LIST_FIRST(head) ((head)->lh_first) + +#define LIST_FOREACH(var, head, field) \ + for ((var) = LIST_FIRST((head)); \ + (var); \ + (var) = LIST_NEXT((var), field)) + +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define LIST_INIT(head) do { \ + LIST_FIRST((head)) = NULL; \ +} while (0) + +#define LIST_INSERT_AFTER(listelm, elm, field) do { \ + if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\ + LIST_NEXT((listelm), field)->field.le_prev = \ + &LIST_NEXT((elm), field); \ + LIST_NEXT((listelm), field) = (elm); \ + (elm)->field.le_prev = &LIST_NEXT((listelm), field); \ +} while (0) + +#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ + (elm)->field.le_prev = (listelm)->field.le_prev; \ + LIST_NEXT((elm), field) = (listelm); \ + *(listelm)->field.le_prev = (elm); \ + (listelm)->field.le_prev = &LIST_NEXT((elm), field); \ +} while (0) + +#define LIST_INSERT_HEAD(head, elm, field) do { \ + if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \ + LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\ + LIST_FIRST((head)) = (elm); \ + (elm)->field.le_prev = &LIST_FIRST((head)); \ +} while (0) + +#define LIST_NEXT(elm, field) ((elm)->field.le_next) + +#define LIST_REMOVE(elm, field) do { \ + if (LIST_NEXT((elm), field) != NULL) \ + LIST_NEXT((elm), field)->field.le_prev = \ + (elm)->field.le_prev; \ + *(elm)->field.le_prev = LIST_NEXT((elm), field); \ +} while (0) + +/* + * Tail queue declarations. + */ +#define TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} + +#define TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first } + +#define TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +/* + * Tail queue functions. + */ +#define TAILQ_CONCAT(head1, head2, field) do { \ + if (!TAILQ_EMPTY(head2)) { \ + *(head1)->tqh_last = (head2)->tqh_first; \ + (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ + (head1)->tqh_last = (head2)->tqh_last; \ + TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_HEAD(head2); \ + } \ +} while (0) + +#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define TAILQ_FIRST(head) ((head)->tqh_first) + +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) + +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) + +#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var); \ + (var) = TAILQ_PREV((var), headname, field)) + +#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ + for ((var) = TAILQ_LAST((head), headname); \ + (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ + (var) = (tvar)) + +#define TAILQ_INIT(head) do { \ + TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ + if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else { \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ + TAILQ_NEXT((listelm), field) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + TAILQ_NEXT((elm), field) = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ +} while (0) + +#define TAILQ_INSERT_HEAD(head, elm, field) do { \ + if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL) \ + TAILQ_FIRST((head))->field.tqe_prev = \ + &TAILQ_NEXT((elm), field); \ + else \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + TAILQ_FIRST((head)) = (elm); \ + (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_INSERT_TAIL(head, elm, field) do { \ + TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) + +#define TAILQ_PREV(elm, headname, field) \ + (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + +#define TAILQ_REMOVE(head, elm, field) do { \ + if ((TAILQ_NEXT((elm), field)) != NULL) \ + TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + TRASHIT((elm)->field.tqe_next); \ + TRASHIT((elm)->field.tqe_prev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + + +#ifdef _KERNEL + +/* + * XXX insque() and remque() are an old way of handling certain queues. + * They bogusly assumes that all queue heads look alike. + */ + +struct quehead { + struct quehead *qh_link; + struct quehead *qh_rlink; +}; + +#ifdef __GNUC__ + +static __inline void +insque(void *a, void *b) +{ + struct quehead *element = (struct quehead *)a, + *head = (struct quehead *)b; + + element->qh_link = head->qh_link; + element->qh_rlink = head; + head->qh_link = element; + element->qh_link->qh_rlink = element; +} + +static __inline void +remque(void *a) +{ + struct quehead *element = (struct quehead *)a; + + element->qh_link->qh_rlink = element->qh_rlink; + element->qh_rlink->qh_link = element->qh_link; + element->qh_rlink = 0; +} + +#else /* !__GNUC__ */ + +void insque(void *a, void *b); +void remque(void *a); + +#endif /* __GNUC__ */ + +#endif /* _KERNEL */ + +#endif /* !_SYS_QUEUE_H_ */ diff --git a/winsup/cygwin/include/sys/sem.h b/winsup/cygwin/include/sys/sem.h new file mode 100644 index 000000000..f7bdb595c --- /dev/null +++ b/winsup/cygwin/include/sys/sem.h @@ -0,0 +1,18 @@ +/* sys/sem.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* sys/sem.h header file for Cygwin. */ + +#ifndef _SYS_SEM_H +#define _SYS_SEM_H + +#include + +#endif /* _SYS_SEM_H */ diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/include/sys/shm.h new file mode 100644 index 000000000..2f0c38084 --- /dev/null +++ b/winsup/cygwin/include/sys/shm.h @@ -0,0 +1,18 @@ +/* sys/shm.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* sys/shm.h header file for Cygwin. */ + +#ifndef _SYS_SHM_H +#define _SYS_SHM_H + +#include + +#endif /* _SYS_SHM_H */ diff --git a/winsup/cygwin/include/sys/sysproto.h b/winsup/cygwin/include/sys/sysproto.h new file mode 100644 index 000000000..488782b89 --- /dev/null +++ b/winsup/cygwin/include/sys/sysproto.h @@ -0,0 +1,18 @@ +/* sys/sysproto.h + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* sys/sysproto.h header file for Cygwin. */ + +#ifndef _SYS_SYSPROTO_H +#define _SYS_SYSPROTO_H + +#include + +#endif /* _SYS_SYSPROTO_H */ -- cgit v1.2.3