Always use td_io_#name so that it's clear that we are calling
into the io engine.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-static int io_u_getevents(struct thread_data *td, int min, int max,
+static int td_io_getevents(struct thread_data *td, int min, int max,
struct timespec *t)
{
return td->io_ops->getevents(td, min, max, t);
}
struct timespec *t)
{
return td->io_ops->getevents(td, min, max, t);
}
-static int io_u_queue(struct thread_data *td, struct io_u *io_u)
+static int td_io_queue(struct thread_data *td, struct io_u *io_u)
{
gettimeofday(&io_u->issue_time, NULL);
{
gettimeofday(&io_u->issue_time, NULL);
/*
* get immediately available events, if any
*/
/*
* get immediately available events, if any
*/
- r = io_u_getevents(td, 0, td->cur_depth, &ts);
+ r = td_io_getevents(td, 0, td->cur_depth, &ts);
if (r > 0) {
icd.nr = r;
ios_completed(td, &icd);
if (r > 0) {
icd.nr = r;
ios_completed(td, &icd);
- r = io_u_getevents(td, td->cur_depth, td->cur_depth, NULL);
+ r = td_io_getevents(td, td->cur_depth, td->cur_depth, NULL);
if (r > 0) {
icd.nr = r;
ios_completed(td, &icd);
if (r > 0) {
icd.nr = r;
ios_completed(td, &icd);
- ret = io_u_queue(td, io_u);
+ ret = td_io_queue(td, io_u);
if (ret) {
put_io_u(td, io_u);
td_verror(td, ret);
if (ret) {
put_io_u(td, io_u);
td_verror(td, ret);
if (do_io_u_verify(td, &v_io_u))
break;
if (do_io_u_verify(td, &v_io_u))
break;
- ret = io_u_getevents(td, 1, 1, NULL);
+ ret = td_io_getevents(td, 1, 1, NULL);
if (ret != 1) {
if (ret < 0)
td_verror(td, ret);
if (ret != 1) {
if (ret < 0)
td_verror(td, ret);
memcpy(&s, &io_u->start_time, sizeof(s));
memcpy(&s, &io_u->start_time, sizeof(s));
- ret = io_u_queue(td, io_u);
+ ret = td_io_queue(td, io_u);
if (ret) {
put_io_u(td, io_u);
td_verror(td, ret);
if (ret) {
put_io_u(td, io_u);
td_verror(td, ret);
- ret = io_u_getevents(td, min_evts, td->cur_depth, timeout);
+ ret = td_io_getevents(td, min_evts, td->cur_depth, timeout);
if (ret < 0) {
td_verror(td, ret);
break;
if (ret < 0) {
td_verror(td, ret);
break;
-static int init_io(struct thread_data *td)
+static int td_io_init(struct thread_data *td)
{
if (td->io_ops->init)
return td->io_ops->init(td);
{
if (td->io_ops->init)
return td->io_ops->init(td);
goto err;
if (init_iolog(td))
goto err;
if (init_iolog(td))