X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=71afe86c29a1e50847128591be9bb10adbcea70b;hp=7fd125fb8436803f6f2c7f9fff99631682c1ce5a;hb=a47591e4923fb8faef18e1cd5125a50429282089;hpb=4e2d9699d87459cc0aeff80cb135af2db5f3bd84 diff --git a/iolog.c b/iolog.c index 7fd125fb..71afe86c 100644 --- a/iolog.c +++ b/iolog.c @@ -18,6 +18,7 @@ #include "verify.h" #include "trim.h" #include "filelock.h" +#include "smalloc.h" static const char iolog_ver2[] = "fio version 2 iolog"; @@ -574,14 +575,12 @@ void setup_log(struct io_log **log, struct log_params *p, { struct io_log *l; - l = calloc(1, sizeof(*l)); + l = smalloc(sizeof(*l)); l->nr_samples = 0; - l->max_samples = 1024; 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; @@ -631,7 +630,7 @@ void free_log(struct io_log *log) { free(log->log); free(log->filename); - free(log); + sfree(log); } void flush_samples(FILE *f, void *samples, uint64_t sample_size) @@ -672,11 +671,6 @@ void flush_samples(FILE *f, void *samples, uint64_t sample_size) struct iolog_flush_data { 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; @@ -1009,28 +1003,8 @@ size_t log_chunk_sizes(struct io_log *log) #ifdef CONFIG_ZLIB -static void drop_data_unlock(struct iolog_flush_data *data) +static int gz_work(struct iolog_flush_data *data) { - int refs; - - refs = --data->refs; - pthread_mutex_unlock(&data->lock); - - if (!refs) { - pthread_mutex_destroy(&data->lock); - pthread_cond_destroy(&data->cv); - free(data); - } -} - -/* - * 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 submit_worker *sw, struct workqueue_work *work) -{ - struct iolog_flush_data *data; struct iolog_compress *c; struct flist_head list; unsigned int seq; @@ -1040,8 +1014,6 @@ static int gz_work(struct submit_worker *sw, struct workqueue_work *work) 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; @@ -1049,7 +1021,7 @@ static int gz_work(struct submit_worker *sw, struct workqueue_work *work) ret = deflateInit(&stream, Z_DEFAULT_COMPRESSION); if (ret != Z_OK) { log_err("fio: failed to init gz stream\n"); - return 0; + goto err; } seq = ++data->log->chunk_seq; @@ -1109,14 +1081,7 @@ static int gz_work(struct submit_worker *sw, struct workqueue_work *work) ret = 0; done: - if (data->wait) { - pthread_mutex_lock(&data->lock); - data->done = 1; - pthread_cond_signal(&data->cv); - - drop_data_unlock(data); - } else - free(data); + free(data); return ret; err: while (!flist_empty(&list)) { @@ -1128,6 +1093,16 @@ err: goto done; } +/* + * Invoked from our compress helper thread, when logging would have exceeded + * the specified memory limitation. Compresses the previously stored + * entries. + */ +static int gz_work_async(struct submit_worker *sw, struct workqueue_work *work) +{ + return gz_work(container_of(work, struct iolog_flush_data, work)); +} + static int gz_init_worker(struct submit_worker *sw) { struct thread_data *td = sw->wq->td; @@ -1144,7 +1119,7 @@ static int gz_init_worker(struct submit_worker *sw) } static struct workqueue_ops log_compress_wq_ops = { - .fn = gz_work, + .fn = gz_work_async, .init_worker_fn = gz_init_worker, .nice = 1, }; @@ -1189,26 +1164,13 @@ int iolog_flush(struct io_log *log, int wait) data->nr_samples = log->nr_samples; log->nr_samples = 0; - log->max_samples = 128; + log->max_samples = DEF_LOG_ENTRIES; log->log = malloc(log->max_samples * log_entry_sz(log)); - data->wait = wait; - if (data->wait) { - pthread_mutex_init(&data->lock, NULL); - pthread_cond_init(&data->cv, NULL); - data->done = 0; - data->refs = 2; - } - - workqueue_enqueue(&log->td->log_compress_wq, &data->work); - - if (wait) { - pthread_mutex_lock(&data->lock); - while (!data->done) - pthread_cond_wait(&data->cv, &data->lock); - - drop_data_unlock(data); - } + if (!wait) + workqueue_enqueue(&log->td->log_compress_wq, &data->work); + else + gz_work(data); return 0; } @@ -1239,29 +1201,74 @@ static int __write_log(struct thread_data *td, struct io_log *log, int try) return 0; } -static int write_iops_log(struct thread_data *td, int try) +static int write_iops_log(struct thread_data *td, int try, bool unit_log) { - return __write_log(td, td->iops_log, try); + int ret; + + if (per_unit_log(td->iops_log) != unit_log) + return 0; + + ret = __write_log(td, td->iops_log, try); + if (!ret) + td->iops_log = NULL; + + return ret; } -static int write_slat_log(struct thread_data *td, int try) +static int write_slat_log(struct thread_data *td, int try, bool unit_log) { - return __write_log(td, td->slat_log, try); + int ret; + + if (!unit_log) + return 0; + + ret = __write_log(td, td->slat_log, try); + if (!ret) + td->slat_log = NULL; + + return ret; } -static int write_clat_log(struct thread_data *td, int try) +static int write_clat_log(struct thread_data *td, int try, bool unit_log) { - return __write_log(td, td->clat_log, try); + int ret; + + if (!unit_log) + return 0; + + ret = __write_log(td, td->clat_log, try); + if (!ret) + td->clat_log = NULL; + + return ret; } -static int write_lat_log(struct thread_data *td, int try) +static int write_lat_log(struct thread_data *td, int try, bool unit_log) { - return __write_log(td, td->lat_log, try); + int ret; + + if (!unit_log) + return 0; + + ret = __write_log(td, td->lat_log, try); + if (!ret) + td->lat_log = NULL; + + return ret; } -static int write_bandw_log(struct thread_data *td, int try) +static int write_bandw_log(struct thread_data *td, int try, bool unit_log) { - return __write_log(td, td->bw_log, try); + int ret; + + if (per_unit_log(td->bw_log) != unit_log) + return 0; + + ret = __write_log(td, td->bw_log, try); + if (!ret) + td->bw_log = NULL; + + return ret; } enum { @@ -1276,7 +1283,7 @@ enum { struct log_type { unsigned int mask; - int (*fn)(struct thread_data *, int); + int (*fn)(struct thread_data *, int, bool); }; static struct log_type log_types[] = { @@ -1302,7 +1309,7 @@ static struct log_type log_types[] = { }, }; -void fio_writeout_logs(struct thread_data *td) +void td_writeout_logs(struct thread_data *td, bool unit_logs) { unsigned int log_mask = 0; unsigned int log_left = ALL_LOG_NR; @@ -1310,7 +1317,7 @@ void fio_writeout_logs(struct thread_data *td) old_state = td_bump_runstate(td, TD_FINISHING); - finalize_logs(td); + finalize_logs(td, unit_logs); while (log_left) { int prev_log_left = log_left; @@ -1320,7 +1327,7 @@ void fio_writeout_logs(struct thread_data *td) int ret; if (!(log_mask & lt->mask)) { - ret = lt->fn(td, log_left != 1); + ret = lt->fn(td, log_left != 1, unit_logs); if (!ret) { log_left--; log_mask |= lt->mask; @@ -1334,3 +1341,12 @@ void fio_writeout_logs(struct thread_data *td) td_restore_runstate(td, old_state); } + +void fio_writeout_logs(bool unit_logs) +{ + struct thread_data *td; + int i; + + for_each_td(td, i) + td_writeout_logs(td, unit_logs); +}