Use calloc() instead of malloc + memset

[fio.git] / iolog.c

diff --git a/iolog.c b/iolog.c
index 5eca53bf830d3f871889986e2643a55466ff33b3..cfcab2712d1026e20a71c27dcc2428a1a76923f2 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -30,17 +30,12 @@ void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
 
 void log_io_u(struct thread_data *td, struct io_u *io_u)
 {
-       const char *act[] = { "read", "write", "sync", "datasync",
-                               "sync_file_range", "wait", "trim" };
-
-       assert(io_u->ddir <= 6);
-
        if (!td->o.write_iolog_file)
                return;
 
        fprintf(td->iolog_f, "%s %s %llu %lu\n", io_u->file->file_name,
-                                               act[io_u->ddir], io_u->offset,
-                                               io_u->buflen);
+                                               io_ddir_name(io_u->ddir),
+                                               io_u->offset, io_u->buflen);
 }
 
 void log_file(struct thread_data *td, struct fio_file *f,
@@ -73,12 +68,6 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
 
        delay -= usec;
 
-       /*
-        * less than 100 usec delay, just regard it as noise
-        */
-       if (delay < 100)
-               return;
-
        while (delay && !td->terminate) {
                this_delay = delay;
                if (this_delay > 500000)
@@ -113,7 +102,7 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo)
                td_io_close_file(td, f);
                break;
        case FIO_LOG_UNLINK_FILE:
-               unlink(f->file_name);
+               td_io_unlink_file(td, f);
                break;
        default:
                log_err("fio: bad file action %d\n", ipo->file_action);
@@ -550,9 +539,9 @@ int init_iolog(struct thread_data *td)
 void setup_log(struct io_log **log, struct log_params *p,
               const char *filename)
 {
-       struct io_log *l = malloc(sizeof(*l));
+       struct io_log *l;
 
-       memset(l, 0, sizeof(*l));
+       l = calloc(1, sizeof(*l));
        l->nr_samples = 0;
        l->max_samples = 1024;
        l->log_type = p->log_type;
@@ -706,6 +695,7 @@ static int z_stream_init(z_stream *stream, int gz_hdr)
 
 struct inflate_chunk_iter {
        unsigned int seq;
+       int err;
        void *buf;
        size_t buf_size;
        size_t buf_used;
@@ -734,6 +724,11 @@ static void finish_chunk(z_stream *stream, FILE *f,
 static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
                            z_stream *stream, struct inflate_chunk_iter *iter)
 {
+       size_t ret;
+
+       dprint(FD_COMPRESS, "inflate chunk size=%lu, seq=%u",
+                               (unsigned long) ic->len, ic->seq);
+
        if (ic->seq != iter->seq) {
                if (iter->seq)
                        finish_chunk(stream, f, iter);
@@ -760,6 +755,7 @@ static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
                err = inflate(stream, Z_NO_FLUSH);
                if (err < 0) {
                        log_err("fio: failed inflating log: %d\n", err);
+                       iter->err = err;
                        break;
                }
 
@@ -775,14 +771,18 @@ static size_t inflate_chunk(struct iolog_compress *ic, int gz_hdr, FILE *f,
                        break;
        }
 
-       return (void *) stream->next_in - ic->buf;
+       ret = (void *) stream->next_in - ic->buf;
+
+       dprint(FD_COMPRESS, "inflated to size=%lu\n", (unsigned long) ret);
+
+       return ret;
 }
 
 /*
  * Inflate stored compressed chunks, or write them directly to the log
  * file if so instructed.
  */
-static void inflate_gz_chunks(struct io_log *log, FILE *f)
+static int inflate_gz_chunks(struct io_log *log, FILE *f)
 {
        struct inflate_chunk_iter iter = { .chunk_sz = log->log_gz, };
        z_stream stream;
@@ -796,9 +796,14 @@ static void inflate_gz_chunks(struct io_log *log, FILE *f)
                if (log->log_gz_store) {
                        size_t ret;
 
+                       dprint(FD_COMPRESS, "log write chunk size=%lu, "
+                               "seq=%u\n", (unsigned long) ic->len, ic->seq);
+
                        ret = fwrite(ic->buf, ic->len, 1, f);
-                       if (ret != 1 || ferror(f))
+                       if (ret != 1 || ferror(f)) {
+                               iter.err = errno;
                                log_err("fio: error writing compressed log\n");
+                       }
                } else
                        inflate_chunk(ic, log->log_gz_store, f, &stream, &iter);
 
@@ -809,6 +814,8 @@ static void inflate_gz_chunks(struct io_log *log, FILE *f)
                finish_chunk(&stream, f, &iter);
                free(iter.buf);
        }
+
+       return iter.err;
 }
 
 /*
@@ -870,6 +877,8 @@ int iolog_file_inflate(const char *file)
                total -= ret;
                if (!total)
                        break;
+               if (iter.err)
+                       break;
 
                ic.seq++;
                ic.len -= ret;
@@ -882,13 +891,20 @@ int iolog_file_inflate(const char *file)
        }
 
        free(buf);
-       return 0;
+       return iter.err;
 }
 
 #else
 
-static void inflate_gz_chunks(struct io_log *log, FILE *f)
+static int inflate_gz_chunks(struct io_log *log, FILE *f)
 {
+       return 0;
+}
+
+int iolog_file_inflate(const char *file)
+{
+       log_err("fio: log inflation not possible without zlib\n");
+       return 1;
 }
 
 #endif
@@ -971,6 +987,8 @@ static int gz_work(struct tp_work *work)
        stream.next_in = (void *) data->samples;
        stream.avail_in = data->nr_samples * log_entry_sz(data->log);
 
+       dprint(FD_COMPRESS, "deflate input size=%lu, seq=%u\n",
+                               (unsigned long) stream.avail_in, seq);
        do {
                c = get_new_chunk(seq);
                stream.avail_out = GZ_CHUNK;
@@ -978,7 +996,8 @@ static int gz_work(struct tp_work *work)
                ret = deflate(&stream, Z_NO_FLUSH);
                if (ret < 0) {
                        log_err("fio: deflate log (%d)\n", ret);
-                       break;
+                       free_chunk(c);
+                       goto err;
                }
 
                c->len = GZ_CHUNK - stream.avail_out;
@@ -999,10 +1018,13 @@ static int gz_work(struct tp_work *work)
                        stream.next_out = c->buf;
                        ret = deflate(&stream, Z_FINISH);
                        c->len = GZ_CHUNK - stream.avail_out;
+                       total += c->len;
                        flist_add_tail(&c->list, &list);
                } while (ret != Z_STREAM_END);
        }
 
+       dprint(FD_COMPRESS, "deflated to size=%lu\n", (unsigned long) total);
+
        ret = deflateEnd(&stream);
        if (ret != Z_OK)
                log_err("fio: deflateEnd %d\n", ret);
@@ -1015,13 +1037,23 @@ static int gz_work(struct tp_work *work)
                pthread_mutex_unlock(&data->log->chunk_lock);
        }
 
+       ret = 0;
+done:
        if (work->wait) {
                work->done = 1;
                pthread_cond_signal(&work->cv);
        } else
                free(data);
 
-       return 0;
+       return ret;
+err:
+       while (!flist_empty(&list)) {
+               c = flist_first_entry(list.next, struct iolog_compress, list);
+               flist_del(&c->list);
+               free_chunk(c);
+       }
+       ret = 1;
+       goto done;
 }
 
 /*
@@ -1061,6 +1093,7 @@ int iolog_flush(struct io_log *log, int wait)
        } else
                data->work.wait = 0;
 
+       data->work.prio = 1;
        tp_queue_work(tdat, &data->work);
 
        if (wait) {