X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Futils%2Frouterstat.c;h=f31f8114886087fc58878d3760c9c152f7cbd218;hp=0b4e5135539fabf0fdad7e63bb49d2a7bf73f6b8;hb=861c70ff6e3371c752d53fcb71cdc54fe74cd3c2;hpb=3d3bc28fb48d858bbe6a66ab567a13eeb0b86c40

diff --git a/lnet/utils/routerstat.c b/lnet/utils/routerstat.c
index 0b4e513..f31f811 100644
--- a/lnet/utils/routerstat.c
+++ b/lnet/utils/routerstat.c
@@ -1,3 +1,39 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * 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>
@@ -11,7 +47,7 @@ double
 timenow ()
 {
    struct timeval tv;
-   
+
    gettimeofday (&tv, NULL);
    return (tv.tv_sec + tv.tv_usec / 1000000.0);
 }
@@ -34,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;
 }
 
@@ -42,7 +78,7 @@ unsigned long long subul(unsigned long a, unsigned long b)
 {
 	if (a < b)
 		return -1UL - b + a + 1;
-	
+
 	return a - b;
 }
 
@@ -67,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,
@@ -90,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);
@@ -126,7 +163,7 @@ do_stat (int fd)
 
    old_counter = new_counter;
    fflush (stdout);
-   
+
    lseek (fd, 0, SEEK_SET);
    last = timenow();
 }
@@ -135,7 +172,7 @@ int main (int argc, char **argv)
 {
    int  interval = 0;
    int  fd;
-   
+
    if (argc > 1)
       interval = atoi (argv[1]);
 
@@ -145,11 +182,11 @@ int main (int argc, char **argv)
       fprintf (stderr, "Can't open stat: %s\n", strerror (errno));
       return (1);
    }
-   
+
    do_stat (fd);
    if (interval == 0)
       return (0);
-   
+
    for (;;)
    {
       sleep (interval);