iolog: use a define instead of a raw bit mask
[fio.git] / iolog.c
diff --git a/iolog.c b/iolog.c
index e805eaef9a94595cb5327becf0eb931362179b8a..8bfd5bcf25ee5401ce7bbeaf29e1f1868cab3509 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -6,11 +6,19 @@
 #include <stdlib.h>
 #include <libgen.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#ifdef CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 #include "flist.h"
 #include "fio.h"
 #include "verify.h"
 #include "trim.h"
 #include "filelock.h"
+#include "lib/tp.h"
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
@@ -58,6 +66,7 @@ void log_file(struct thread_data *td, struct fio_file *f,
 static void iolog_delay(struct thread_data *td, unsigned long delay)
 {
        unsigned long usec = utime_since_now(&td->last_issue);
+       unsigned long this_delay;
 
        if (delay < usec)
                return;
@@ -70,7 +79,14 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
        if (delay < 100)
                return;
 
-       usec_sleep(td, delay);
+       while (delay && !td->terminate) {
+               this_delay = delay;
+               if (this_delay > 500000)
+                       this_delay = 500000;
+
+               usec_sleep(td, this_delay);
+               delay -= this_delay;
+       }
 }
 
 static int ipo_special(struct thread_data *td, struct io_piece *ipo)
@@ -260,6 +276,33 @@ restart:
        td->io_hist_len++;
 }
 
+void unlog_io_piece(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo = io_u->ipo;
+
+       if (!ipo)
+               return;
+
+       if (ipo->flags & IP_F_ONRB)
+               rb_erase(&ipo->rb_node, &td->io_hist_tree);
+       else if (ipo->flags & IP_F_ONLIST)
+               flist_del(&ipo->list);
+
+       free(ipo);
+       io_u->ipo = NULL;
+       td->io_hist_len--;
+}
+
+void trim_io_piece(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo = io_u->ipo;
+
+       if (!ipo)
+               return;
+
+       ipo->len = io_u->xfer_buflen - io_u->resid;
+}
+
 void write_iolog_close(struct thread_data *td)
 {
        fflush(td->iolog_f);
@@ -371,10 +414,11 @@ static int read_iolog2(struct thread_data *td, FILE *f)
                } else {
                        ipo->offset = offset;
                        ipo->len = bytes;
-                       if (bytes > td->o.max_bs[rw])
+                       if (rw != DDIR_INVAL && bytes > td->o.max_bs[rw])
                                td->o.max_bs[rw] = bytes;
                        ipo->fileno = fileno;
                        ipo->file_action = file_action;
+                       td->o.size += bytes;
                }
 
                queue_io_piece(td, ipo);
@@ -503,16 +547,35 @@ int init_iolog(struct thread_data *td)
        return ret;
 }
 
-void setup_log(struct io_log **log, unsigned long avg_msec, int log_type)
+void setup_log(struct io_log **log, struct log_params *p,
+              const char *filename)
 {
        struct io_log *l = malloc(sizeof(*l));
 
        memset(l, 0, sizeof(*l));
        l->nr_samples = 0;
        l->max_samples = 1024;
-       l->log_type = log_type;
-       l->log = malloc(l->max_samples * sizeof(struct io_sample));
-       l->avg_msec = avg_msec;
+       l->log_type = p->log_type;
+       l->log_offset = p->log_offset;
+       l->log_gz = p->log_gz;
+       l->log_gz_store = p->log_gz_store;
+       l->log = malloc(l->max_samples * log_entry_sz(l));
+       l->avg_msec = p->avg_msec;
+       l->filename = strdup(filename);
+       l->td = p->td;
+
+       if (l->log_offset)
+               l->log_ddir_mask = LOG_OFFSET_SAMPLE_BIT;
+
+       INIT_FLIST_HEAD(&l->chunk_list);
+
+       if (l->log_gz && !p->td)
+               l->log_gz = 0;
+       else if (l->log_gz) {
+               pthread_mutex_init(&l->chunk_lock, NULL);
+               p->td->flags |= TD_F_COMPRESS_LOG;
+       }
+
        *log = l;
 }
 
