static unsigned int binject_read_commands(struct thread_data *td, void *p,
int left, int *err)
{
- struct binject_file *bf;
struct fio_file *f;
int i, ret, events;
one_more:
events = 0;
for_each_file(td, f, i) {
- bf = f->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(f);
+
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
}
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
- unsigned int max, struct timespec fio_unused *t)
+ unsigned int max,
+ const struct timespec fio_unused *t)
{
- struct binject_data *bd = td->io_ops->data;
+ struct binject_data *bd = td->io_ops_data;
int left = max, ret, r = 0, ev_index = 0;
void *buf = bd->cmds;
unsigned int i, events;
struct fio_file *f;
- struct binject_file *bf;
/*
* Fill in the file descriptors
*/
for_each_file(td, f, i) {
- bf = f->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(f);
/*
* don't block for min events == 0
*/
- if (!min) {
- bd->fd_flags[i] = fcntl(bf->fd, F_GETFL);
- fcntl(bf->fd, F_SETFL, bd->fd_flags[i] | O_NONBLOCK);
- }
+ if (!min)
+ bd->fd_flags[i] = fio_set_fd_nonblocking(bf->fd, "binject");
+ else
+ bd->fd_flags[i] = -1;
+
bd->pfds[i].fd = bf->fd;
bd->pfds[i].events = POLLIN;
}
if (!min) {
for_each_file(td, f, i) {
- bf = f->file_data;
- fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
+ struct binject_file *bf = FILE_ENG_DATA(f);
+
+ if (bd->fd_flags[i] == -1)
+ continue;
+
+ if (fcntl(bf->fd, F_SETFL, bd->fd_flags[i]) < 0)
+ log_err("fio: binject failed to restore fcntl flags: %s\n", strerror(errno));
}
}
static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
{
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf = io_u->file->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(io_u->file);
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
static int fio_binject_prep(struct thread_data *td, struct io_u *io_u)
{
- struct binject_data *bd = td->io_ops->data;
+ struct binject_data *bd = td->io_ops_data;
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf = io_u->file->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(io_u->file);
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
static struct io_u *fio_binject_event(struct thread_data *td, int event)
{
- struct binject_data *bd = td->io_ops->data;
+ struct binject_data *bd = td->io_ops_data;
return bd->events[event];
}
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
- struct binject_file *bf = f->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(f);
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
- f->file_data = NULL;
+ FILE_SET_ENG_DATA(f, NULL);
return generic_close_file(td, f);
}
bf = malloc(sizeof(*bf));
bf->bs = bs;
bf->minor = bf->fd = -1;
- f->file_data = bf;
+ FILE_SET_ENG_DATA(f, bf);
if (binject_map_dev(td, bf, f->fd)) {
err_close:
static void fio_binject_cleanup(struct thread_data *td)
{
- struct binject_data *bd = td->io_ops->data;
+ struct binject_data *bd = td->io_ops_data;
if (bd) {
free(bd->events);
bd->fd_flags = malloc(sizeof(int) * td->o.nr_files);
memset(bd->fd_flags, 0, sizeof(int) * td->o.nr_files);
- td->io_ops->data = bd;
+ td->io_ops_data = bd;
return 0;
}
.open_file = fio_binject_open_file,
.close_file = fio_binject_close_file,
.get_file_size = generic_get_file_size,
- .flags = FIO_RAWIO | FIO_BARRIER,
+ .flags = FIO_RAWIO | FIO_BARRIER | FIO_MEMALIGN,
};
#else /* FIO_HAVE_BINJECT */