xnu-1228.5.18.tar.gz

[apple/xnu.git] / bsd / conf / param.c

diff --git a/bsd/conf/param.c b/bsd/conf/param.c
index d3d707c89b2763caadb25e8c5587d26cdc131eb1..5e7191195ebbcbf96abaebaeac0b0439c48cad3e 100644 (file)
--- a/bsd/conf/param.c
+++ b/bsd/conf/param.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1980, 1986, 1989, 1993
@@ -80,14 +85,14 @@
 struct timezone tz = { TIMEZONE, PST };
 
 #define        NPROC (20 + 16 * MAXUSERS)
-#define HNPROC (20 + 64 * MAXUSERS)
+#define HNPROC 2500    /* based on thread_max */
 int    maxproc = NPROC;
-__private_extern__ int hard_maxproc = HNPROC;  /* hardcoded limit */
+int    maxprocperuid = NPROC/2;
+/*__private_extern__*/ int hard_maxproc = HNPROC;      /* hardcoded limit */
 int nprocs = 0; /* XXX */
 
-#define        NTEXT (80 + NPROC / 8)                  /* actually the object cache */
-#define        NVNODE (NPROC + NTEXT + 300)
-int    desiredvnodes = NVNODE + 700;
+//#define      NTEXT (80 + NPROC / 8)                  /* actually the object cache */
+int    desiredvnodes = CONFIG_VNODES;
 
 #define MAXFILES (OPEN_MAX + 2048)
 int    maxfiles = MAXFILES;
@@ -102,12 +107,9 @@ int        maxsockets = MAXSOCKETS;
 /*
  *  async IO (aio) configurable limits
  */
-#define AIO_MAX                                90      /* system wide limit of async IO requests */
-#define AIO_PROCESS_MAX                AIO_LISTIO_MAX  /* process limit of async IO requests */
-#define AIO_THREAD_COUNT       4       /* number of async IO worker threads created */
-int aio_max_requests = AIO_MAX;
-int aio_max_requests_per_process = AIO_PROCESS_MAX;
-int aio_worker_threads = AIO_THREAD_COUNT;
+int aio_max_requests = CONFIG_AIO_MAX;
+int aio_max_requests_per_process = CONFIG_AIO_PROCESS_MAX;
+int aio_worker_threads = CONFIG_AIO_THREAD_COUNT;
 
 /*
  * These have to be allocated somewhere; allocating
@@ -116,8 +118,8 @@ int aio_worker_threads = AIO_THREAD_COUNT;
  */
 struct         callout *callout;
 struct cblock *cfree;
-struct cblock *cfreelist = 0;
+struct cblock *cfreelist = NULL;
 int    cfreecount = 0;
-struct buf *buf;
+struct buf *buf_headers;
 struct domain *domains;