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;
#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;
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;
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)) {
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;
}
static struct workqueue_ops log_compress_wq_ops = {
- .fn = gz_work,
+ .fn = gz_work_async,
.init_worker_fn = gz_init_worker,
.nice = 1,
};
log->max_samples = 128;
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;
}