#include <assert.h>
#include <string.h>
#include <sys/poll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "../fio.h"
return 0;
}
+static unsigned int binject_read_commands(struct thread_data *td, void *p,
+ int left, int *err)
+{
+ struct fio_file *f;
+ int i, ret, events;
+
+one_more:
+ events = 0;
+ for_each_file(td, f, i) {
+ 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)
+ continue;
+ *err = -errno;
+ td_verror(td, errno, "read");
+ break;
+ } else if (ret) {
+ p += ret;
+ events += ret / sizeof(struct b_user_cmd);
+ }
+ }
+
+ if (*err || events)
+ return events;
+
+ usleep(1000);
+ goto one_more;
+}
+
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;
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 = (struct binject_file *) 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;
}
while (left) {
- void *p;
-
- do {
- if (!min)
- break;
-
+ while (!min) {
ret = poll(bd->pfds, td->o.nr_files, -1);
if (ret < 0) {
if (!r)
if (pollin_events(bd->pfds, td->o.nr_files))
break;
- } while (1);
+ }
if (r < 0)
break;
-re_read:
- p = buf;
- events = 0;
- for_each_file(td, f, i) {
- bf = (struct binject_file *) f->file_data;
-
- ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
- if (ret < 0) {
- if (errno == EAGAIN)
- continue;
- r = -errno;
- td_verror(td, errno, "read");
- break;
- } else if (ret) {
- p += ret;
- events += ret / sizeof(struct b_user_cmd);
- }
- }
+ events = binject_read_commands(td, buf, left, &r);
if (r < 0)
break;
- if (!events) {
- usleep(1000);
- goto re_read;
- }
left -= events;
r += events;
for (i = 0; i < events; i++) {
struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
- bd->events[ev_index] = (struct io_u *) buc->usr_ptr;
+ bd->events[ev_index] = (struct io_u *) (unsigned long) buc->usr_ptr;
ev_index++;
}
}
if (!min) {
for_each_file(td, f, i) {
- bf = (struct binject_file *) 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 fio_file *f = io_u->file;
- struct binject_file *bf = (struct binject_file *) f->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(io_u->file);
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
{
struct binject_data *bd = td->io_ops->data;
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf = (struct binject_file *) 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");
buc->type = B_TYPE_READ;
} else if (io_u->ddir == DDIR_WRITE) {
binject_buc_init(bd, io_u);
- buc->type = B_TYPE_WRITE;
+ if (io_u->flags & IO_U_F_BARRIER)
+ buc->type = B_TYPE_WRITEBARRIER;
+ else
+ buc->type = B_TYPE_WRITE;
} else if (io_u->ddir == DDIR_TRIM) {
binject_buc_init(bd, io_u);
buc->type = B_TYPE_DISCARD;
return bd->events[event];
}
+static int binject_open_ctl(struct thread_data *td)
+{
+ int fd;
+
+ fd = open("/dev/binject-ctl", O_RDWR);
+ if (fd < 0)
+ td_verror(td, errno, "open binject-ctl");
+
+ return fd;
+}
+
static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
{
struct b_ioctl_cmd bic;
bf->fd = -1;
}
- fdb = open("/dev/binject-ctl", O_RDWR);
- if (fdb < 0) {
- td_verror(td, errno, "open binject-ctl");
+ fdb = binject_open_ctl(td);
+ if (fdb < 0)
return;
- }
bic.minor = bf->minor;
- if (ioctl(fdb, 1, &bic) < 0) {
+ if (ioctl(fdb, B_IOCTL_DEL, &bic) < 0)
td_verror(td, errno, "binject dev unmap");
- close(fdb);
- return;
- }
close(fdb);
}
struct stat sb;
int fdb, dev_there, loops;
- fdb = open("/dev/binject-ctl", O_RDWR);
- if (fdb < 0) {
- td_verror(td, errno, "binject ctl open");
+ fdb = binject_open_ctl(td);
+ if (fdb < 0)
return 1;
- }
bic.fd = fd;
- if (ioctl(fdb, 0, &bic) < 0) {
+ if (ioctl(fdb, B_IOCTL_ADD, &bic) < 0) {
td_verror(td, errno, "binject dev map");
close(fdb);
return 1;
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
- struct binject_file *bf = (struct binject_file *) f->file_data;
+ struct binject_file *bf = FILE_ENG_DATA(f);
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
- f->file_data = 0;
+ 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 = (unsigned long) bf;
+ FILE_SET_ENG_DATA(f, bf);
if (binject_map_dev(td, bf, f->fd)) {
err_close:
.open_file = fio_binject_open_file,
.close_file = fio_binject_close_file,
.get_file_size = generic_get_file_size,
- .flags = FIO_RAWIO,
+ .flags = FIO_RAWIO | FIO_BARRIER | FIO_MEMALIGN,
};
#else /* FIO_HAVE_BINJECT */
projects / fio.git / blobdiff