Author: rmacklem
Date: Sun Sep 9 21:00:45 2012
New Revision: 240289
URL: http://svn.freebsd.org/changeset/base/240289
Log:
Add a simple printf() based debug facility to the new nfs client.
Use it for a printf() that can be harmlessly generated for mmap()'d
files. It will be used extensively for the NFSv4.1 client.
Debugging printf()s are enabled by setting vfs.nfs.debuglevel to
a non-zero value. The higher the value, the more debugging printf()s.
Reviewed by: jhb
MFC after: 2 weeks
Modified:
head/sys/fs/nfs/nfs_commonport.c
head/sys/fs/nfs/nfscl.h
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonport.c Sun Sep 9 20:26:19 2012
(r240288)
+++ head/sys/fs/nfs/nfs_commonport.c Sun Sep 9 21:00:45 2012
(r240289)
@@ -60,6 +60,7 @@ struct mount nfsv4root_mnt;
int newnfs_numnfsd = 0;
struct nfsstats newnfsstats;
int nfs_numnfscbd = 0;
+int nfscl_debuglevel = 0;
char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
struct callout newnfsd_callout;
void (*nfsd_call_servertimer)(void) = NULL;
@@ -76,6 +77,8 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_c
SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW,
nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr),
"NFSv4 callback addr for server to use");
+SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel,
+ 0, "Debug level for new nfs client");
/*
* Defines for malloc
Modified: head/sys/fs/nfs/nfscl.h
==============================================================================
--- head/sys/fs/nfs/nfscl.h Sun Sep 9 20:26:19 2012 (r240288)
+++ head/sys/fs/nfs/nfscl.h Sun Sep 9 21:00:45 2012 (r240289)
@@ -68,4 +68,10 @@ struct nfsv4node {
#define NFSSATTR_SIZENEG1 0x4
#define NFSSATTR_SIZERDEV 0x8
+/* Use this macro for debug printfs. */
+#define NFSCL_DEBUG(level, ...) do {
\
+ if (nfscl_debuglevel >= (level)) \
+ printf(__VA_ARGS__); \
+ } while (0)
+
#endif /* _NFS_NFSCL_H */
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Sun Sep 9 20:26:19 2012
(r240288)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Sun Sep 9 21:00:45 2012
(r240289)
@@ -56,6 +56,7 @@ extern u_int32_t newnfs_false, newnfs_tr
extern nfstype nfsv34_type[9];
extern int nfsrv_useacl;
extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
+extern int nfscl_debuglevel;
NFSCLSTATEMUTEX;
int nfstest_outofseq = 0;
int nfscl_assumeposixlocks = 1;
@@ -1398,7 +1399,7 @@ nfsrpc_write(vnode_t vp, struct uio *uio
if (stateid.other[0] == 0 && stateid.other[1] == 0 &&
stateid.other[2] == 0) {
nostateid = 1;
- printf("stateid0 in write\n");
+ NFSCL_DEBUG(1, "stateid0 in write\n");
}
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
