ioengines: fixup td_io_unlink_file() error propagation

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 965ff9fc129dcdf791a3d67f6f3a1e516fdafa79..ef9fe7d43cade18c4047fc58cdf24efe6bc7a103 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -2140,7 +2140,9 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog,
         * need to do.
         */
        this_window = elapsed - iolog->avg_last;
-       if (this_window < iolog->avg_msec) {
+       if (elapsed < iolog->avg_last)
+               return iolog->avg_last - elapsed;
+       else if (this_window < iolog->avg_msec) {
                int diff = iolog->avg_msec - this_window;
 
                if (inline_log(iolog) || diff > LOG_MSEC_SLACK)
@@ -2209,28 +2211,36 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
                add_clat_percentile_sample(ts, usec, ddir);
 
        if (iolog && iolog->hist_msec) {
-               struct io_hist *hw = &(iolog->hist_window[ddir]);
-               (hw->samples)++;
+               struct io_hist *hw = &iolog->hist_window[ddir];
+
+               hw->samples++;
                elapsed = mtime_since_now(&td->epoch);
-               if (! hw->hist_last)
+               if (!hw->hist_last)
                        hw->hist_last = elapsed;
                this_window = elapsed - hw->hist_last;
                
                if (this_window >= iolog->hist_msec) {
+                       unsigned int *io_u_plat;
+                       unsigned int *dst;
+
                        /*
-                        * Make a byte-for-byte copy of the latency histogram stored in
-                        * td->ts.io_u_plat[ddir], recording it in a log sample. Note that
-                        * the matching call to free() is located in iolog.c after printing
-                        * this sample to the log file.
+                        * Make a byte-for-byte copy of the latency histogram
+                        * stored in td->ts.io_u_plat[ddir], recording it in a
+                        * log sample. Note that the matching call to free() is
+                        * located in iolog.c after printing this sample to the
+                        * log file.
                         */
-                       unsigned int *io_u_plat = (unsigned int *)(td->ts.io_u_plat[ddir]);
-                       unsigned int *dst = malloc(FIO_IO_U_PLAT_NR * sizeof(unsigned int));
-                       memcpy(dst, io_u_plat, FIO_IO_U_PLAT_NR * sizeof(unsigned int));
-                       __add_log_sample(iolog, (uint64_t)dst, ddir, bs, elapsed, offset);
+                       io_u_plat = (unsigned int *) td->ts.io_u_plat[ddir];
+                       dst = malloc(FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+                       memcpy(dst, io_u_plat,
+                               FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+                       __add_log_sample(iolog, (unsigned long )dst, ddir, bs,
+                                               elapsed, offset);
 
                        /*
-                        * Update the last time we recorded as being now, minus any drift
-                        * in time we encountered before actually making the record.
+                        * Update the last time we recorded as being now, minus
+                        * any drift in time we encountered before actually
+                        * making the record.
                         */
                        hw->hist_last = elapsed - (this_window - iolog->hist_msec);
                        hw->samples = 0;