g/c REAL_CLISTS.
This commit is contained in:
simonb
parent
8a8e8d144f
commit
5d8b1ef3e4
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.169 1999/04/15 22:15:05 thorpej Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.170 1999/04/25 02:56:26 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 1999/04/15 22:15:05 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.170 1999/04/25 02:56:26 simonb Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -94,9 +94,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 1999/04/15 22:15:05 thorpej Exp $"
|
|||
#include <sys/reboot.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/file.h>
|
||||
#ifdef REAL_CLISTS
|
||||
#include <sys/clist.h>
|
||||
#endif
|
||||
#include <sys/callout.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mbuf.h>
|
||||
|
|
@ -919,9 +916,6 @@ allocsys(v)
|
|||
#define valloc(name, type, num) \
|
||||
(name) = (type *)v; v = (caddr_t)ALIGN((name)+(num))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.123 1999/04/11 04:04:06 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.124 1999/04/25 02:56:27 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -449,9 +449,6 @@ allocsys(v)
|
|||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.350 1999/04/11 04:04:07 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.351 1999/04/25 02:56:27 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -631,9 +631,7 @@ allocsys(v)
|
|||
|
||||
#define valloc(name, type, num) \
|
||||
v = (caddr_t)(((name) = (type *)v) + (num))
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.229 1999/04/11 04:04:07 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.230 1999/04/25 02:56:28 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -414,9 +414,7 @@ again:
|
|||
(name) = (type *)v; v = (caddr_t)((name)+(num))
|
||||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mips_machdep.c,v 1.50 1999/04/24 15:04:32 simonb Exp $ */
|
||||
/* $NetBSD: mips_machdep.c,v 1.51 1999/04/25 02:56:28 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.50 1999/04/24 15:04:32 simonb Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.51 1999/04/25 02:56:28 simonb Exp $");
|
||||
|
||||
#include "opt_bufcache.h"
|
||||
#include "opt_compat_netbsd.h"
|
||||
|
|
@ -1148,9 +1148,6 @@ allocsys(v)
|
|||
#define valloc(name, type, num) \
|
||||
(name) = (type *)v; v = (caddr_t)ALIGN((name)+(num))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.53 1999/04/11 04:04:08 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.54 1999/04/25 02:56:28 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -546,9 +546,6 @@ allocsys(v)
|
|||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.20 1999/04/11 04:04:08 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.21 1999/04/25 02:56:29 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -488,9 +488,6 @@ allocsys(v)
|
|||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.97 1999/04/11 04:04:09 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.98 1999/04/25 02:56:28 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 Matthias Pfaller.
|
||||
|
|
@ -67,9 +67,6 @@
|
|||
#include <sys/conf.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/callout.h>
|
||||
#ifdef REAL_CLISTS
|
||||
#include <sys/clist.h>
|
||||
#endif
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/msgbuf.h>
|
||||
|
|
@ -372,9 +369,7 @@ allocsys(v)
|
|||
|
||||
#define valloc(name, type, num) \
|
||||
v = (caddr_t)(((name) = (type *)v) + (num))
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.127 1999/04/11 04:04:10 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.128 1999/04/25 02:56:29 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Gordon W. Ross
|
||||
|
|
@ -210,14 +210,12 @@ consinit()
|
|||
#define valloc(name, type, num) \
|
||||
v = (caddr_t)(((name) = (type *)v) + (num))
|
||||
static caddr_t allocsys __P((caddr_t));
|
||||
|
||||
static caddr_t
|
||||
allocsys(v)
|
||||
register caddr_t v;
|
||||
{
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.47 1999/04/11 04:04:10 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.48 1999/04/25 02:56:29 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -211,14 +211,12 @@ consinit()
|
|||
#define valloc(name, type, num) \
|
||||
v = (caddr_t)(((name) = (type *)v) + (num))
|
||||
static caddr_t allocsys __P((caddr_t));
|
||||
|
||||
static caddr_t
|
||||
allocsys(v)
|
||||
register caddr_t v;
|
||||
{
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.79 1999/04/17 00:01:19 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.80 1999/04/25 02:56:29 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
|
||||
|
|
@ -319,9 +319,6 @@ allocsys(v)
|
|||
#define valloc(name, type, num) \
|
||||
v = (caddr_t)(((name) = (type *)v) + (num))
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.61 1999/04/11 04:04:11 chs Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.62 1999/04/25 02:56:29 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -311,9 +311,7 @@ again:
|
|||
(name) = (type *)v; v = (caddr_t)((name)+(num))
|
||||
#define valloclim(name, type, num, lim) \
|
||||
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
|
||||
#ifdef REAL_CLISTS
|
||||
valloc(cfree, struct cblock, nclist);
|
||||
#endif
|
||||
|
||||
valloc(callout, struct callout, ncallout);
|
||||
#ifdef SYSVSHM
|
||||
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: param.c,v 1.26 1999/04/22 04:50:05 simonb Exp $ */
|
||||
/* $NetBSD: param.c,v 1.27 1999/04/25 02:56:30 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1986, 1989 Regents of the University of California.
|
||||
|
|
@ -52,9 +52,6 @@
|
|||
#include <sys/vnode.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/callout.h>
|
||||
#ifdef REAL_CLISTS
|
||||
#include <sys/clist.h>
|
||||
#endif
|
||||
#include <sys/mbuf.h>
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -100,9 +97,6 @@ int maxproc = NPROC;
|
|||
int desiredvnodes = NVNODE;
|
||||
int maxfiles = 3 * (NPROC + MAXUSERS) + 80;
|
||||
int ncallout = 16 + NPROC;
|
||||
#ifdef REAL_CLISTS
|
||||
int nclist = 60 + 12 * MAXUSERS;
|
||||
#endif
|
||||
int nmbclusters = NMBCLUSTERS;
|
||||
u_long sb_max = SB_MAX; /* maximum socket buffer size */
|
||||
int fscale = FSCALE; /* kernel uses `FSCALE', user uses `fscale' */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: init_main.c,v 1.146 1999/04/12 00:22:08 gwr Exp $ */
|
||||
/* $NetBSD: init_main.c,v 1.147 1999/04/25 02:56:30 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Christopher G. Demetriou. All rights reserved.
|
||||
|
|
@ -65,9 +65,6 @@
|
|||
#include <sys/conf.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/buf.h>
|
||||
#ifdef REAL_CLISTS
|
||||
#include <sys/clist.h>
|
||||
#endif
|
||||
#include <sys/device.h>
|
||||
#include <sys/socketvar.h>
|
||||
#include <sys/protosw.h>
|
||||
|
|
@ -316,11 +313,6 @@ main()
|
|||
/* Start real time and statistics clocks. */
|
||||
initclocks();
|
||||
|
||||
#ifdef REAL_CLISTS
|
||||
/* Initialize clists. */
|
||||
clist_init();
|
||||
#endif
|
||||
|
||||
#ifdef SYSVSHM
|
||||
/* Initialize System V style shared memory. */
|
||||
shminit();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tty.c,v 1.112 1998/09/11 12:50:11 mycroft Exp $ */
|
||||
/* $NetBSD: tty.c,v 1.113 1999/04/25 02:56:30 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1990, 1991, 1993
|
||||
|
|
@ -74,9 +74,6 @@ static int proc_compare __P((struct proc *, struct proc *));
|
|||
const char ttclos[] = "ttycls";
|
||||
const char ttopen[] = "ttyopn";
|
||||
const char ttybg[] = "ttybg";
|
||||
#ifdef REAL_CLISTS
|
||||
const char ttybuf[] = "ttybuf";
|
||||
#endif
|
||||
const char ttyin[] = "ttyin";
|
||||
const char ttyout[] = "ttyout";
|
||||
|
||||
|
|
@ -1648,17 +1645,8 @@ loop:
|
|||
if (ce == 0) {
|
||||
tp->t_rocount = 0;
|
||||
if (ttyoutput(*cp, tp) >= 0) {
|
||||
#ifdef REAL_CLISTS
|
||||
/* No Clists, wait a bit. */
|
||||
ttstart(tp);
|
||||
if (error = ttysleep(tp, &lbolt,
|
||||
TTOPRI | PCATCH, ttybuf, 0))
|
||||
break;
|
||||
goto loop;
|
||||
#else
|
||||
/* out of space */
|
||||
goto overfull;
|
||||
#endif
|
||||
}
|
||||
cp++;
|
||||
cc--;
|
||||
|
|
@ -1683,17 +1671,8 @@ loop:
|
|||
cp += ce, cc -= ce, tk_nout += ce;
|
||||
tp->t_outcc += ce;
|
||||
if (i > 0) {
|
||||
#ifdef REAL_CLISTS
|
||||
/* No Clists, wait a bit. */
|
||||
ttstart(tp);
|
||||
if (error = ttysleep(tp,
|
||||
&lbolt, TTOPRI | PCATCH, ttybuf, 0))
|
||||
break;
|
||||
goto loop;
|
||||
#else
|
||||
/* out of space */
|
||||
goto overfull;
|
||||
#endif
|
||||
}
|
||||
if (ISSET(tp->t_lflag, FLUSHO) ||
|
||||
tp->t_outq.c_cc > hiwat)
|
||||
|
|
@ -1710,7 +1689,6 @@ out:
|
|||
uio->uio_resid += cc;
|
||||
return (error);
|
||||
|
||||
#ifndef REAL_CLISTS
|
||||
overfull:
|
||||
/*
|
||||
* Since we are using ring buffers, if we can't insert any more into
|
||||
|
|
@ -1719,7 +1697,6 @@ overfull:
|
|||
* proceed as normal.
|
||||
*/
|
||||
hiwat = tp->t_outq.c_cc - 1;
|
||||
#endif
|
||||
|
||||
ovhiwat:
|
||||
ttstart(tp);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tty_subr.c,v 1.17 1998/08/04 04:03:17 perry Exp $ */
|
||||
/* $NetBSD: tty_subr.c,v 1.18 1999/04/25 02:56:30 simonb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993, 1994 Theo de Raadt
|
||||
|
|
@ -38,9 +38,6 @@
|
|||
#include <sys/buf.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/tty.h>
|
||||
#ifdef REAL_CLISTS
|
||||
#include <sys/clist.h>
|
||||
#endif
|
||||
#include <sys/malloc.h>
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tty.h,v 1.45 1998/12/16 11:01:01 christos Exp $ */
|
||||
/* $NetBSD: tty.h,v 1.46 1999/04/25 02:56:30 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
|
|
@ -47,7 +47,6 @@
|
|||
#include <sys/select.h> /* For struct selinfo. */
|
||||
#include <sys/queue.h>
|
||||
|
||||
#ifndef REAL_CLISTS
|
||||
/*
|
||||
* Clists are actually ring buffers. The c_cc, c_cf, c_cl fields have
|
||||
* exactly the same behaviour as in true clists.
|
||||
|
|
@ -65,17 +64,6 @@ struct clist {
|
|||
u_char *c_ce; /* c_ce + c_len */
|
||||
u_char *c_cq; /* N bits/bytes long, see tty_subr.c */
|
||||
};
|
||||
#else
|
||||
/*
|
||||
* Clists are character lists, which is a variable length linked list
|
||||
* of cblocks, with a count of the number of characters in the list.
|
||||
*/
|
||||
struct clist {
|
||||
int c_cc; /* Number of characters in the clist. */
|
||||
u_char *c_cf; /* Pointer to the first cblock. */
|
||||
u_char *c_cl; /* Pointer to the last cblock. */
|
||||
};
|
||||
#endif /* !REAL_CLISTS */
|
||||
|
||||
/*
|
||||
* Per-tty structure.
|
||||
|
|
|
|||
Loading…
Reference in New Issue