maxfdescs checks out
This commit is contained in:
cgd
parent
a8615ac58c
commit
f39163138d
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)param.c 7.20 (Berkeley) 6/27/91
|
||||
* $Id: param.c,v 1.7 1994/05/17 04:16:58 cgd Exp $
|
||||
* $Id: param.c,v 1.8 1994/05/21 08:32:32 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
* the kernel; it should be modified there to suit local taste
|
||||
* if necessary.
|
||||
*
|
||||
* Compiled with -DHZ=xx -DTIMEZONE=x -DDST=x -DMAXUSERS=xx -DMAXFDESCS=xx
|
||||
* Compiled with -DHZ=xx -DTIMEZONE=x -DDST=x -DMAXUSERS=xx
|
||||
*/
|
||||
|
||||
#ifndef HZ
|
||||
|
|
@ -84,7 +84,6 @@ int maxproc = NPROC;
|
|||
#define NTEXT (80 + NPROC / 8) /* actually the object cache */
|
||||
#define NVNODE (NPROC + NTEXT + 100)
|
||||
long desiredvnodes = NVNODE;
|
||||
int maxfdescs = MAXFDESCS;
|
||||
int maxfiles = 3 * (NPROC + MAXUSERS) + 80;
|
||||
int ncallout = 16 + NPROC;
|
||||
int nclist = 60 + 12 * MAXUSERS;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.h 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.h,v 1.15 1994/04/05 23:57:26 deraadt Exp $
|
||||
* $Id: config.h,v 1.16 1994/05/21 08:33:37 cgd Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -207,7 +207,6 @@ int dst;
|
|||
int profiling;
|
||||
int debugging;
|
||||
|
||||
int maxfdescs;
|
||||
int maxusers;
|
||||
u_int loadaddress;
|
||||
int fatal_errors;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
%token MAJOR
|
||||
%token MANUFACTURER
|
||||
%token MASTER
|
||||
%token MAXFDESCS
|
||||
%token MAXUSERS
|
||||
%token MINOR
|
||||
%token MINUS
|
||||
|
|
@ -107,7 +106,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.y 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.y,v 1.13 1994/03/10 19:50:44 mycroft Exp $
|
||||
* $Id: config.y,v 1.14 1994/05/21 08:33:57 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -222,8 +221,6 @@ Config_spec:
|
|||
= { zone = -$3; dst = $5; check_tz(); } |
|
||||
TIMEZONE MINUS FPNUMBER DST
|
||||
= { zone = -$3; dst = 1; check_tz(); } |
|
||||
MAXFDESCS NUMBER
|
||||
= { maxfdescs = $2; }; |
|
||||
MAXUSERS NUMBER
|
||||
= { maxusers = $2; };
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)lang.l 5.8 (Berkeley) 4/19/91
|
||||
* $Id: lang.l,v 1.9 1994/02/18 06:10:44 mycroft Exp $
|
||||
* $Id: lang.l,v 1.10 1994/05/21 08:34:04 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -85,7 +85,6 @@ struct kt {
|
|||
{ "manufacturer", MANUFACTURER },
|
||||
#endif
|
||||
{ "master", MASTER },
|
||||
{ "maxfdescs", MAXFDESCS },
|
||||
{ "maxusers", MAXUSERS },
|
||||
{ "minor", MINOR },
|
||||
#if MACHINE_I386
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)mkmakefile.c 5.33 (Berkeley) 7/1/91";*/
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp $";
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.24 1994/05/21 08:34:10 cgd Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
|
|
@ -48,8 +48,6 @@ static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp
|
|||
#include "y.tab.h"
|
||||
#include "config.h"
|
||||
|
||||
#define DEF_MAXFDESCS 2048
|
||||
|
||||
#define next_word(fp, wd) \
|
||||
{ register char *word = get_word(fp); \
|
||||
if (word == (char *)EOF) \
|
||||
|
|
@ -181,10 +179,6 @@ makefile()
|
|||
up = &users[MACHINE_VAX-1];
|
||||
} else
|
||||
up = &users[machine-1];
|
||||
if (maxfdescs == 0) {
|
||||
printf("maxfdescs not specified; %d assumed\n", DEF_MAXFDESCS);
|
||||
maxfdescs = DEF_MAXFDESCS;
|
||||
}
|
||||
if (maxusers == 0) {
|
||||
printf("maxusers not specified; %d assumed\n", up->u_default);
|
||||
maxusers = up->u_default;
|
||||
|
|
@ -193,8 +187,8 @@ makefile()
|
|||
maxusers = up->u_min;
|
||||
} else if (maxusers > up->u_max)
|
||||
printf("warning: maxusers > %d (%d)\n", up->u_max, maxusers);
|
||||
fprintf(ofp, "PARAM=-DTIMEZONE=%d -DDST=%d -DMAXUSERS=%d -DMAXFDESCS=%d\n",
|
||||
zone, dst, maxusers, maxfdescs);
|
||||
fprintf(ofp, "PARAM=-DTIMEZONE=%d -DDST=%d -DMAXUSERS=%d\n",
|
||||
zone, dst, maxusers);
|
||||
if (loadaddress != -1) {
|
||||
fprintf(ofp, "LOAD_ADDRESS=%X\n", loadaddress);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.h 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.h,v 1.15 1994/04/05 23:57:26 deraadt Exp $
|
||||
* $Id: config.h,v 1.16 1994/05/21 08:33:37 cgd Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -207,7 +207,6 @@ int dst;
|
|||
int profiling;
|
||||
int debugging;
|
||||
|
||||
int maxfdescs;
|
||||
int maxusers;
|
||||
u_int loadaddress;
|
||||
int fatal_errors;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
%token MAJOR
|
||||
%token MANUFACTURER
|
||||
%token MASTER
|
||||
%token MAXFDESCS
|
||||
%token MAXUSERS
|
||||
%token MINOR
|
||||
%token MINUS
|
||||
|
|
@ -107,7 +106,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)config.y 5.14 (Berkeley) 7/1/91
|
||||
* $Id: config.y,v 1.13 1994/03/10 19:50:44 mycroft Exp $
|
||||
* $Id: config.y,v 1.14 1994/05/21 08:33:57 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -222,8 +221,6 @@ Config_spec:
|
|||
= { zone = -$3; dst = $5; check_tz(); } |
|
||||
TIMEZONE MINUS FPNUMBER DST
|
||||
= { zone = -$3; dst = 1; check_tz(); } |
|
||||
MAXFDESCS NUMBER
|
||||
= { maxfdescs = $2; }; |
|
||||
MAXUSERS NUMBER
|
||||
= { maxusers = $2; };
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)lang.l 5.8 (Berkeley) 4/19/91
|
||||
* $Id: lang.l,v 1.9 1994/02/18 06:10:44 mycroft Exp $
|
||||
* $Id: lang.l,v 1.10 1994/05/21 08:34:04 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -85,7 +85,6 @@ struct kt {
|
|||
{ "manufacturer", MANUFACTURER },
|
||||
#endif
|
||||
{ "master", MASTER },
|
||||
{ "maxfdescs", MAXFDESCS },
|
||||
{ "maxusers", MAXUSERS },
|
||||
{ "minor", MINOR },
|
||||
#if MACHINE_I386
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)mkmakefile.c 5.33 (Berkeley) 7/1/91";*/
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp $";
|
||||
static char rcsid[] = "$Id: mkmakefile.c,v 1.24 1994/05/21 08:34:10 cgd Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
|
|
@ -48,8 +48,6 @@ static char rcsid[] = "$Id: mkmakefile.c,v 1.23 1994/04/05 23:57:29 deraadt Exp
|
|||
#include "y.tab.h"
|
||||
#include "config.h"
|
||||
|
||||
#define DEF_MAXFDESCS 2048
|
||||
|
||||
#define next_word(fp, wd) \
|
||||
{ register char *word = get_word(fp); \
|
||||
if (word == (char *)EOF) \
|
||||
|
|
@ -181,10 +179,6 @@ makefile()
|
|||
up = &users[MACHINE_VAX-1];
|
||||
} else
|
||||
up = &users[machine-1];
|
||||
if (maxfdescs == 0) {
|
||||
printf("maxfdescs not specified; %d assumed\n", DEF_MAXFDESCS);
|
||||
maxfdescs = DEF_MAXFDESCS;
|
||||
}
|
||||
if (maxusers == 0) {
|
||||
printf("maxusers not specified; %d assumed\n", up->u_default);
|
||||
maxusers = up->u_default;
|
||||
|
|
@ -193,8 +187,8 @@ makefile()
|
|||
maxusers = up->u_min;
|
||||
} else if (maxusers > up->u_max)
|
||||
printf("warning: maxusers > %d (%d)\n", up->u_max, maxusers);
|
||||
fprintf(ofp, "PARAM=-DTIMEZONE=%d -DDST=%d -DMAXUSERS=%d -DMAXFDESCS=%d\n",
|
||||
zone, dst, maxusers, maxfdescs);
|
||||
fprintf(ofp, "PARAM=-DTIMEZONE=%d -DDST=%d -DMAXUSERS=%d\n",
|
||||
zone, dst, maxusers);
|
||||
if (loadaddress != -1) {
|
||||
fprintf(ofp, "LOAD_ADDRESS=%X\n", loadaddress);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue