X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=c4aa21f79e0e840a940c58766e152de8bb6e5fca;hp=99f8bc18d8694cca0c141c51d116aced1b4130f2;hb=ff84ff9a0d96c5b7ca6dcb01995f82bc040e9865;hpb=df8fb6097058098f1c2f7c2cf4019640561768df diff --git a/iolog.c b/iolog.c index 99f8bc18..c4aa21f7 100644 --- 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"; @@ -250,6 +249,7 @@ restart: p = &td->io_hist_tree.rb_node; parent = NULL; while (*p) { + int overlap = 0; parent = *p; __ipo = rb_entry(parent, struct io_piece, rb_node); @@ -257,11 +257,18 @@ restart: p = &(*p)->rb_left; else if (ipo->file > __ipo->file) p = &(*p)->rb_right; - else if (ipo->offset < __ipo->offset) + else if (ipo->offset < __ipo->offset) { p = &(*p)->rb_left; - else if (ipo->offset > __ipo->offset) + overlap = ipo->offset + ipo->len > __ipo->offset; + } + else if (ipo->offset > __ipo->offset) { p = &(*p)->rb_right; - else { + overlap = __ipo->offset + __ipo->len > ipo->offset; + } + else + overlap = 1; + + if (overlap) { dprint(FD_IO, "iolog: overlap %llu/%lu, %llu/%lu", __ipo->offset, __ipo->len, ipo->offset, ipo->len); @@ -283,6 +290,18 @@ void unlog_io_piece(struct thread_data *td, struct io_u *io_u) { struct io_piece *ipo = io_u->ipo; + if (td->ts.nr_block_infos) { + uint32_t *info = io_u_block_info(td, io_u); + if (BLOCK_INFO_STATE(*info) < BLOCK_STATE_TRIM_FAILURE) { + if (io_u->ddir == DDIR_TRIM) + *info = BLOCK_INFO_SET_STATE(*info, + BLOCK_STATE_TRIM_FAILURE); + else if (io_u->ddir == DDIR_WRITE) + *info = BLOCK_INFO_SET_STATE(*info, + BLOCK_STATE_WRITE_FAILURE); + } + } + if (!ipo) return; @@ -574,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; } @@ -652,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; @@ -868,10 +892,12 @@ int iolog_file_inflate(const char *file) if (ret < 0) { perror("fread"); fclose(f); + free(buf); return 1; } else if (ret != 1) { log_err("fio: short read on reading log\n"); fclose(f); + free(buf); return 1; } @@ -923,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; @@ -946,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) { @@ -958,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); @@ -972,7 +1001,7 @@ static int finish_log(struct thread_data *td, struct io_log *log, int trylock) * 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; @@ -1053,12 +1082,18 @@ 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); + if (!refs) + free(data); } else free(data); - return ret; err: while (!flist_empty(&list)) { @@ -1070,6 +1105,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 @@ -1078,7 +1135,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; @@ -1097,25 +1153,29 @@ 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; + pthread_mutex_init(&data->lock, NULL); + pthread_cond_init(&data->cv, NULL); + data->done = 0; + data->wait = 1; + data->refs = 2; } else - data->work.wait = 0; + data->wait = 0; - 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); + if (!refs) + free(data); } return 0;