[PATCH] Misc fixes

- Change the hour/day eta display to be more clever.
- Style

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/eta.c b/eta.c
index 0b022502093b4b436f9f65e4fddf044134d4e6a4..fc485985ec6a833eaf57f26c83cac8d4689e1e15 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -70,7 +70,7 @@ static void check_str_update(struct thread_data *td)
 static void eta_to_str(char *str, int eta_sec)
 {
        unsigned int d, h, m, s;
-       static int always_d, always_h;
+       int disp_hour = 0;
 
        d = h = m = s = 0;
 
@@ -82,14 +82,13 @@ static void eta_to_str(char *str, int eta_sec)
        eta_sec /= 24;
        d = eta_sec;
 
-       if (d || always_d) {
-               always_d = 1;
+       if (d) {
+               disp_hour = 1;
                str += sprintf(str, "%02ud:", d);
        }
-       if (h || always_h) {
-               always_h = 1;
+
+       if (h || disp_hour)
                str += sprintf(str, "%02uh:", h);
-       }
 
        str += sprintf(str, "%02um:", m);
        str += sprintf(str, "%02us", s);

diff --git a/io_u.c b/io_u.c
index da6fe8f3af0a55f2f0a26680f257b78f6996d0de..ebfa0d45a324111a3cda91a087909cf57e063cbe 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -322,8 +322,12 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                return NULL;
        }
 
+       /*
+        * Set io data pointers.
+        */
        io_u->xfer_buf = io_u->buf;
        io_u->xfer_buflen = io_u->buflen;
+
        fio_gettime(&io_u->start_time, NULL);
        return io_u;
 }
@@ -381,5 +385,3 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
                put_io_u(td, io_u);
        }
 }
-
-