d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove amountpipes counter for pipes -- this replicates the function of

Browse Source 
existing UMA statistics for pipes, and allows us to get rid of both the
per-pipe dtor and two atomic operations per pipe required to maintain
the counter.
This commit is contained in:
Robert Watson 2007-05-27 17:33:10 +00:00
parent 5aabce7698
commit 097e1ea87f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=170022
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/kern/sys_pipe.c
View File

@ -175,7 +175,6 @@ static struct filterops pipe_wfiltops =
#define MINPIPESIZE (PIPE_SIZE/3)
#define MAXPIPESIZE (2*PIPE_SIZE/3)
static int amountpipes;
static int amountpipekva;
static int pipefragretry;
static int pipeallocfail;
@ -184,8 +183,6 @@ static int piperesizeallowed = 1;
SYSCTL_INT(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN,
&maxpipekva, 0, "Pipe KVA limit");
SYSCTL_INT(_kern_ipc, OID_AUTO, pipes, CTLFLAG_RD,
&amountpipes, 0, "Current # of pipes");
SYSCTL_INT(_kern_ipc, OID_AUTO, pipekva, CTLFLAG_RD,
&amountpipekva, 0, "Pipe KVA usage");
SYSCTL_INT(_kern_ipc, OID_AUTO, pipefragretry, CTLFLAG_RD,
@ -214,7 +211,6 @@ static int pipespace(struct pipe *cpipe, int size);
static int pipespace_new(struct pipe *cpipe, int size);
static int pipe_zone_ctor(void *mem, int size, void *arg, int flags);
static void pipe_zone_dtor(void *mem, int size, void *arg);
static int pipe_zone_init(void *mem, int size, int flags);
static void pipe_zone_fini(void *mem, int size);
@ -226,8 +222,8 @@ static void
pipeinit(void *dummy __unused)
{
pipe_zone = uma_zcreate("PIPE", sizeof(struct pipepair),
pipe_zone_ctor, pipe_zone_dtor, pipe_zone_init, pipe_zone_fini,
pipe_zone = uma_zcreate("pipe", sizeof(struct pipepair),
pipe_zone_ctor, NULL, pipe_zone_init, pipe_zone_fini,
UMA_ALIGN_PTR, 0);
KASSERT(pipe_zone != NULL, ("pipe_zone not initialized"));
}
@ -277,22 +273,9 @@ pipe_zone_ctor(void *mem, int size, void *arg, int flags)
*/
pp->pp_label = NULL;
atomic_add_int(&amountpipes, 2);
return (0);
}
static void
pipe_zone_dtor(void *mem, int size, void *arg)
{
struct pipepair *pp;
KASSERT(size == sizeof(*pp), ("pipe_zone_dtor: wrong size"));
pp = (struct pipepair *)mem;
atomic_subtract_int(&amountpipes, 2);
}
static int
pipe_zone_init(void *mem, int size, int flags)
{