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

Move NFS access cache hits/misses into nfsstats structure so

Browse Source 
/usr/bin/nfsstat can get to it easily.
This commit is contained in:
dillon 1999-10-25 19:22:33 +00:00
parent b01e7dfec4
commit 47a282162e
8 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/nfs/nfs.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif

13
sys/nfs/nfs_vnops.c
View File

@ -252,13 +252,13 @@ static int nfsaccess_cache_timeout = NFS_MAXATTRTIMO;
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_timeout, CTLFLAG_RW,
&nfsaccess_cache_timeout, 0, "NFS ACCESS cache timeout");
static int nfsaccess_cache_hits;
#if 0
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_hits, CTLFLAG_RD,
&nfsaccess_cache_hits, 0, "NFS ACCESS cache hit count");
&nfsstats.accesscache_hits, 0, "NFS ACCESS cache hit count");
static int nfsaccess_cache_misses;
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_misses, CTLFLAG_RD,
&nfsaccess_cache_misses, 0, "NFS ACCESS cache miss count");
&nfsstats.accesscache_misses, 0, "NFS ACCESS cache miss count");
#endif
#define NFSV3ACCESS_ALL (NFSV3ACCESS_READ | NFSV3ACCESS_MODIFY \
| NFSV3ACCESS_EXTEND | NFSV3ACCESS_EXECUTE \
@ -375,12 +375,12 @@ nfs_access(ap)
if ((time_second < (np->n_modestamp + nfsaccess_cache_timeout)) &&
(ap->a_cred->cr_uid == np->n_modeuid) &&
((np->n_mode & mode) == mode)) {
nfsaccess_cache_hits++;
nfsstats.accesscache_hits++;
} else {
/*
* Either a no, or a don't know. Go to the wire.
*/
nfsaccess_cache_misses++;
nfsstats.accesscache_misses++;
error = nfs3_access_otw(vp, wmode, ap->a_p,ap->a_cred);
if (!error) {
if ((np->n_mode & mode) != mode) {
@ -610,6 +610,7 @@ nfs_getattr(ap)
return (0);
if (v3 && nfsaccess_cache_timeout > 0) {
nfsstats.accesscache_misses++;
nfs3_access_otw(vp, NFSV3ACCESS_ALL, ap->a_p, ap->a_cred);
if (nfs_getattrcache(vp, ap->a_vap) == 0)
return (0);

2
sys/nfsclient/nfs.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif

13
sys/nfsclient/nfs_vnops.c
View File

@ -252,13 +252,13 @@ static int nfsaccess_cache_timeout = NFS_MAXATTRTIMO;
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_timeout, CTLFLAG_RW,
&nfsaccess_cache_timeout, 0, "NFS ACCESS cache timeout");
static int nfsaccess_cache_hits;
#if 0
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_hits, CTLFLAG_RD,
&nfsaccess_cache_hits, 0, "NFS ACCESS cache hit count");
&nfsstats.accesscache_hits, 0, "NFS ACCESS cache hit count");
static int nfsaccess_cache_misses;
SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_misses, CTLFLAG_RD,
&nfsaccess_cache_misses, 0, "NFS ACCESS cache miss count");
&nfsstats.accesscache_misses, 0, "NFS ACCESS cache miss count");
#endif
#define NFSV3ACCESS_ALL (NFSV3ACCESS_READ | NFSV3ACCESS_MODIFY \
| NFSV3ACCESS_EXTEND | NFSV3ACCESS_EXECUTE \
@ -375,12 +375,12 @@ nfs_access(ap)
if ((time_second < (np->n_modestamp + nfsaccess_cache_timeout)) &&
(ap->a_cred->cr_uid == np->n_modeuid) &&
((np->n_mode & mode) == mode)) {
nfsaccess_cache_hits++;
nfsstats.accesscache_hits++;
} else {
/*
* Either a no, or a don't know. Go to the wire.
*/
nfsaccess_cache_misses++;
nfsstats.accesscache_misses++;
error = nfs3_access_otw(vp, wmode, ap->a_p,ap->a_cred);
if (!error) {
if ((np->n_mode & mode) != mode) {
@ -610,6 +610,7 @@ nfs_getattr(ap)
return (0);
if (v3 && nfsaccess_cache_timeout > 0) {
nfsstats.accesscache_misses++;
nfs3_access_otw(vp, NFSV3ACCESS_ALL, ap->a_p, ap->a_cred);
if (nfs_getattrcache(vp, ap->a_vap) == 0)
return (0);

2
sys/nfsclient/nfsargs.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif

2
sys/nfsclient/nfsstats.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif

2
sys/nfsserver/nfs.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif

2
sys/nfsserver/nfsrvstats.h
View File

@ -271,6 +271,8 @@ struct nfsstats {
int srvnqnfs_maxleases;
int srvnqnfs_getleases;
int srvvop_writes;
int accesscache_hits;
int accesscache_misses;
};
#endif