network_cmds-245.tar.gz

[apple/network_cmds.git] / nfsstat.tproj / nfsstat.c

diff --git a/nfsstat.tproj/nfsstat.c b/nfsstat.tproj/nfsstat.c
index b91f08931347df9499103a2952bd67bb5f6f2a0a..5cf77d2a9c2f29b47b4e00b41eebce575d803405 100644 (file)
--- a/nfsstat.tproj/nfsstat.c
+++ b/nfsstat.tproj/nfsstat.c
@@ -1,24 +1,23 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 1.0 (the 'License').  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License."
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -242,18 +241,14 @@ intpr(nfsstataddr, display)
                       nfsstats.rpccnt[NFSPROC_READDIR],
                       nfsstats.rpccnt[NFSPROC_READDIRPLUS],
                       nfsstats.rpccnt[NFSPROC_ACCESS]);
-               printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
-                      "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit",
-                      "GLease", "Vacate", "Evict");
-               printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+               printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
+                      "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit");
+               printf("%9d %9d %9d %9d %9d\n",
                       nfsstats.rpccnt[NFSPROC_MKNOD],
                       nfsstats.rpccnt[NFSPROC_FSSTAT],
                       nfsstats.rpccnt[NFSPROC_FSINFO],
                       nfsstats.rpccnt[NFSPROC_PATHCONF],
-                      nfsstats.rpccnt[NFSPROC_COMMIT],
-                      nfsstats.rpccnt[NQNFSPROC_GETLEASE],
-                      nfsstats.rpccnt[NQNFSPROC_VACATED],
-                      nfsstats.rpccnt[NQNFSPROC_EVICTED]);
+                      nfsstats.rpccnt[NFSPROC_COMMIT]);
                printf("Rpc Info:\n");
                printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
                       "TimedOut", "Invalid", "X Replies", "Retries", "Requests");
@@ -313,18 +308,14 @@ intpr(nfsstataddr, display)
                       nfsstats.srvrpccnt[NFSPROC_READDIR],
                       nfsstats.srvrpccnt[NFSPROC_READDIRPLUS],
                       nfsstats.srvrpccnt[NFSPROC_ACCESS]);
-               printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
-                      "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit",
-                      "GLease", "Vacate", "Evict");
-               printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+               printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
+                      "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit");
+               printf("%9d %9d %9d %9d %9d\n",
                       nfsstats.srvrpccnt[NFSPROC_MKNOD],
                       nfsstats.srvrpccnt[NFSPROC_FSSTAT],
                       nfsstats.srvrpccnt[NFSPROC_FSINFO],
                       nfsstats.srvrpccnt[NFSPROC_PATHCONF],
-                      nfsstats.srvrpccnt[NFSPROC_COMMIT],
-                      nfsstats.srvrpccnt[NQNFSPROC_GETLEASE],
-                      nfsstats.srvrpccnt[NQNFSPROC_VACATED],
-                      nfsstats.srvrpccnt[NQNFSPROC_EVICTED]);
+                      nfsstats.srvrpccnt[NFSPROC_COMMIT]);
                printf("Server Ret-Failed\n");
                printf("%17d\n", nfsstats.srvrpc_errs);
                printf("Server Faults\n");
@@ -337,13 +328,6 @@ intpr(nfsstataddr, display)
                       nfsstats.srvcache_idemdonehits,
                       nfsstats.srvcache_nonidemdonehits,
                       nfsstats.srvcache_misses);
-               printf("Server Lease Stats:\n");
-               printf("%9.9s %9.9s %9.9s\n",
-                      "Leases", "PeakL", "GLeases");
-               printf("%9d %9d %9d\n",
-                      nfsstats.srvnqnfs_leases,
-                      nfsstats.srvnqnfs_maxleases,
-                      nfsstats.srvnqnfs_getleases);
                printf("Server Write Gathering:\n");
                printf("%9.9s %9.9s %9.9s\n",
                       "WriteOps", "WriteRPC", "Opsaved");