Merge branch 'stephen/rate-ull' of https://github.com/sbates130272/fio

[fio.git] / iolog.c

diff --git a/iolog.c b/iolog.c
index 26c3458638adf94f41d407c5444187e64f299647..4a79fc4667fc13eff4c62b9206a0dfefe0a5dfd4 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -342,6 +342,9 @@ void trim_io_piece(const struct io_u *io_u)
 
 void write_iolog_close(struct thread_data *td)
 {
+       if (!td->iolog_f)
+               return;
+
        fflush(td->iolog_f);
        fclose(td->iolog_f);
        free(td->iolog_buf);
@@ -566,7 +569,9 @@ static bool read_iolog2(struct thread_data *td)
 static bool is_socket(const char *path)
 {
        struct stat buf;
-       int r = stat(path, &buf);
+       int r;
+
+       r = stat(path, &buf);
        if (r == -1)
                return false;
 
@@ -575,19 +580,25 @@ static bool is_socket(const char *path)
 
 static int open_socket(const char *path)
 {
-       int fd = socket(AF_UNIX, SOCK_STREAM, 0);
        struct sockaddr_un addr;
+       int ret, fd;
+
+       fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd < 0)
                return fd;
+
        addr.sun_family = AF_UNIX;
        if (snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path) >=
-           sizeof(addr.sun_path))
+           sizeof(addr.sun_path)) {
                log_err("%s: path name %s is too long for a Unix socket\n",
                        __func__, path);
-       if (connect(fd, (const struct sockaddr *)&addr, strlen(path) + sizeof(addr.sun_family)) == 0)
+       }
+
+       ret = connect(fd, (const struct sockaddr *)&addr, strlen(path) + sizeof(addr.sun_family));
+       if (!ret)
                return fd;
-       else
-               close(fd);
+
+       close(fd);
        return -1;
 }
 
@@ -596,20 +607,23 @@ static int open_socket(const char *path)
  */
 static bool init_iolog_read(struct thread_data *td)
 {
-       char buffer[256], *p;
+       char buffer[256], *p, *fname;
        FILE *f = NULL;
-       bool ret;
-       char* fname = get_name_by_idx(td->o.read_iolog_file, td->subjob_number);
+
+       fname = get_name_by_idx(td->o.read_iolog_file, td->subjob_number);
        dprint(FD_IO, "iolog: name=%s\n", fname);
 
        if (is_socket(fname)) {
-               int fd = open_socket(fname);
-               if (fd >= 0) {
+               int fd;
+
+               fd = open_socket(fname);
+               if (fd >= 0)
                        f = fdopen(fd, "r");
-               }
        } else
                f = fopen(fname, "r");
+
        free(fname);
+
        if (!f) {
                perror("fopen read iolog");
                return false;
@@ -622,21 +636,20 @@ static bool init_iolog_read(struct thread_data *td)
                fclose(f);
                return false;
        }
-       td->io_log_rfile = f;
+
        /*
         * version 2 of the iolog stores a specific string as the
         * first line, check for that
         */
        if (!strncmp(iolog_ver2, buffer, strlen(iolog_ver2))) {
                free_release_files(td);
-               ret = read_iolog2(td);
-       }
-       else {
-               log_err("fio: iolog version 1 is no longer supported\n");
-               ret = false;
+               td->io_log_rfile = f;
+               return read_iolog2(td);
        }
 
-       return ret;
+       log_err("fio: iolog version 1 is no longer supported\n");
+       fclose(f);
+       return false;
 }
 
 /*
@@ -886,18 +899,18 @@ void flush_samples(FILE *f, void *samples, uint64_t sample_size)
                s = __get_sample(samples, log_offset, i);
 
                if (!log_offset) {
-                       fprintf(f, "%lu, %" PRId64 ", %u, %llu\n",
+                       fprintf(f, "%lu, %" PRId64 ", %u, %llu, %u\n",
                                        (unsigned long) s->time,
                                        s->data.val,
-                                       io_sample_ddir(s), (unsigned long long) s->bs);
+                                       io_sample_ddir(s), (unsigned long long) s->bs, s->priority_bit);
                } else {
                        struct io_sample_offset *so = (void *) s;
 
-                       fprintf(f, "%lu, %" PRId64 ", %u, %llu, %llu\n",
+                       fprintf(f, "%lu, %" PRId64 ", %u, %llu, %llu, %u\n",
                                        (unsigned long) s->time,
                                        s->data.val,
                                        io_sample_ddir(s), (unsigned long long) s->bs,
-                                       (unsigned long long) so->offset);
+                                       (unsigned long long) so->offset, s->priority_bit);
                }
        }
 }