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,
- .nice = 1,
+ .fn = gz_work,
+ .init_worker_fn = gz_init_worker,
+ .nice = 1,
};
-int iolog_compress_init(struct thread_data *td)
+int iolog_compress_init(struct thread_data *td, struct sk_out *sk_out)
{
if (!(td->flags & TD_F_COMPRESS_LOG))
return 0;
- workqueue_init(td, &td->log_compress_wq, &log_compress_wq_ops, 1);
+ workqueue_init(td, &td->log_compress_wq, &log_compress_wq_ops, 1, sk_out);
return 0;
}
}
/*
- * 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
- * continue to use the memory associated with the log). If called with
- * wait == 1, will not return until the log compression has completed.
+ * Queue work item to compress the existing log entries. We reset the
+ * current log to a small size, and reference the existing log in the
+ * data that we queue for compression. Once compression has been done,
+ * this old log is freed. If called with wait == 1, will not return until
+ * the log compression has completed.
*/
int iolog_flush(struct io_log *log, int wait)
{
struct iolog_flush_data *data;
- size_t sample_size;
+
+ io_u_quiesce(log->td);
data = malloc(sizeof(*data));
if (!data)
data->log = log;
- sample_size = log->nr_samples * log_entry_sz(log);
- data->samples = malloc(sample_size);
- if (!data->samples) {
- free(data);
- return 1;
- }
-
- memcpy(data->samples, log->log, sample_size);
+ data->samples = log->log;
data->nr_samples = log->nr_samples;
+
log->nr_samples = 0;
+ log->max_samples = 128;
+ log->log = malloc(log->max_samples * log_entry_sz(log));
data->wait = wait;
if (data->wait) {
return 1;
}
-int iolog_compress_init(struct thread_data *td)
+int iolog_compress_init(struct thread_data *td, struct sk_out *sk_out)
{
return 0;
}