#ifdef CONFIG_ZLIB
-static void drop_data(struct iolog_flush_data *data, int refs)
+static void drop_data_unlock(struct iolog_flush_data *data)
{
+ int refs;
+
+ refs = --data->refs;
+ pthread_mutex_unlock(&data->lock);
+
if (!refs) {
free(data);
pthread_mutex_destroy(&data->lock);
ret = 0;
done:
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);
+
+ drop_data_unlock(data);
} else
free(data);
return ret;
goto done;
}
+static int gz_init_worker(struct submit_worker *sw)
+{
+ struct thread_data *td = sw->wq->td;
+
+ if (!fio_option_is_set(&td->o, log_gz_cpumask))
+ return 0;
+
+ if (fio_setaffinity(gettid(), td->o.log_gz_cpumask) == -1) {
+ log_err("gz: failed to set CPU affinity\n");
+ return 1;
+ }
+
+ return 0;
+}
+
static struct workqueue_ops log_compress_wq_ops = {
- .fn = gz_work,
+ .fn = gz_work,
+ .init_worker_fn = gz_init_worker,
.nice = 1,
};
data->nr_samples = log->nr_samples;
log->nr_samples = 0;
- if (wait) {
+ data->wait = wait;
+ if (data->wait) {
pthread_mutex_init(&data->lock, NULL);
pthread_cond_init(&data->cv, NULL);
data->done = 0;
- data->wait = 1;
data->refs = 2;
- } else
- data->wait = 0;
+ }
workqueue_enqueue(&log->td->log_compress_wq, &data->work);
if (wait) {
- 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);
+
+ drop_data_unlock(data);
}
return 0;
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)
+static int __write_log(struct thread_data *td, struct io_log *log, int try)
{
- struct io_log *log = td->iops_log;
+ if (log)
+ return finish_log(td, log, try);
- if (!log)
- return 0;
+ return 0;
+}
- return finish_log(td, log, try);
+static int write_iops_log(struct thread_data *td, int try)
+{
+ return __write_log(td, td->iops_log, try);
}
static int write_slat_log(struct thread_data *td, int try)
{
- struct io_log *log = td->slat_log;
-
- if (!log)
- return 0;
-
- return finish_log(td, log, try);
+ return __write_log(td, td->slat_log, try);
}
static int write_clat_log(struct thread_data *td, int try)
{
- struct io_log *log = td->clat_log;
-
- if (!log)
- return 0;
-
- return finish_log(td, log, try);
+ return __write_log(td, td->clat_log, try);
}
static int write_lat_log(struct thread_data *td, int try)
{
- struct io_log *log = td->lat_log;
-
- if (!log)
- return 0;
-
- return finish_log(td, log, try);
+ return __write_log(td, td->lat_log, try);
}
static int write_bandw_log(struct thread_data *td, int try)
{
- struct io_log *log = td->bw_log;
-
- if (!log)
- return 0;
-
- return finish_log(td, log, try);
+ return __write_log(td, td->bw_log, try);
}
enum {