iolog: fix potential duplicate definition of compress init/exit

[fio.git] / iolog.c

diff --git a/iolog.c b/iolog.c
index b29684a85eb69c30d219b95eff122c33df9ce5f6..961c9171f72f21654f17cc84f7ef07c8683b7991 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -18,7 +18,6 @@
 #include "verify.h"
 #include "trim.h"
 #include "filelock.h"
-#include "lib/tp.h"
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
@@ -594,7 +593,7 @@ void setup_log(struct io_log **log, struct log_params *p,
 
        if (l->log_gz && !p->td)
                l->log_gz = 0;
-       else if (l->log_gz) {
+       else if (l->log_gz || l->log_gz_store) {
                pthread_mutex_init(&l->chunk_lock, NULL);
                p->td->flags |= TD_F_COMPRESS_LOG;
        }
@@ -672,7 +671,12 @@ static void flush_samples(FILE *f, void *samples, uint64_t sample_size)
 #ifdef CONFIG_ZLIB
 
 struct iolog_flush_data {
-       struct tp_work work;
+       struct workqueue_work work;
+       pthread_mutex_t lock;
+       pthread_cond_t cv;
+       int wait;
+       volatile int done;
+       volatile int refs;
        struct io_log *log;
        void *samples;
        uint64_t nr_samples;
@@ -945,12 +949,15 @@ int iolog_file_inflate(const char *file)
 
 #endif
 
-void flush_log(struct io_log *log)
+void flush_log(struct io_log *log, int do_append)
 {
        void *buf;
        FILE *f;
 
-       f = fopen(log->filename, "w");
+       if (!do_append)
+               f = fopen(log->filename, "w");
+       else
+               f = fopen(log->filename, "a");
        if (!f) {
                perror("fopen log");
                return;
@@ -968,7 +975,7 @@ void flush_log(struct io_log *log)
 
 static int finish_log(struct thread_data *td, struct io_log *log, int trylock)
 {
-       if (td->tp_data)
+       if (td->flags & TD_F_COMPRESS_LOG)
                iolog_flush(log, 1);
 
        if (trylock) {
@@ -980,7 +987,7 @@ static int finish_log(struct thread_data *td, struct io_log *log, int trylock)
        if (td->client_type == FIO_CLIENT_TYPE_GUI)
                fio_send_iolog(td, log, log->filename);
        else
-               flush_log(log);
+               flush_log(log, !td->o.per_job_logs);
 
        fio_unlock_file(log->filename);
        free_log(log);
@@ -989,12 +996,21 @@ static int finish_log(struct thread_data *td, struct io_log *log, int trylock)
 
 #ifdef CONFIG_ZLIB
 
+static void drop_data(struct iolog_flush_data *data, int refs)
+{
+       if (!refs) {
+               free(data);
+               pthread_mutex_destroy(&data->lock);
+               pthread_cond_destroy(&data->cv);
+       }
+}
+
 /*
  * Invoked from our compress helper thread, when logging would have exceeded
  * the specified memory limitation. Compresses the previously stored
  * entries.
  */
-static int gz_work(struct tp_work *work)
+static int gz_work(struct submit_worker *sw, struct workqueue_work *work)
 {
        struct iolog_flush_data *data;
        struct iolog_compress *c;
@@ -1075,12 +1091,17 @@ static int gz_work(struct tp_work *work)
 
        ret = 0;
 done:
-       if (work->wait) {
-               work->done = 1;
-               pthread_cond_signal(&work->cv);
+       if (data->wait) {
+               int refs;
+
+               pthread_mutex_lock(&data->lock);
+               data->done = 1;
+               pthread_cond_signal(&data->cv);
+               refs = --data->refs;
+               pthread_mutex_unlock(&data->lock);
+               drop_data(data, refs);
        } else
                free(data);
-
        return ret;
 err:
        while (!flist_empty(&list)) {
@@ -1092,6 +1113,28 @@ err:
        goto done;
 }
 
+static struct workqueue_ops log_compress_wq_ops = {
+       .fn     = gz_work,
+       .nice   = 1,
+};
+
+int iolog_compress_init(struct thread_data *td)
+{
+       if (!(td->flags & TD_F_COMPRESS_LOG))
+               return 0;
+
+       workqueue_init(td, &td->log_compress_wq, &log_compress_wq_ops, 1);
+       return 0;
+}
+
+void iolog_compress_exit(struct thread_data *td)
+{
+       if (!(td->flags & TD_F_COMPRESS_LOG))
+               return;
+
+       workqueue_exit(&td->log_compress_wq);
+}
+
 /*
  * Queue work item to compress the existing log entries. We copy the
  * samples, and reset the log sample count to 0 (so the logging will
@@ -1100,7 +1143,6 @@ err:
  */
 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;
 
@@ -1119,25 +1161,27 @@ int iolog_flush(struct io_log *log, int wait)
 
        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;
+       data->wait = wait;
+       if (data->wait) {
+               pthread_mutex_init(&data->lock, NULL);
+               pthread_cond_init(&data->cv, NULL);
+               data->done = 0;
+               data->refs = 2;
+       }
 
-       data->work.prio = 1;
-       tp_queue_work(tdat, &data->work);
+       workqueue_enqueue(&log->td->log_compress_wq, &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);
+               int refs;
+
+               pthread_mutex_lock(&data->lock);
+               while (!data->done)
+                       pthread_cond_wait(&data->cv, &data->lock);
+               refs = --data->refs;
+               pthread_mutex_unlock(&data->lock);
+               drop_data(data, refs);
        }
 
        return 0;
@@ -1150,6 +1194,15 @@ int iolog_flush(struct io_log *log, int wait)
        return 1;
 }
 
+int iolog_compress_init(struct thread_data *td)
+{
+       return 0;
+}
+
+void iolog_compress_exit(struct thread_data *td)
+{
+}
+
 #endif
 
 static int write_iops_log(struct thread_data *td, int try)