Whamcloud - gitweb
LU-6142 utils: Fix style issues for routerstat.c 20/55420/2
authorArshad Hussain <arshad.hussain@aeoncomputing.com>
Wed, 12 Jun 2024 05:56:51 +0000 (01:56 -0400)
committerOleg Drokin <green@whamcloud.com>
Tue, 25 Jun 2024 03:24:46 +0000 (03:24 +0000)
This patch fixes issues reported by checkpatch
for file lnet/utils/routerstat.c

Test-Parameters: trivial
Signed-off-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Change-Id: I679fcf0530b1ce25c00fa35c05a904d5b0a4ecb8
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55420
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lnet/utils/routerstat.c

index 12507aa..6473a12 100644 (file)
 
 static double timenow(void)
 {
-   struct timeval tv;
+       struct timeval tv;
 
-   gettimeofday (&tv, NULL);
-   return (tv.tv_sec + tv.tv_usec / 1000000.0);
+       gettimeofday(&tv, NULL);
+       return (tv.tv_sec + tv.tv_usec / 1000000.0);
 }
 
 typedef struct {
-        unsigned long        msgs_alloc;
-        unsigned long        msgs_max;
-        unsigned long        errors;
-        unsigned long        send_count;
-        unsigned long        recv_count;
-        unsigned long        route_count;
-        unsigned long        drop_count;
-        unsigned long long   send_length;
-        unsigned long long   recv_length;
-        unsigned long long   route_length;
-        unsigned long long   drop_length;
+       unsigned long        msgs_alloc;
+       unsigned long        msgs_max;
+       unsigned long        errors;
+       unsigned long        send_count;
+       unsigned long        recv_count;
+       unsigned long        route_count;
+       unsigned long        drop_count;
+       unsigned long long   send_length;
+       unsigned long long   recv_length;
+       unsigned long long   route_length;
+       unsigned long long   drop_length;
 } counters_t;
 
 static unsigned long long subull(unsigned long long a, unsigned long long b)
@@ -74,77 +74,82 @@ static double rull(unsigned long long a, double secs)
 
 static void do_stat(int fd)
 {
-   static char  buffer[1024];
-   static double last = 0.0;
-   static counters_t old_counter;
-   double now;
-   double t;
-   counters_t new_counter;
-   counters_t counter;
-   int    n;
-
-   lseek (fd, 0, SEEK_SET);
-   now = timenow();
-   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 %llu %llu %llu %llu",
-              &new_counter.msgs_alloc, &new_counter.msgs_max,
-              &new_counter.errors, 
-              &new_counter.send_count, &new_counter.recv_count,
-              &new_counter.route_count, &new_counter.drop_count,
-              &new_counter.send_length, &new_counter.recv_length,
-              &new_counter.route_length, &new_counter.drop_length);
-   if (n < 11)
-   {
-      fprintf (stderr, "Can't parse statfile\n");
-      exit (1);
-   }
-
-   if (last == 0.0) {
-                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_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);
-          counter.route_count = subul(new_counter.route_count, old_counter.route_count);
-          counter.drop_count = subul(new_counter.drop_count, old_counter.drop_count);
-          counter.send_length = subull(new_counter.send_length, old_counter.send_length);
-          counter.recv_length = subull(new_counter.recv_length, old_counter.recv_length);
-          counter.route_length = subull(new_counter.route_length, old_counter.route_length);
-          counter.drop_length = subull(new_counter.drop_length, old_counter.drop_length);
-
-          printf ("M %3lu(%3lu) E %0.0f S %7.2f/%6.0f R %7.2f/%6.0f F %7.2f/%6.0f D %4.2f/%0.0f\n",
-                  counter.msgs_alloc, counter.msgs_max,
-                  rul(counter.errors,t),
-                  rull(counter.send_length,t*1024.0*1024.0), rul(counter.send_count, t),
-                  rull(counter.recv_length,t*1024.0*1024.0), rul(counter.recv_count, t),
-                  rull(counter.route_length,t*1024.0*1024.0), rul(counter.route_count, t),
-                  rull(counter.drop_length,t*1024.0*1024.0), rul(counter.drop_count, t));
-   }
-
-   old_counter = new_counter;
-   fflush (stdout);
-
-   lseek (fd, 0, SEEK_SET);
-   last = timenow();
+       static char  buffer[1024];
+       static double last = 0.0;
+       counters_t new_counter, counter;
+       static counters_t old_counter;
+       double now, t;
+       int n;
+
+       lseek(fd, 0, SEEK_SET);
+       now = timenow();
+       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 %llu %llu %llu %llu",
+                  &new_counter.msgs_alloc, &new_counter.msgs_max,
+                  &new_counter.errors, &new_counter.send_count,
+                  &new_counter.recv_count, &new_counter.route_count,
+                  &new_counter.drop_count, &new_counter.send_length,
+                  &new_counter.recv_length, &new_counter.route_length,
+                  &new_counter.drop_length);
+       if (n < 11) {
+               fprintf(stderr, "Can't parse statfile\n");
+               exit(1);
+       }
+
+       if (last == 0.0) {
+               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_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);
+               counter.route_count = subul(new_counter.route_count,
+                                           old_counter.route_count);
+               counter.drop_count = subul(new_counter.drop_count,
+                                          old_counter.drop_count);
+               counter.send_length = subull(new_counter.send_length,
+                                            old_counter.send_length);
+               counter.recv_length = subull(new_counter.recv_length,
+                                            old_counter.recv_length);
+               counter.route_length = subull(new_counter.route_length,
+                                             old_counter.route_length);
+               counter.drop_length = subull(new_counter.drop_length,
+                                            old_counter.drop_length);
+
+               printf("M %3lu(%3lu) E %0.0f S %7.2f/%6.0f R %7.2f/%6.0f F %7.2f/%6.0f D %4.2f/%0.0f\n",
+                      counter.msgs_alloc, counter.msgs_max,
+                      rul(counter.errors, t),
+                      rull(counter.send_length, t * 1024.0 * 1024.0),
+                      rul(counter.send_count, t),
+                      rull(counter.recv_length, t * 1024.0 * 1024.0),
+                      rul(counter.recv_count, t),
+                      rull(counter.route_length, t * 1024.0 * 1024.0),
+                      rul(counter.route_count, t),
+                      rull(counter.drop_length, t * 1024.0 * 1024.0),
+                      rul(counter.drop_count, t));
+       }
+
+       old_counter = new_counter;
+       fflush(stdout);
+
+       lseek(fd, 0, SEEK_SET);
+       last = timenow();
 }
 
 int main(int argc, char **argv)