Fixup some style issues

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/gettime.c b/gettime.c
index 6a50ec548d0091d0f489fb45c6310254539ed7f2..a14a179bd14e49bc47e5fdb0f118a40ac7edbe0e 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -311,9 +311,10 @@ static int calibrate_cpu_clock(void)
                        (unsigned long long) maxc, mean, S);
 
        max_ticks = MAX_CLOCK_SEC * cycles_per_msec * 1000ULL;
-        max_mult = ULLONG_MAX / max_ticks;
-        dprint(FD_TIME, "\n\nmax_ticks=%llu, __builtin_clzll=%d, max_mult=%llu\n",
-               max_ticks, __builtin_clzll(max_ticks), max_mult);
+       max_mult = ULLONG_MAX / max_ticks;
+       dprint(FD_TIME, "\n\nmax_ticks=%llu, __builtin_clzll=%d, "
+                       "max_mult=%llu\n", max_ticks,
+                       __builtin_clzll(max_ticks), max_mult);
 
         /*
          * Find the largest shift count that will produce
@@ -326,30 +327,41 @@ static int calibrate_cpu_clock(void)
                 dprint(FD_TIME, "tmp=%llu, sft=%u\n", tmp, sft);
         }
 
-        clock_shift = sft;
-        clock_mult = (1ULL << sft) * 1000000 / cycles_per_msec;
-       dprint(FD_TIME, "clock_shift=%u, clock_mult=%llu\n", clock_shift, clock_mult);
+       clock_shift = sft;
+       clock_mult = (1ULL << sft) * 1000000 / cycles_per_msec;
+       dprint(FD_TIME, "clock_shift=%u, clock_mult=%llu\n", clock_shift,
+                                                       clock_mult);
 
-       // Find the greatest power of 2 clock ticks that is less than the ticks in MAX_CLOCK_SEC_2STAGE
+       /*
+        * Find the greatest power of 2 clock ticks that is less than the
+        * ticks in MAX_CLOCK_SEC_2STAGE
+        */
        max_cycles_shift = max_cycles_mask = 0;
        tmp = MAX_CLOCK_SEC * 1000ULL * cycles_per_msec;
-       dprint(FD_TIME, "tmp=%llu, max_cycles_shift=%u\n", tmp, max_cycles_shift);
+       dprint(FD_TIME, "tmp=%llu, max_cycles_shift=%u\n", tmp,
+                                                       max_cycles_shift);
        while (tmp > 1) {
                tmp >>= 1;
                max_cycles_shift++;
                dprint(FD_TIME, "tmp=%llu, max_cycles_shift=%u\n", tmp, max_cycles_shift);
        }
-       // if use use (1ULL << max_cycles_shift) * 1000 / cycles_per_msec here we will
-       // have a discontinuity every (1ULL << max_cycles_shift) cycles
-       nsecs_for_max_cycles = ((1ULL << max_cycles_shift) * clock_mult) >> clock_shift;
+       /*
+        * if use use (1ULL << max_cycles_shift) * 1000 / cycles_per_msec
+        * here we will have a discontinuity every
+        * (1ULL << max_cycles_shift) cycles
+        */
+       nsecs_for_max_cycles = ((1ULL << max_cycles_shift) * clock_mult)
+                                       >> clock_shift;
 
-       // Use a bitmask to calculate ticks % (1ULL << max_cycles_shift)
+       /* Use a bitmask to calculate ticks % (1ULL << max_cycles_shift) */
        for (tmp = 0; tmp < max_cycles_shift; tmp++)
                max_cycles_mask |= 1ULL << tmp;
 
-       dprint(FD_TIME, "max_cycles_shift=%u, 2^max_cycles_shift=%llu, nsecs_for_max_cycles=%llu, max_cycles_mask=%016llx\n",
-               max_cycles_shift, (1ULL << max_cycles_shift),
-               nsecs_for_max_cycles, max_cycles_mask);
+       dprint(FD_TIME, "max_cycles_shift=%u, 2^max_cycles_shift=%llu, "
+                       "nsecs_for_max_cycles=%llu, "
+                       "max_cycles_mask=%016llx\n",
+                       max_cycles_shift, (1ULL << max_cycles_shift),
+                       nsecs_for_max_cycles, max_cycles_mask);
 
        cycles_start = get_cpu_clock();
        dprint(FD_TIME, "cycles_start=%llu\n", cycles_start);

diff --git a/stat.c b/stat.c
index 4e671d0f073d63e2053f65d96ec70859af664798..50426509cb9226a46d13b579e5043df2121b6c71 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -231,8 +231,9 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
 
 
        time_width = max(5, (int) (log10(maxv / divisor) + 1));
-       snprintf(fmt, sizeof(fmt), " %%%u.%ufth=[%%%dllu]%%c", precision+3, precision, time_width);
-       // fmt will be something like " %5.2fth=[%4llu]%c"
+       snprintf(fmt, sizeof(fmt), " %%%u.%ufth=[%%%dllu]%%c", precision + 3,
+                       precision, time_width);
+       /* fmt will be something like " %5.2fth=[%4llu]%c" */
        per_line = (80 - 7) / (precision + 10 + time_width);
 
        for (j = 0; j < len; j++) {
@@ -260,8 +261,8 @@ out:
                free(ovals);
 }
 
-bool calc_lat(struct io_stat *is, unsigned long long *min, unsigned long long *max,
-             double *mean, double *dev)
+bool calc_lat(struct io_stat *is, unsigned long long *min,
+             unsigned long long *max, double *mean, double *dev)
 {
        double n = (double) is->samples;
 
@@ -390,8 +391,9 @@ void stat_calc_lat_m(struct thread_stat *ts, double *io_u_lat)
        stat_calc_lat(ts, io_u_lat, ts->io_u_lat_m, FIO_IO_U_LAT_M_NR);
 }
 
-static void display_lat(const char *name, unsigned long long min, unsigned long long max,
-                       double mean, double dev, struct buf_output *out)
+static void display_lat(const char *name, unsigned long long min,
+                       unsigned long long max, double mean, double dev,
+                       struct buf_output *out)
 {
        const char *base = "(nsec)";
        char *minp, *maxp;

diff --git a/stat.h b/stat.h
index a4cfd1dfa749e2da372c23e91ecbc48bb5aabe49..132dee3cd876dcda01d18e60b576049a66f00eb1 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -314,8 +314,9 @@ extern int calc_log_samples(void);
 extern struct io_log *agg_io_log[DDIR_RWDIR_CNT];
 extern int write_bw_log;
 
-static inline bool nsec_to_usec(unsigned long long *min, unsigned long long *max,
-                               double *mean, double *dev)
+static inline bool nsec_to_usec(unsigned long long *min,
+                               unsigned long long *max, double *mean,
+                               double *dev)
 {
        if (*min > 2000 && *max > 99999 && *dev > 1000.0) {
                *min /= 1000;
@@ -328,8 +329,9 @@ static inline bool nsec_to_usec(unsigned long long *min, unsigned long long *max
        return false;
 }
 
-static inline bool nsec_to_msec(unsigned long long *min, unsigned long long *max,
-                               double *mean, double *dev)
+static inline bool nsec_to_msec(unsigned long long *min,
+                               unsigned long long *max, double *mean,
+                               double *dev)
 {
        if (*min > 2000000 && *max > 99999999ULL && *dev > 1000000.0) {
                *min /= 1000000;
@@ -341,6 +343,7 @@ static inline bool nsec_to_msec(unsigned long long *min, unsigned long long *max
 
        return false;
 }
+
 /*
  * Worst level condensing would be 1:5, so allow enough room for that
  */