@@ -542,13 +605,261 @@ static void clear_file_buffer(void *buf)
 }
 #endif
 
-void __finish_log(struct io_log *log, const char *name)
+void free_log(struct io_log *log)
 {
-       unsigned int i;
+       free(log->log);
+       free(log->filename);
+       free(log);
+}
+
+static void flush_samples(FILE *f, void *samples, uint64_t sample_size)
+{
+       struct io_sample *s;
+       int log_offset;
+       uint64_t i, nr_samples;
+
+       if (!sample_size)
+               return;
+
+       s = __get_sample(samples, 0, 0);
+       log_offset = (s->__ddir & LOG_OFFSET_SAMPLE_BIT) != 0;
+
+       nr_samples = sample_size / __log_entry_sz(log_offset);
+
+       for (i = 0; i < nr_samples; i++) {
+               s = __get_sample(samples, log_offset, i);
+
+               if (!log_offset) {
+                       fprintf(f, "%lu, %lu, %u, %u\n",
+                                       (unsigned long) s->time,
+                                       (unsigned long) s->val,
+                                       io_sample_ddir(s), s->bs);
+               } else {
+                       struct io_sample_offset *so = (void *) s;
+
+                       fprintf(f, "%lu, %lu, %u, %u, %llu\n",
+                                       (unsigned long) s->time,
+                                       (unsigned long) s->val,
+                                       io_sample_ddir(s), s->bs,
+                                       (unsigned long long) so->offset);
+               }
+       }
+}
+
+#ifdef CONFIG_ZLIB
+
+struct iolog_flush_data {
+       struct tp_work work;
+       struct io_log *log;
+       void *samples;
+       uint64_t nr_samples;
+};
+
+struct iolog_compress {
+       struct flist_head list;
        void *buf;
+       size_t len;
+       unsigned int seq;
+};
+
+#define GZ_CHUNK       131072
+
+static struct iolog_compress *get_new_chunk(unsigned int seq)
+{
+       struct iolog_compress *c;
+
+       c = malloc(sizeof(*c));
+       INIT_FLIST_HEAD(&c->list);
+       c->buf = malloc(GZ_CHUNK);
+       c->len = 0;
+       c->seq = seq;
+       return c;
+}
+
+static void free_chunk(struct iolog_compress *ic)
+{
+       free(ic->buf);
+       free(ic);
+}
+
+static int z_stream_init(z_stream *stream, int gz_hdr)
+{
+       int wbits = 15;
+
+       stream->zalloc = Z_NULL;
+       stream->zfree = Z_NULL;
+       stream->opaque = Z_NULL;
+       stream->next_in = Z_NULL;
+
+       if (gz_hdr)
+               wbits += 32;
+
+       if (inflateInit2(stream, wbits) != Z_OK)
+               return 1;
+
+       return 0;
+}
+
+struct flush_chunk_iter {
+       unsigned int seq;
+       void *buf;
+       size_t buf_size;
+       size_t buf_used;
+       size_t chunk_sz;
+};
+
+static void finish_chunk(z_stream *stream, FILE *f,
+                        struct flush_chunk_iter *iter)
+{
+       int ret;
+
+       ret = inflateEnd(stream);
+       if (ret != Z_OK)
+               log_err("fio: failed to end log inflation (%d)\n", ret);
+
+       flush_samples(f, iter->buf, iter->buf_used);
+       free(iter->buf);
+       iter->buf = NULL;
+       iter->buf_size = iter->buf_used = 0;
+}
+
+static int flush_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
+                      z_stream *stream, struct flush_chunk_iter *iter)
+{
+       if (ic->seq != iter->seq) {
+               if (iter->seq)
+                       finish_chunk(stream, f, iter);
+
+               z_stream_init(stream, gz_hdr);
+               iter->seq = ic->seq;
+       }
+
+       stream->avail_in = ic->len;
+       stream->next_in = ic->buf;
+
+       if (!iter->buf_size) {
+               iter->buf_size = iter->chunk_sz;
+               iter->buf = malloc(iter->buf_size);
+       }
+
+       while (stream->avail_in) {
+               size_t this_out = iter->buf_size - iter->buf_used;
+               int err;
+
+               stream->avail_out = this_out;
+               stream->next_out = iter->buf + iter->buf_used;
+
+               err = inflate(stream, Z_NO_FLUSH);
+               if (err < 0) {
+                       log_err("fio: failed inflating log: %d\n", err);
+                       break;
+               }
+
+               iter->buf_used += this_out - stream->avail_out;
+
+               if (!stream->avail_out) {
+                       iter->buf_size += iter->chunk_sz;
+                       iter->buf = realloc(iter->buf, iter->buf_size);
+                       continue;
+               }
+
+               if (err == Z_STREAM_END)
+                       break;
+       }
+
+       return 0;
+}
+
+static void flush_gz_chunks(struct io_log *log, FILE *f)
+{
+       struct flush_chunk_iter iter = { .chunk_sz = log->log_gz, };
+       struct flist_head *node;
+       z_stream stream;
+
+       while (!flist_empty(&log->chunk_list)) {
+               struct iolog_compress *ic;
+
+               node = log->chunk_list.next;
+               ic = flist_entry(node, struct iolog_compress, list);
+               flist_del(&ic->list);
+
+               if (log->log_gz_store)
+                       fwrite(ic->buf, ic->len, 1, f);
+               else
+                       flush_chunk(ic, log->log_gz_store, f, &stream, &iter);
+
+               free_chunk(ic);
+       }
+
+       if (iter.seq) {
+               finish_chunk(&stream, f, &iter);
+               free(iter.buf);
+       }
+}
+
+int iolog_file_inflate(const char *file)
+{
+       struct flush_chunk_iter iter = { .chunk_sz = 64 * 1024 * 1024, };
+       struct iolog_compress ic;
+       z_stream stream;
+       struct stat sb;
+       ssize_t ret;
        FILE *f;
 
-       f = fopen(name, "a");
+       f = fopen(file, "r");
+       if (!f) {
+               perror("fopen");
+               return 1;
+       }
+
+       if (stat(file, &sb) < 0) {
+               fclose(f);
+               perror("stat");
+               return 1;
+       }
+
+       ic.buf = malloc(sb.st_size);
+       ic.len = sb.st_size;
+       ic.seq = 1;
+
+       ret = fread(ic.buf, ic.len, 1, f);
+       if (ret < 0) {
+               perror("fread");
+               fclose(f);
+               return 1;
+       } else if (ret != 1) {
+               log_err("fio: short read on reading log\n");
+               fclose(f);
+               return 1;
+       }
+
+       fclose(f);
+
+       flush_chunk(&ic,  1, stdout, &stream, &iter);
+
+       if (iter.seq) {
+               finish_chunk(&stream, stdout, &iter);
+               free(iter.buf);
+       }
+
+       free(ic.buf);
+       return 0;
+}
+
+#else
+
+static void flush_gz_chunks(struct io_log *log, FILE *f)
+{
+}
+
+#endif
+
+void flush_log(struct io_log *log)
+{
+       void *buf;
+       FILE *f;
+
+       f = fopen(log->filename, "w");
        if (!f) {
                perror("fopen log");
                return;
@@ -556,99 +867,220 @@ void __finish_log(struct io_log *log, const char *name)
 
        buf = set_file_buffer(f);
 
-       for (i = 0; i < log->nr_samples; i++) {
-               fprintf(f, "%lu, %lu, %u, %u\n",
-                               (unsigned long) log->log[i].time,
-                               (unsigned long) log->log[i].val,
-                               log->log[i].ddir, log->log[i].bs);
-       }
+       flush_gz_chunks(log, f);
+
+       flush_samples(f, log->log, log->nr_samples * log_entry_sz(log));
 
        fclose(f);
        clear_file_buffer(buf);
-       free(log->log);
-       free(log);
 }
 
-static int finish_log_named(struct thread_data *td, struct io_log *log,
-                           const char *prefix, const char *postfix,
-                           int trylock)
+static int finish_log(struct thread_data *td, struct io_log *log, int trylock)
 {
-       char file_name[256];
-
-       snprintf(file_name, sizeof(file_name), "%s_%s.log", prefix, postfix);
+       if (td->tp_data)
+               iolog_flush(log, 1);
 
        if (trylock) {
-               if (fio_trylock_file(file_name))
+               if (fio_trylock_file(log->filename))
                        return 1;
        } else
-               fio_lock_file(file_name);
+               fio_lock_file(log->filename);
 
-       if (td->client_type == FIO_CLIENT_TYPE_GUI) {
-               fio_send_iolog(td, log, file_name);
-               free(log->log);
-               free(log);
-       } else
-               __finish_log(log, file_name);
+       if (td->client_type == FIO_CLIENT_TYPE_GUI)
+               fio_send_iolog(td, log, log->filename);
+       else
+               flush_log(log);
 
-       fio_unlock_file(file_name);
+       fio_unlock_file(log->filename);
+       free_log(log);
        return 0;
 }
 
-static int finish_log(struct thread_data *td, struct io_log *log,
-                     const char *name, int trylock)
-{
-       return finish_log_named(td, log, td->o.name, name, trylock);
-}
+#ifdef CONFIG_ZLIB
 
-static int write_this_log(struct thread_data *td, struct io_log *log,
-                         const char *log_file, const char *name, int try)
+static int gz_work(struct tp_work *work)
 {
+       struct iolog_flush_data *data;
+       struct iolog_compress *c;
+       struct flist_head list;
+       unsigned int seq;
+       z_stream stream;
+       size_t total = 0;
        int ret;
 
-       if (!log)
+       INIT_FLIST_HEAD(&list);
+
+       data = container_of(work, struct iolog_flush_data, work);
+
+       stream.zalloc = Z_NULL;
+       stream.zfree = Z_NULL;
+       stream.opaque = Z_NULL;
+
+       ret = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
+       if (ret != Z_OK) {
+               log_err("fio: failed to init gz stream\n");
                return 0;
+       }
 
-       if (log_file)
-               ret = finish_log_named(td, log, log_file, name, try);
-       else
-               ret = finish_log(td, log, name, try);
+       seq = ++data->log->chunk_seq;
 
-       return ret;
+       stream.next_in = (void *) data->samples;
+       stream.avail_in = data->nr_samples * log_entry_sz(data->log);
+
+       do {
+               c = get_new_chunk(seq);
+               stream.avail_out = GZ_CHUNK;
+               stream.next_out = c->buf;
+               ret = deflate(&stream, Z_NO_FLUSH);
+               if (ret < 0) {
+                       log_err("fio: deflate log (%d)\n", ret);
+                       break;
+               }
+
+               c->len = GZ_CHUNK - stream.avail_out;
+               flist_add_tail(&c->list, &list);
+               total += c->len;
+       } while (stream.avail_in);
+
+       stream.next_out = c->buf + c->len;
+       stream.avail_out = GZ_CHUNK - c->len;
+
+       ret = deflate(&stream, Z_FINISH);
+       if (ret == Z_STREAM_END)
+               c->len = GZ_CHUNK - stream.avail_out;
+       else {
+               do {
+                       c = get_new_chunk(seq);
+                       stream.avail_out = GZ_CHUNK;
+                       stream.next_out = c->buf;
+                       ret = deflate(&stream, Z_FINISH);
+                       c->len = GZ_CHUNK - stream.avail_out;
+                       flist_add_tail(&c->list, &list);
+               } while (ret != Z_STREAM_END);
+       }
+
+       ret = deflateEnd(&stream);
+       if (ret != Z_OK)
+               log_err("fio: deflateEnd %d\n", ret);
+
+       free(data->samples);
+
+       if (!flist_empty(&list)) {
+               pthread_mutex_lock(&data->log->chunk_lock);
+               flist_splice_tail(&list, &data->log->chunk_list);
+               pthread_mutex_unlock(&data->log->chunk_lock);
+       }
+
+       if (work->wait) {
+               work->done = 1;
+               pthread_cond_signal(&work->cv);
+       } else
+               free(data);
+
+       return 0;
+}
+
+int iolog_flush(struct io_log *log, int wait)
+{
+       struct tp_data *tdat = log->td->tp_data;
+       struct iolog_flush_data *data;
+       size_t sample_size;
+
+       data = malloc(sizeof(*data));
+       if (!data)
+               return 1;
+
+       data->log = log;
+
+       sample_size = log->nr_samples * log_entry_sz(log);
+       data->samples = malloc(sample_size);
+       if (!data->samples) {
+               free(data);
+               return 1;
+       }
+
+       memcpy(data->samples, log->log, sample_size);
+       data->nr_samples = log->nr_samples;
+       data->work.fn = gz_work;
+       log->nr_samples = 0;
+
+       if (wait) {
+               pthread_mutex_init(&data->work.lock, NULL);
+               pthread_cond_init(&data->work.cv, NULL);
+               data->work.wait = 1;
+       } else
+               data->work.wait = 0;
+
+       tp_queue_work(tdat, &data->work);
+
+       if (wait) {
+               pthread_mutex_lock(&data->work.lock);
+               while (!data->work.done)
+                       pthread_cond_wait(&data->work.cv, &data->work.lock);
+               pthread_mutex_unlock(&data->work.lock);
+               free(data);
+       }
+
+       return 0;
 }
 
+#else
+
+int iolog_flush(struct io_log *log, int wait)
+{
+       return 1;
+}
+
+#endif
+
 static int write_iops_log(struct thread_data *td, int try)
 {
-       struct thread_options *o = &td->o;
+       struct io_log *log = td->iops_log;
+
+       if (!log)
+               return 0;
 
-       return write_this_log(td, td->iops_log, o->iops_log_file, "iops", try);
+       return finish_log(td, log, try);
 }
 
 static int write_slat_log(struct thread_data *td, int try)
 {
-       struct thread_options *o = &td->o;
+       struct io_log *log = td->slat_log;
+
+       if (!log)
+               return 0;
 
-       return write_this_log(td, td->slat_log, o->lat_log_file, "slat", try);
+       return finish_log(td, log, try);
 }
 
 static int write_clat_log(struct thread_data *td, int try)
 {
-       struct thread_options *o = &td->o;
+       struct io_log *log = td->clat_log;
+
+       if (!log)
+               return 0;
 
-       return write_this_log(td, td->clat_log, o->lat_log_file, "clat" , try);
+       return finish_log(td, log, try);
 }
 
 static int write_lat_log(struct thread_data *td, int try)
 {
-       struct thread_options *o = &td->o;
+       struct io_log *log = td->lat_log;
 
-       return write_this_log(td, td->lat_log, o->lat_log_file, "lat", try);
+       if (!log)
+               return 0;
+
+       return finish_log(td, log, try);
 }
 
 static int write_bandw_log(struct thread_data *td, int try)
 {
-       struct thread_options *o = &td->o;
+       struct io_log *log = td->bw_log;
+
+       if (!log)
+               return 0;
 
-       return write_this_log(td, td->bw_log, o->bw_log_file, "bw", try);
+       return finish_log(td, log, try);
 }
 
 enum {