* 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.
This commit is contained in:
Corinna Vinschen
@ -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 */
|
||||
|
||||
@ -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 <cygwin/ipc.h>
|
||||
|
||||
@ -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 */
|
||||
|
||||
@ -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 <cygwin/ipc.h>
|
||||
|
||||
@ -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 */
|
||||
|
||||
@ -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 <cygwin/ipc.h>
|
||||
#include <sys/cygwin.h>
|
||||
|
||||
#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 */
|
||||
|
||||
94
winsup/cygwin/include/cygwin/sysproto.h
Normal file
94
winsup/cygwin/include/cygwin/sysproto.h
Normal file
@ -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 <sys/types.h>
|
||||
|
||||
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 */
|
||||
@ -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
|
||||
|
||||
Reference in New Issue
Block a user