patch-2.3.39 linux/include/linux/sem.h

• Lines: 47
• Date: Mon Jan 10 18:29:05 2000
• Orig file: v2.3.38/linux/include/linux/sem.h
• Orig date: Thu Nov 11 20:11:53 1999

diff -u --recursive --new-file v2.3.38/linux/include/linux/sem.h linux/include/linux/sem.h
@@ -19,7 +19,7 @@
 #define SEM_STAT 18
 #define SEM_INFO 19
 
-/* One semid data structure for each set of semaphores in the system. */
+/* Obsolete, used only for backwards compatibility and libc5 compiles */
 struct semid_ds {
 	struct ipc_perm	sem_perm;		/* permissions .. see ipc.h */
 	__kernel_time_t	sem_otime;		/* last semop time */
@@ -31,6 +31,9 @@
 	unsigned short	sem_nsems;		/* no. of semaphores in array */
 };
 
+/* Include the definition of semid64_ds */
+#include <asm/sembuf.h>
+
 /* semop system calls takes an array of these. */
 struct sembuf {
 	unsigned short  sem_num;	/* semaphore index in array */
@@ -81,6 +84,18 @@
 	int	sempid;		/* pid of last operation */
 };
 
+/* One sem_array data structure for each set of semaphores in the system. */
+struct sem_array {
+	struct kern_ipc_perm	sem_perm;	/* permissions .. see ipc.h */
+	time_t			sem_otime;	/* last semop time */
+	time_t			sem_ctime;	/* last change time */
+	struct sem		*sem_base;	/* ptr to first semaphore in array */
+	struct sem_queue	*sem_pending;	/* pending operations to be processed */
+	struct sem_queue	**sem_pending_last; /* last pending operation */
+	struct sem_undo		*undo;		/* undo requests on this array */
+	unsigned long		sem_nsems;	/* no. of semaphores in array */
+};
+
 /* One queue for each sleeping process in the system. */
 struct sem_queue {
 	struct sem_queue *	next;	 /* next entry in the queue */
@@ -89,7 +104,7 @@
 	struct sem_undo *	undo;	 /* undo structure */
 	int    			pid;	 /* process id of requesting process */
 	int    			status;	 /* completion status of operation */
-	struct semid_ds *	sma;	 /* semaphore array for operations */
+	struct sem_array *	sma;	 /* semaphore array for operations */
 	int			id;	 /* internal sem id */
 	struct sembuf *		sops;	 /* array of pending operations */
 	int			nsops;	 /* number of operations */