xnu-1486.2.11.tar.gz

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

diff --git a/bsd/conf/param.c b/bsd/conf/param.c
index 97b008e1517a6f2cbb4158ed380321cae98ec8a5..9aafb343c5c88cb8cf2cab7757f8977d2c32536e 100644 (file)
--- a/bsd/conf/param.c
+++ b/bsd/conf/param.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -77,7 +77,6 @@
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/quota.h>
-#include <ufs/ufs/inode.h>
 #include <miscfs/fifofs/fifo.h>
 #include <sys/shm_internal.h>
 #include <sys/aio_kern.h>
@@ -88,18 +87,17 @@ struct      timezone tz = { TIMEZONE, PST };
 #define HNPROC 2500    /* based on thread_max */
 int    maxproc = NPROC;
 int    maxprocperuid = NPROC/2;
-__private_extern__ int hard_maxproc = HNPROC;  /* hardcoded limit */
+/*__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;
 
 unsigned int   ncallout = 16 + 2*NPROC;
-int nmbclusters = NMBCLUSTERS;
+unsigned int nmbclusters = NMBCLUSTERS;
 int    nport = NPROC / 2;
 
 #define MAXSOCKETS NMBCLUSTERS
@@ -108,12 +106,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
@@ -122,8 +117,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;