Add missing splice syscall numbers for alpha and s390

[fio.git] / log.c

diff --git a/log.c b/log.c
index 15de3c24d10bf64698325479af7e5b45f80c81aa..5c468ad9f96c0a708fde126482f01a3bb6a430c3 100644 (file)
--- a/log.c
+++ b/log.c
@@ -4,15 +4,16 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <libgen.h>
 #include <assert.h>
-#include "list.h"
+#include "flist.h"
 #include "fio.h"
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
 void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
 {
-       list_add_tail(&ipo->list, &td->io_log_list);
+       flist_add_tail(&ipo->list, &td->io_log_list);
        td->total_io_size += ipo->len;
 }
 
@@ -40,6 +41,13 @@ void log_file(struct thread_data *td, struct fio_file *f,
        if (!td->o.write_iolog_file)
                return;
 
+
+       /*
+        * this happens on the pre-open/close done before the job starts
+        */
+       if (!td->iolog_f)
+               return;
+
        fprintf(td->iolog_f, "%s %s\n", f->file_name, act[what]);
 }
 
@@ -101,11 +109,11 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
        struct io_piece *ipo;
 
-       while (!list_empty(&td->io_log_list)) {
+       while (!flist_empty(&td->io_log_list)) {
                int ret;
 
-               ipo = list_entry(td->io_log_list.next, struct io_piece, list);
-               list_del(&ipo->list);
+               ipo = flist_entry(td->io_log_list.next, struct io_piece, list);
+               flist_del(&ipo->list);
 
                ret = ipo_special(td, ipo);
                if (ret < 0) {
@@ -147,9 +155,9 @@ void prune_io_piece_log(struct thread_data *td)
                free(ipo);
        }
 
-       while (!list_empty(&td->io_hist_list)) {
-               ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
-               list_del(&ipo->list);
+       while (!flist_empty(&td->io_hist_list)) {
+               ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
+               flist_del(&ipo->list);
                free(ipo);
        }
 }
@@ -177,8 +185,8 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
         * wrote it out is the fastest.
         */
        if (!td_random(td) || !td->o.overwrite) {
-               INIT_LIST_HEAD(&ipo->list);
-               list_add_tail(&ipo->list, &td->io_hist_list);
+               INIT_FLIST_HEAD(&ipo->list);
+               flist_add_tail(&ipo->list, &td->io_hist_list);
                return;
        }
 
@@ -299,7 +307,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                 */
                ipo = malloc(sizeof(*ipo));
                memset(ipo, 0, sizeof(*ipo));
-               INIT_LIST_HEAD(&ipo->list);
+               INIT_FLIST_HEAD(&ipo->list);
                ipo->offset = offset;
                ipo->len = bytes;
                ipo->ddir = rw;
@@ -465,8 +473,9 @@ void __finish_log(struct io_log *log, const char *name)
 
 void finish_log(struct thread_data *td, struct io_log *log, const char *name)
 {
-       char file_name[256];
+       char file_name[256], *p;
 
        snprintf(file_name, 200, "%s_%s.log", td->o.name, name);
-       __finish_log(log, file_name);
+       p = basename(file_name);
+       __finish_log(log, p);
 }