Tue Jul 29 15:38:15 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>

	* name-cache.c (check_lookup_cache): Use name_cache_neg_timeout in
	preference to name_cache_timeout for negative hits.

	* nfs.h (name_cache_neg_timeout): New variable.
	* main.c (DEFAULT_NAME_CACHE_NEG_TIMEOUT): New macro.
	(name_cache_neg_timeout): Initialize new variable.
	(OPT_NCACHE_NEG_TO): New option key.
	(common_options): Add --name-cache-neg-timeout switch.
	(parse_common_opt): Process OPT_NCACHE_NEG_TO option key.

	* ops.c (netfs_attempt_lookup): Do cast of -1 correctly to match
	check_lookup_cache and ANSI C rules.

	* name-cache.c (check_lookup_cache): Unlock DIR correctly before
	returning a negative cache hit.

	* rpc.c (rpc_receive_thread): Don't print "dropping reply"
	messages any more.

	* ops.c (netfs_attempt_lookup): Cash all lookups, both positive
	and negative.
	(netfs_attempt_mkdir): Purge cache before creating directory
	entry.
	(netfs_attempt_link): Likewise.
	(netfs_attempt_create_file): Likewise.

	* ops.c (netfs_attempt_lookup): Pass correct node to
	enter_lookup_cache as the child.

Thu Jul 24 13:15:56 1997  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* name-cache.c: New file.
	* ops.c (netfs_attempt_lookup): Check lookup cache before trying
	RPC.  After successful lookup, make cache entry.
	(netfs_attempt_unlink): Purge cache before doing operation.
	(netfs_attempt_rmdir): Likewise.
	(netfs_attempt_rename): Purge cache for both names before operation.
	* nfs.h (enter_lookup_cache, purge_lookup_cache,
	check_lookup_cache): New prototypes.
	* Makefile (SRCS): Add name-cache.c.

	* nfs.h (name_cache_timeout): New variable.
	* main.c (DEFAULT_NAME_CACHE_TIMEOUT): New macro.
	(name_cache_timeout): Initialize new variable.
	(OPT_NCACHE_TO): New option key.
	(common_options): Add --name-cache-timeout switch.
	(parse_common_opt): Process OPT_NCACHE_TO option key.

	* cache.c (lookup_fhandle): Don't parse NFS XDR format, instead
	take a length arg.  Return void.  All callers changed to use new
	function xdr_decode_fhandle.
	* nfs.c (xdr_decode_fhandle): New function.
	* nfs.h (xdr_decode_fhandle): New prototype.
	(lookup_fhandle): Update prototype.

1 files changed, 22 insertions, 0 deletions

diff --git a/nfs/main.c b/nfs/main.c
index add6ecc8..d9702ecb 100644
--- a/nfs/main.c
+++ b/nfs/main.c
@@ -42,6 +42,12 @@ extern char *localhost ();
 /* Default number of seconds to timeout cached file contents. */
 #define DEFAULT_CACHE_TIMEOUT 3	
 
+/* Default number of seconds to timeout cache positive dir hits. */
+#define DEFAULT_NAME_CACHE_TIMEOUT 3
+
+/* Default number of seconds to timeout cache negative dir hits. */
+#define DEFAULT_NAME_CACHE_NEG_TIMEOUT 3
+
 /* Default maximum number of bytes to read at once. */
 #define DEFAULT_READ_SIZE     8192 
 
@@ -55,6 +61,12 @@ int stat_timeout = DEFAULT_STAT_TIMEOUT;
 /* Number of seconds to timeout cached file contents. */
 int cache_timeout = DEFAULT_CACHE_TIMEOUT;
 
+/* Number of seconds to timeout cached positive dir hits. */
+int name_cache_timeout = DEFAULT_NAME_CACHE_TIMEOUT;
+
+/* Number of seconds to timeout cached negative dir hits. */
+int name_cache_neg_timeout = DEFAULT_NAME_CACHE_NEG_TIMEOUT;
+
 /* Number of seconds to wait for first retransmission of an RPC. */
 int initial_transmit_timeout = 1;
 
@@ -89,6 +101,8 @@ int write_size = DEFAULT_WRITE_SIZE;
 #define OPT_MNT_PROG    -11
 #define OPT_NFS_PROG    -12
 #define OPT_PMAP_PORT	-13
+#define OPT_NCACHE_TO	-14
+#define OPT_NCACHE_NEG_TO -15
 
 /* Return a string corresponding to the printed rep of DEFAULT_what */
 #define ___D(what) #what
@@ -118,6 +132,12 @@ static const struct argp_option common_options[] =
      "Timeout for cached stat information (default " _D(STAT_TIMEOUT) ")"},
   {"cache-timeout",	    OPT_CACHE_TO,  "SEC", 0,
      "Timeout for cached file data (default " _D(CACHE_TIMEOUT) ")"},
+  {"name-cache-timeout",    OPT_NCACHE_TO, "SEC", 0,
+     "Timeout for positive directory cache entries (default " 
+   _D(NAME_CACHE_TIMEOUT) ")"},
+  {"name-cache-neg-timeout", OPT_NCACHE_NEG_TO, "SEC", 0,
+     "Timeout for negative directory cache entires (default "
+   _D(NAME_CACHE_NEG_TIMEOUT) ")"},
   {"init-transmit-timeout", OPT_INIT_TR_TO,"SEC", 0}, 
   {"max-transmit-timeout",  OPT_MAX_TR_TO, "SEC", 0}, 
 
@@ -145,6 +165,8 @@ parse_common_opt (int key, char *arg, struct argp_state *state)
     case OPT_CACHE_TO: cache_timeout = atoi (arg); break;
     case OPT_INIT_TR_TO: initial_transmit_timeout = atoi (arg); break;
     case OPT_MAX_TR_TO: max_transmit_timeout = atoi (arg); break;
+    case OPT_NCACHE_TO: name_cache_timeout = atoi (arg); break;
+    case OPT_NCACHE_NEG_TO: name_cache_neg_timeout = atoi (arg); break;
 
     default:
       return ARGP_ERR_UNKNOWN;