Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resize the namecache hash table also when desiredvnodes changes.

Browse Source
This commit is contained in:
chs 2001-09-24 06:01:13 +00:00
parent 7173d0a3e8
commit 7bb91a0959
3 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/kern_sysctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sysctl.c,v 1.94 2001/09/15 16:12:57 chs Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.95 2001/09/24 06:01:13 chs Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@ -74,6 +74,7 @@
#define __SYSCTL_PRIVATE
#include <sys/sysctl.h>
#include <sys/lock.h>
#include <sys/namei.h>
#if defined(SYSVMSG) || defined(SYSVSEM) || defined(SYSVSHM)
#include <sys/ipc.h>
@ -354,6 +355,7 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
}
if (error == 0) {
vfs_reinit();
nchreinit();
}
return (error);
case KERN_MAXPROC:

55
sys/kern/vfs_cache.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_cache.c,v 1.29 2001/03/29 22:39:23 fvdl Exp $ */
/* $NetBSD: vfs_cache.c,v 1.30 2001/09/24 06:01:13 chs Exp $ */
/*
* Copyright (c) 1989, 1993
@ -75,9 +75,11 @@
LIST_HEAD(nchashhead, namecache) *nchashtbl;
u_long nchash; /* size of hash table - 1 */
long numcache; /* number of cache entries allocated */
#define NCHASH(cnp, dvp) (((cnp)->cn_hash ^ (dvp)->v_id) & nchash)
LIST_HEAD(ncvhashhead, namecache) *ncvhashtbl;
u_long ncvhash; /* size of hash table - 1 */
#define NCVHASH(vp) ((vp)->v_id & ncvhash)
TAILQ_HEAD(, namecache) nclruhead; /* LRU chain */
struct nchstats nchstats; /* cache effectiveness statistics */
@ -124,7 +126,7 @@ cache_lookup(dvp, vpp, cnp)
*vpp = 0;
return (-1);
}
ncpp = &nchashtbl[(cnp->cn_hash ^ dvp->v_id) & nchash];
ncpp = &nchashtbl[NCHASH(cnp, dvp)];
LIST_FOREACH(ncp, ncpp, nc_hash) {
if (ncp->nc_dvp == dvp &&
ncp->nc_dvpid == dvp->v_id &&
@ -272,7 +274,7 @@ cache_revlookup (vp, dvpp, bpp, bufp)
if (!doingcache)
goto out;
nvcpp = &ncvhashtbl[(vp->v_id & ncvhash)];
nvcpp = &ncvhashtbl[NCVHASH(vp)];
LIST_FOREACH(ncp, nvcpp, nc_vhash) {
if ((ncp->nc_vp == vp) &&
@ -372,7 +374,7 @@ cache_enter(dvp, vp, cnp)
ncp->nc_nlen = cnp->cn_namelen;
memcpy(ncp->nc_name, cnp->cn_nameptr, (unsigned)ncp->nc_nlen);
TAILQ_INSERT_TAIL(&nclruhead, ncp, nc_lru);
ncpp = &nchashtbl[(cnp->cn_hash ^ dvp->v_id) & nchash];
ncpp = &nchashtbl[NCHASH(cnp, dvp)];
LIST_INSERT_HEAD(ncpp, ncp, nc_hash);
ncp->nc_vhash.le_prev = 0;
@ -390,7 +392,7 @@ cache_enter(dvp, vp, cnp)
((ncp->nc_nlen == 2) && (ncp->nc_name[0] != '.') && (ncp->nc_name[1] != '.')) ||
((ncp->nc_nlen == 1) && (ncp->nc_name[0] != '.'))))
{
nvcpp = &ncvhashtbl[(vp->v_id & ncvhash)];
nvcpp = &ncvhashtbl[NCVHASH(vp)];
LIST_INSERT_HEAD(nvcpp, ncp, nc_vhash);
}
@ -417,6 +419,49 @@ nchinit()
M_CACHE);
}
/*
* Name cache reinitialization, for when the maximum number of vnodes increases.
*/
void
nchreinit()
{
struct namecache *ncp;
struct nchashhead *oldhash1, *hash1;
struct ncvhashhead *oldhash2, *hash2;
u_long oldmask1, oldmask2, mask1, mask2;
int i;
hash1 = hashinit(desiredvnodes, HASH_LIST, M_CACHE, M_WAITOK, &mask1);
hash2 =
#ifdef NAMECACHE_ENTER_REVERSE
hashinit(desiredvnodes, HASH_LIST, M_CACHE, M_WAITOK, &mask2);
#else
hashinit(desiredvnodes/8, HASH_LIST, M_CACHE, M_WAITOK, &mask2);
#endif
oldhash1 = nchashtbl;
oldmask1 = nchash;
nchashtbl = hash1;
nchash = mask1;
oldhash2 = ncvhashtbl;
oldmask2 = ncvhash;
ncvhashtbl = hash2;
ncvhash = mask2;
for (i = 0; i <= oldmask1; i++) {
while ((ncp = LIST_FIRST(&oldhash1[i])) != NULL) {
LIST_REMOVE(ncp, nc_hash);
ncp->nc_hash.le_prev = NULL;
}
}
for (i = 0; i <= oldmask2; i++) {
while ((ncp = LIST_FIRST(&oldhash2[i])) != NULL) {
LIST_REMOVE(ncp, nc_vhash);
ncp->nc_vhash.le_prev = NULL;
}
}
hashdone(oldhash1, M_CACHE);
hashdone(oldhash2, M_CACHE);
}
/*
* Cache flush, a particular vnode; called when a vnode is renamed to
* hide entries that would now be invalid

3
sys/sys/namei.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: namei.h,v 1.21 2001/09/08 02:02:05 christos Exp $ */
/* $NetBSD: namei.h,v 1.22 2001/09/24 06:01:13 chs Exp $ */
/*
* Copyright (c) 1985, 1989, 1991, 1993
@ -191,6 +191,7 @@ int cache_lookup __P((struct vnode *, struct vnode **, struct componentname *));
int cache_revlookup __P((struct vnode *, struct vnode **, char **, char *));
void cache_enter __P((struct vnode *, struct vnode *, struct componentname *));
void nchinit __P((void));
void nchreinit __P((void));
struct mount;
void cache_purgevfs __P((struct mount *));
void namecache_print(struct vnode *, void (*)(const char *, ...));