* 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.

1 files changed, 136 insertions, 7 deletions

diff --git a/winsup/cygwin/sem.cc b/winsup/cygwin/sem.cc
index 97d91a354..a3085d160 100644
--- a/winsup/cygwin/sem.cc
+++ b/winsup/cygwin/sem.cc
@@ -1,8 +1,6 @@
-/* sem.cc: Single unix specification IPC interface for Cygwin.
+/* sem.cc: XSI IPC interface for Cygwin.
 
-   Copyright 2002 Red Hat, Inc.
-
-   Written by Conrad Scott <conrad.scott@dsl.pipex.com>.
+   Copyright 2003 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -11,30 +9,161 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-
+#include "cygerrno.h"
+#ifdef USE_SERVER
 #include <sys/types.h>
-#include <cygwin/sem.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdarg.h>
 
+#include "sigproc.h"
 
-#include "cygerrno.h"
+#include "cygserver_ipc.h"
+#include "cygserver_sem.h"
+
+/*
+ * client_request_sem Constructors
+ */
+
+client_request_sem::client_request_sem (int semid,
+					int semnum,
+					int cmd,
+					union semun *arg)
+  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
+{
+  _parameters.in.semop = SEMOP_semctl;
+  ipc_set_proc_info (_parameters.in.ipcblk);
+
+   _parameters.in.ctlargs.semid = semid;
+   _parameters.in.ctlargs.semnum = semnum;
+   _parameters.in.ctlargs.cmd = cmd;
+   _parameters.in.ctlargs.arg = arg;
+
+  msglen (sizeof (_parameters.in));
+}
+
+client_request_sem::client_request_sem (key_t key,
+					int nsems,
+					int semflg)
+  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
+{
+  _parameters.in.semop = SEMOP_semget;
+  ipc_set_proc_info (_parameters.in.ipcblk);
+
+  _parameters.in.getargs.key = key;
+  _parameters.in.getargs.nsems = nsems;
+  _parameters.in.getargs.semflg = semflg;
+
+  msglen (sizeof (_parameters.in));
+}
+
+client_request_sem::client_request_sem (int semid,
+					struct sembuf *sops,
+					size_t nsops)
+  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
+{
+  _parameters.in.semop = SEMOP_semop;
+  ipc_set_proc_info (_parameters.in.ipcblk);
+
+  _parameters.in.opargs.semid = semid;
+  _parameters.in.opargs.sops = sops;
+  _parameters.in.opargs.nsops = nsops;
+
+  msglen (sizeof (_parameters.in));
+}
+#endif /* USE_SERVER */
+
+/*
+ * XSI semaphore API.  These are exported by the DLL.
+ */
 
 extern "C" int
 semctl (int semid, int semnum, int cmd, ...)
 {
+#ifdef USE_SERVER
+  sigframe thisframe (mainthread);
+  union semun arg = {0};
+  if (cmd == IPC_STAT || cmd == IPC_SET || cmd == IPC_INFO || cmd == SEM_INFO
+      || cmd == GETALL || cmd == SETALL || cmd == SETVAL)
+    {
+      va_list ap;
+      va_start (ap, cmd);
+      arg = va_arg (ap, union semun);
+      va_end (ap);
+    }
+  syscall_printf ("semctl (semid = %d, semnum = %d, cmd = %d, arg.val = 0x%x)",
+		  semid, semnum, cmd, arg.val);
+  if ((cmd == IPC_STAT || cmd == IPC_SET)
+      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct semid_ds)))
+    return -1;
+  if (cmd == IPC_INFO)
+    {
+      /* semid == 0: Request for seminfo struct. */
+      if (!semid
+	  && __check_null_invalid_struct_errno (arg.buf, sizeof (struct seminfo)))
+	  return -1;
+      /* Otherwise, request semid entries from internal semid_ds array. */
+      if (semid)
+	if (__check_null_invalid_struct_errno (arg.buf, semid * sizeof (struct semid_ds)))
+	  return -1;
+    }
+  if (cmd == SEM_INFO
+      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct sem_info)))
+    return -1;
+  client_request_sem request (semid, semnum, cmd, &arg);
+  if (request.make_request () == -1 || request.retval () == -1)
+    {
+      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
+      set_errno (request.error_code ());
+      return -1;
+    }
+  return request.retval ();
+#else
   set_errno (ENOSYS);
   return -1;
+#endif
 }
 
 extern "C" int
 semget (key_t key, int nsems, int semflg)
 {
+#ifdef USE_SERVER
+  sigframe thisframe (mainthread);
+  syscall_printf ("semget (key = %U, nsems = %d, semflg = 0x%x)",
+		  key, nsems, semflg);
+  client_request_sem request (key, nsems, semflg);
+  if (request.make_request () == -1 || request.retval () == -1)
+    {
+      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
+      set_errno (request.error_code ());
+      return -1;
+    }
+  return request.retval ();
+#else
   set_errno (ENOSYS);
   return -1;
+#endif
 }
 
 extern "C" int
 semop (int semid, struct sembuf *sops, size_t nsops)
 {
+#ifdef USE_SERVER
+  sigframe thisframe (mainthread);
+  syscall_printf ("semop (semid = %d, sops = %p, nsops = %d)",
+		  semid, sops, nsops);
+  if (__check_null_invalid_struct_errno (sops, nsops * sizeof (struct sembuf)))
+    return -1;
+  client_request_sem request (semid, sops, nsops);
+  if (request.make_request () == -1 || request.retval () == -1)
+    {
+      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
+      set_errno (request.error_code ());
+      return -1;
+    }
+  return request.retval ();
+#else
   set_errno (ENOSYS);
   return -1;
+#endif
 }