X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Frouterstat.c;h=2071ac9b8eeb4345d4652af2e6ddf8f908c5051d;hb=998a494fa9a46b92d4c7fb3485a0faeb78beb2cd;hp=0d59dfca83ab79c47d5dfbd21e43450b80842849;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lnet/utils/routerstat.c b/lnet/utils/routerstat.c
index 0d59dfc..2071ac9 100644
--- a/lnet/utils/routerstat.c
+++ b/lnet/utils/routerstat.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,37 +15,39 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <glob.h>
+#include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <unistd.h>
+
+#include <libcfs/util/param.h>
 
 double
 timenow ()
 {
    struct timeval tv;
-   
+
    gettimeofday (&tv, NULL);
    return (tv.tv_sec + tv.tv_usec / 1000000.0);
 }
@@ -70,7 +70,7 @@ unsigned long long subull(unsigned long long a, unsigned long long b)
 {
 	if (a < b)
 		return -1ULL - b + a + 1;
-	
+
 	return a - b;
 }
 
@@ -78,7 +78,7 @@ unsigned long long subul(unsigned long a, unsigned long b)
 {
 	if (a < b)
 		return -1UL - b + a + 1;
-	
+
 	return a - b;
 }
 
@@ -103,18 +103,18 @@ do_stat (int fd)
    counters_t new_counter;
    counters_t counter;
    int    n;
-   
+
    lseek (fd, 0, SEEK_SET);
    now = timenow();
-   n = read (fd, buffer, sizeof (buffer));
+   n = read(fd, buffer, sizeof(buffer) - 1);
    if (n < 0)
    {
       fprintf (stderr, "Can't read statfile\n");
       exit (1);
-   }	 
+   }
    buffer[n] = 0;
-   
-   n = sscanf (buffer, "%lu %lu %lu %lu %lu %lu %lu %Lu %Lu %Lu %Lu",
+
+   n = sscanf(buffer, "%lu %lu %lu %lu %lu %lu %lu %llu %llu %llu %llu",
 	       &new_counter.msgs_alloc, &new_counter.msgs_max,
 	       &new_counter.errors, 
 	       &new_counter.send_count, &new_counter.recv_count,
@@ -126,21 +126,22 @@ do_stat (int fd)
       fprintf (stderr, "Can't parse statfile\n");
       exit (1);
    }
-   
+
    if (last == 0.0) {
-	   printf ("M %lu(%lu) E %lu S %lu/%llu R %lu/%llu F %lu/%llu D %lu/%llu\n", 
+                printf("M %lu(%lu) E %lu S %llu/%lu R %llu/%lu F %llu/%lu "
+                       "D %llu/%lu\n",
 		   new_counter.msgs_alloc, new_counter.msgs_max,
-		   new_counter.errors, 
-		   new_counter.send_count, new_counter.send_length,
-		   new_counter.recv_count, new_counter.recv_length,
-		   new_counter.route_count, new_counter.route_length, 
-		   new_counter.drop_count, new_counter.drop_length);
+		   new_counter.errors,
+		   new_counter.send_length, new_counter.send_count,
+		   new_counter.recv_length, new_counter.recv_count,
+		   new_counter.route_length, new_counter.route_count,
+		   new_counter.drop_length, new_counter.drop_count);
    } else {
 	   t = now - last;
 
 	   counter.msgs_alloc = new_counter.msgs_alloc;
 	   counter.msgs_max = new_counter.msgs_max;
-	   
+
 	   counter.errors = subul(new_counter.errors, old_counter.errors);
 	   counter.send_count = subul(new_counter.send_count, old_counter.send_count);
 	   counter.recv_count = subul(new_counter.recv_count, old_counter.recv_count);
@@ -162,33 +163,41 @@ do_stat (int fd)
 
    old_counter = new_counter;
    fflush (stdout);
-   
+
    lseek (fd, 0, SEEK_SET);
    last = timenow();
 }
 
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-   int  interval = 0;
-   int  fd;
-   
-   if (argc > 1)
-      interval = atoi (argv[1]);
-
-   fd = open ("/proc/sys/lnet/stats", O_RDONLY);
-   if (fd < 0)
-   {
-      fprintf (stderr, "Can't open stat: %s\n", strerror (errno));
-      return (1);
-   }
-   
-   do_stat (fd);
-   if (interval == 0)
-      return (0);
-   
-   for (;;)
-   {
-      sleep (interval);
-      do_stat (fd);
-   }
+	int interval = 0;
+	glob_t path;
+	int fd;
+
+	if (argc > 1)
+		interval = atoi(argv[1]);
+
+	if (cfs_get_param_paths(&path, "stats") != 0) {
+		fprintf(stderr, "LNet stats not available\n");
+		return 1;
+	}
+
+	fd = open(path.gl_pathv[0], O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, "failed to open '%s': %s\n", path.gl_pathv[0],
+			strerror(errno));
+		cfs_free_param_data(&path);
+		return 1;
+	}
+	cfs_free_param_data(&path);
+
+	do_stat(fd);
+	if (interval == 0)
+		return 0;
+
+	while (1) {
+		sleep(interval);
+		do_stat(fd);
+	}
+	/* Never reached */
 }