projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rbd: various fixes and cleanups
[fio.git]
/
engines
/
binject.c
diff --git
a/engines/binject.c
b/engines/binject.c
index 7f5d6292eed417821e71f9fbb007e7690d5d2dc5..c0baf9d262c87376e10cfc43c7732a742c6b50e6 100644
(file)
--- a/
engines/binject.c
+++ b/
engines/binject.c
@@
-69,7
+69,7
@@
static unsigned int binject_read_commands(struct thread_data *td, void *p,
one_more:
events = 0;
for_each_file(td, f, i) {
one_more:
events = 0;
for_each_file(td, f, i) {
- bf =
f->fil
e_data;
+ bf =
(struct binject_file *) (uintptr_t) f->engin
e_data;
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
@@
-91,7
+91,8
@@
one_more:
}
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
}
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;
{
struct binject_data *bd = td->io_ops->data;
int left = max, ret, r = 0, ev_index = 0;
@@
-104,15
+105,16
@@
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
* Fill in the file descriptors
*/
for_each_file(td, f, i) {
* Fill in the file descriptors
*/
for_each_file(td, f, i) {
- bf =
f->fil
e_data;
+ bf =
(struct binject_file *) (uintptr_t) f->engin
e_data;
/*
* don't block for min events == 0
*/
/*
* 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;
}
bd->pfds[i].fd = bf->fd;
bd->pfds[i].events = POLLIN;
}
@@
-153,8
+155,13
@@
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
if (!min) {
for_each_file(td, f, i) {
if (!min) {
for_each_file(td, f, i) {
- bf = f->file_data;
- fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
+ bf = (struct binject_file *) (uintptr_t) f->engine_data;
+
+ 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));
}
}
}
}
@@
-167,7
+174,7
@@
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
{
struct b_user_cmd *buc = &io_u->buc;
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->fil
e_data;
+ struct binject_file *bf =
(struct binject_file *) (uintptr_t) io_u->file->engin
e_data;
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
@@
-181,7
+188,7
@@
static int fio_binject_prep(struct thread_data *td, struct io_u *io_u)
{
struct binject_data *bd = td->io_ops->data;
struct b_user_cmd *buc = &io_u->buc;
{
struct binject_data *bd = td->io_ops->data;
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf =
io_u->file->fil
e_data;
+ struct binject_file *bf =
(struct binject_file *) (uintptr_t) io_u->file->engin
e_data;
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
@@
-260,7
+267,7
@@
static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
bic.minor = bf->minor;
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);
td_verror(td, errno, "binject dev unmap");
close(fdb);
@@
-280,7
+287,7
@@
static int binject_map_dev(struct thread_data *td, struct binject_file *bf,
bic.fd = fd;
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;
td_verror(td, errno, "binject dev map");
close(fdb);
return 1;
@@
-323,12
+330,12
@@
err_unmap:
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
- struct binject_file *bf =
f->fil
e_data;
+ struct binject_file *bf =
(struct binject_file *) (uintptr_t) f->engin
e_data;
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
- f->
file_data = NULL
;
+ f->
engine_data = 0
;
return generic_close_file(td, f);
}
return generic_close_file(td, f);
}
@@
-357,7
+364,7
@@
static int fio_binject_open_file(struct thread_data *td, struct fio_file *f)
bf = malloc(sizeof(*bf));
bf->bs = bs;
bf->minor = bf->fd = -1;
bf = malloc(sizeof(*bf));
bf->bs = bs;
bf->minor = bf->fd = -1;
- f->
file_data =
bf;
+ f->
engine_data = (uintptr_t)
bf;
if (binject_map_dev(td, bf, f->fd)) {
err_close:
if (binject_map_dev(td, bf, f->fd)) {
err_close:
@@
-416,7
+423,7
@@
static struct ioengine_ops ioengine = {
.open_file = fio_binject_open_file,
.close_file = fio_binject_close_file,
.get_file_size = generic_get_file_size,
.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 */
};
#else /* FIO_HAVE_BINJECT */