#include "../optgroup.h"
struct rados_data {
- rados_t cluster;
- rados_ioctx_t io_ctx;
- struct io_u **aio_events;
- bool connected;
- pthread_mutex_t completed_lock;
- pthread_cond_t completed_more_io;
- struct flist_head completed_operations;
+ rados_t cluster;
+ rados_ioctx_t io_ctx;
+ struct io_u **aio_events;
+ bool connected;
+ pthread_mutex_t completed_lock;
+ pthread_cond_t completed_more_io;
+ struct flist_head completed_operations;
+ uint64_t ops_scheduled;
+ uint64_t ops_completed;
};
struct fio_rados_iou {
pthread_mutex_init(&rados->completed_lock, NULL);
pthread_cond_init(&rados->completed_more_io, NULL);
INIT_FLIST_HEAD(&rados->completed_operations);
+ rados->ops_scheduled = 0;
+ rados->ops_completed = 0;
*rados_data_ptr = rados;
return 0;
static void fio_rados_cleanup(struct thread_data *td)
{
struct rados_data *rados = td->io_ops_data;
-
if (rados) {
+ pthread_mutex_lock(&rados->completed_lock);
+ while (rados->ops_scheduled != rados->ops_completed)
+ pthread_cond_wait(&rados->completed_more_io, &rados->completed_lock);
+ pthread_mutex_unlock(&rados->completed_lock);
_fio_rados_rm_objects(td, rados);
_fio_rados_disconnect(rados);
free(rados->aio_events);
assert(rados_aio_is_complete(fri->completion));
pthread_mutex_lock(&rados->completed_lock);
flist_add_tail(&fri->list, &rados->completed_operations);
+ rados->ops_completed++;
pthread_mutex_unlock(&rados->completed_lock);
pthread_cond_signal(&rados->completed_more_io);
}
log_err("rados_write failed.\n");
goto failed_comp;
}
+ rados->ops_scheduled++;
return FIO_Q_QUEUED;
} else if (io_u->ddir == DDIR_READ) {
r = rados_aio_create_completion(fri, complete_callback,
log_err("rados_aio_read failed.\n");
goto failed_comp;
}
+ rados->ops_scheduled++;
return FIO_Q_QUEUED;
} else if (io_u->ddir == DDIR_TRIM) {
r = rados_aio_create_completion(fri, complete_callback,
log_err("rados_aio_write_op_operate failed.\n");
goto failed_write_op;
}
+ rados->ops_scheduled++;
return FIO_Q_QUEUED;
}
}
assert(!flist_empty(&rados->completed_operations));
- fri = flist_last_entry(&rados->completed_operations, struct fio_rados_iou, list);
+ fri = flist_first_entry(&rados->completed_operations, struct fio_rados_iou, list);
assert(fri->completion);
assert(rados_aio_is_complete(fri->completion));
if (fri->write_op != NULL) {
}
/* ioengine_ops for get_ioengine() */
-static struct ioengine_ops ioengine = {
+FIO_STATIC struct ioengine_ops ioengine = {
.name = "rados",
.version = FIO_IOOPS_VERSION,
.flags = FIO_DISKLESSIO,