X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fobdbarrier.c;h=8774cef0407c2c797c0c92cce3d961874b9d94da;hb=fe79e1b3a463c6ff8d6a8c8be2b9505df5a5702a;hp=3363824c09f899a0636e0e97ee49ea0b3756ed6b;hpb=040033cef24c5aca2967daf2da7a862abcd074cf;p=fs%2Flustre-release.git

diff --git a/lustre/utils/obdbarrier.c b/lustre/utils/obdbarrier.c
index 3363824..8774cef 100644
--- a/lustre/utils/obdbarrier.c
+++ b/lustre/utils/obdbarrier.c
@@ -70,13 +70,13 @@ parse_kmg (uint64_t *valp, char *str)
 }
 
 void
-usage (char *cmdname, int help) 
+usage (char *cmdname, int help)
 {
         char *name = strrchr (cmdname, '/');
-        
+
         if (name == NULL)
                 name = cmdname;
-        
+
         fprintf (help ? stdout : stderr,
                  "usage: %s -d device -s size -o offset [-i id][-n reps][-l] oid\n",
                  name);
@@ -85,32 +85,32 @@ usage (char *cmdname, int help)
 int
 exponential_modulus (int i, int base)
 {
-	int   top = base;
-	int   mod = 1;
-	
-	for (;;) {
-		if (i < top)
-			return (i%mod == 0);
-		
-		mod = top;
-		top *= base;
-	}
+        int   top = base;
+        int   mod = 1;
+
+        for (;;) {
+                if (i < top)
+                        return (i%mod == 0);
+
+                mod = top;
+                top *= base;
+        }
 }
 
 int
-main (int argc, char **argv) 
+main (int argc, char **argv)
 {
         uint64_t              bid = (((uint64_t)gethostid()) << 32) | getpid ();
         int                   set_bid = 0;
         uint64_t              oid;
-	int                   setup = 0;
+        int                   setup = 0;
         int                   device = -1;
-	int                   npeers = 0;
+        int                   npeers = 0;
         int                   reps = 1;
         char                  hostname[128];
         struct obdio_conn    *conn;
-	struct obdio_barrier *b;
-	char                 *end;
+        struct obdio_barrier *b;
+        char                 *end;
         uint64_t              val;
         int                   rc;
         int                   c;
@@ -119,13 +119,13 @@ main (int argc, char **argv)
         memset (hostname, 0, sizeof (hostname));
         gethostname (hostname, sizeof (hostname));
         hostname[sizeof(hostname) - 1] = 0;
-        
+
         while ((c = getopt (argc, argv, "hsi:d:n:p:")) != -1)
                 switch (c) {
                 case 'h':
                         usage (argv[0], 1);
                         return (0);
-                        
+
                 case 'i':
                         bid = strtoll (optarg, &end, 0);
                         if (end == optarg || *end != 0) {
@@ -135,11 +135,11 @@ main (int argc, char **argv)
                         }
                         set_bid = 1;
                         break;
-                        
+
                 case 's':
-			setup = 1;
+                        setup = 1;
                         break;
-                        
+
                 case 'd':
                         device = strtol (optarg, &end, 0);
                         if (end == optarg || *end != 0 || device < 0) {
@@ -160,7 +160,7 @@ main (int argc, char **argv)
 
                 case 'p':
                         npeers = strtol (optarg, &end, 0);
-			if (end == optarg || *end != 0 || npeers <= 0) {
+                        if (end == optarg || *end != 0 || npeers <= 0) {
                                 fprintf (stderr, "Can't parse npeers %s\n",
                                          optarg);
                                 return (1);
@@ -174,7 +174,7 @@ main (int argc, char **argv)
 
         if ((!setup && !set_bid) ||
             npeers <= 0 ||
-	    device < 0 ||
+            device < 0 ||
             optind == argc) {
                 fprintf (stderr, "%s not specified\n",
                          (!setup && !set_bid) ? "id" :
@@ -182,41 +182,41 @@ main (int argc, char **argv)
                          device < 0 ? "device" : "object id");
                 return (1);
         }
-        
+
         oid = strtoull (argv[optind], &end, 0);
         if (end == argv[optind] || *end != 0) {
                 fprintf (stderr, "Can't parse object id %s\n",
                          argv[optind]);
                 return (1);
         }
-        
+
         conn = obdio_connect (device);
         if (conn == NULL)
                 return (1);
 
-	b = obdio_new_barrier (oid, bid, npeers);
-	if (b == NULL)
-		return (1);
+        b = obdio_new_barrier (oid, bid, npeers);
+        if (b == NULL)
+                return (1);
 
         rc = 0;
-	if (setup) {
-		rc = obdio_setup_barrier (conn, b);
+        if (setup) {
+                rc = obdio_setup_barrier (conn, b);
                 if (rc == 0)
                         printf ("Setup barrier: -d %d -i "LPX64" -p %d -n1 "LPX64"\n",
                                 device, bid, npeers, oid);
-	} else {
-		for (c = 0; c < reps; c++) {
-			rc = obdio_barrier (conn, b);
-			if (rc != 0)
-				break;
-			if (exponential_modulus (c, 10))
-				printf ("%s: Barrier %d\n", hostname, c);
-		}
-	}
-
-	free (b);
-        
-        obdio_disconnect (conn);
+        } else {
+                for (c = 0; c < reps; c++) {
+                        rc = obdio_barrier (conn, b);
+                        if (rc != 0)
+                                break;
+                        if (exponential_modulus (c, 10))
+                                printf ("%s: Barrier %d\n", hostname, c);
+                }
+        }
+
+        free(b);
+
+        obdio_disconnect(conn, 0);
 
         return (rc == 0 ? 0 : 1);
 }