xnu-517.12.7.tar.gz

[apple/xnu.git] / bsd / sys / sem.h

diff --git a/bsd/sys/sem.h b/bsd/sys/sem.h
index dce2afd8dc74fe43080ceca677a470b3ced88818..8db16a7a6f2d28939034156c47ed727b577f7f10 100644 (file)
--- a/bsd/sys/sem.h
+++ b/bsd/sys/sem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -26,10 +26,14 @@
  *
  * Author:  Daniel Boulet
  */
+/*
+ * John Bellardo modified the implementation for Darwin. 12/2000
+ */
 
 #ifndef _SYS_SEM_H_
 #define _SYS_SEM_H_
 
+#include <sys/appleapiopts.h>
 #include <sys/ipc.h>
 
 struct sem {
@@ -91,12 +95,47 @@ union semun {
 #define SEM_R          0400    /* read permission */
 
 #ifdef KERNEL
+#ifdef __APPLE_API_PRIVATE
 /*
  * Kernel implementation stuff
  */
 #define SEMVMX 32767           /* semaphore maximum value */
 #define SEMAEM 16384           /* adjust on exit max value */
 
+/*
+ * Configuration parameters.  SEMMNI, SEMMNS, and SEMMNU are hard limits.
+ * The code dynamically allocates enough memory to satisfy the current
+ * demand in even increments of SEMMNI_INC, SEMMNS_INC, and SEMMNU_INC.
+ * The code will never allocate more than the hard limits.  The *_INC's
+ * are defined in the kernel section of the header.
+ */
+/*
+ * Configuration parameters
+ */
+#ifndef SEMMNS                 /* # of semaphores in system */
+#define SEMMNS (1048576/sizeof(struct sem))
+#endif                         /* no more than 1M of semaphore data */
+#ifndef SEMMNI                 /* # of semaphore identifiers */
+#define SEMMNI SEMMNS          /* max of 1 for each semaphore */
+#endif
+#ifndef SEMUME
+#define SEMUME 10              /* max # of undo entries per process */
+#endif
+#ifndef SEMMNU                 /* # of undo structures in system */
+#define SEMMNU SEMMNS          /* 1 for each semaphore.  This is quite large */
+#endif                         /* This should be max 1 for each process */
+
+/* shouldn't need tuning */
+#ifndef SEMMAP
+#define SEMMAP 30              /* # of entries in semaphore map */
+#endif
+#ifndef SEMMSL
+#define SEMMSL SEMMNS          /* max # of semaphores per id */
+#endif
+#ifndef SEMOPM
+#define SEMOPM 100             /* max # of operations per semop call */
+#endif
+
 
 /*
  * Undo structure (one per process)
@@ -109,7 +148,7 @@ struct sem_undo {
                short   un_adjval;      /* adjust on exit values */
                short   un_num;         /* semaphore # */
                int     un_id;          /* semid */
-       } un_ent[1];                    /* undo entries */
+       } un_ent[SEMUME];               /* undo entries */
 };
 
 /*
@@ -133,51 +172,50 @@ extern struct seminfo     seminfo;
 #define        SEM_ALLOC       01000   /* semaphore is allocated */
 #define        SEM_DEST        02000   /* semaphore will be destroyed on last detach */
 
-/*
- * Configuration parameters
- */
-#ifndef SEMMNI
-#define SEMMNI 10              /* # of semaphore identifiers */
-#endif
-#ifndef SEMMNS
-#define SEMMNS 60              /* # of semaphores in system */
-#endif
-#ifndef SEMUME
-#define SEMUME 10              /* max # of undo entries per process */
-#endif
-#ifndef SEMMNU
-#define SEMMNU 30              /* # of undo structures in system */
-#endif
-
-/* shouldn't need tuning */
-#ifndef SEMMAP
-#define SEMMAP 30              /* # of entries in semaphore map */
-#endif
-#ifndef SEMMSL
-#define SEMMSL SEMMNS          /* max # of semaphores per id */
-#endif
-#ifndef SEMOPM
-#define SEMOPM 100             /* max # of operations per semop call */
-#endif
+#define SEMMNI_INC     8       /* increment value for semaphore identifiers */
+#define SEMMNS_INC     64      /* increment value for semaphores */
+#define SEMMNU_INC     32      /* increment value for undo structures */
 
 /*
  * Due to the way semaphore memory is allocated, we have to ensure that
  * SEMUSZ is properly aligned.
+ *
+ * We are not doing strange semaphore memory allocation anymore, so
+ * these macros are no longer needed.
  */
 
-#define SEM_ALIGN(bytes) (((bytes) + (sizeof(long) - 1)) & ~(sizeof(long) - 1))
+/*
+ * #define SEM_ALIGN(bytes) (((bytes) + (sizeof(long) - 1)) & ~(sizeof(long) - 1))
+ */
 
 /* actual size of an undo structure */
-#define SEMUSZ SEM_ALIGN(offsetof(struct sem_undo, un_ent[SEMUME]))
+/*
+ * #define SEMUSZ      SEM_ALIGN(offsetof(struct sem_undo, un_ent[SEMUME]))
+ */
+#define SEMUSZ         sizeof(struct sem_undo)
 
 extern struct semid_ds *sema;  /* semaphore id pool */
 extern struct sem *sem;                /* semaphore pool */
-extern int     *semu;          /* undo structure pool */
+/* This is now a struct sem_undo with the new memory allocation 
+ * extern int  *semu;          /* undo structure pool
+ */
+extern struct sem_undo *semu;          /* undo structure pool */
 
 /*
  * Macro to find a particular sem_undo vector
  */
-#define SEMU(ix)       ((struct sem_undo *)(((intptr_t)semu)+ix * seminfo.semusz))
+/* Until we can initialize seminfo.semusz to SEMUSZ, we hard code the size macro
+ * in SEMU.  This should be fixed when (if) we implement dynamic pool sizes
+ *
+ * #define SEMU(ix)     ((struct sem_undo *)(((intptr_t)semu)+ix * seminfo.semusz))
+ */
+/*
+ * This macro doesn't work because we are using a staticly allocated array
+ * for semu now.
+ * #define SEMU(ix)        ((struct sem_undo *)(((intptr_t)semu)+ix * SEMUSZ)) 
+ */
+#define SEMU(ix)        (&semu[ix])
+
 
 /*
  * Process sem_undo vectors at proc exit.
@@ -191,6 +229,9 @@ typedef enum {
        SEM_CONFIG_FREEZE,      /* Freeze the semaphore facility. */
        SEM_CONFIG_THAW         /* Thaw the semaphore facility. */
 } semconfig_ctl_t;
+
+#endif /* __APPLE_API_PRIVATE */
+
 #endif /* KERNEL */
 
 #ifndef KERNEL