projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cpu clock does not wrap if there is no CPU clock
[fio.git]
/
engines
/
binject.c
diff --git
a/engines/binject.c
b/engines/binject.c
index 44a3796c6782f30e69a3dae9b081fdebccadc7a9..f8e83cd2b14426c08a1cd263cf376b757a7eb95a 100644
(file)
--- a/
engines/binject.c
+++ b/
engines/binject.c
@@
-12,6
+12,8
@@
#include <assert.h>
#include <string.h>
#include <sys/poll.h>
#include <assert.h>
#include <string.h>
#include <sys/poll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "../fio.h"
#include "../fio.h"
@@
-60,14
+62,14
@@
static int pollin_events(struct pollfd *pfds, int fds)
static unsigned int binject_read_commands(struct thread_data *td, void *p,
int left, int *err)
{
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) {
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)
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
@@
-89,28
+91,29
@@
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;
void *buf = bd->cmds;
unsigned int i, events;
struct fio_file *f;
{
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) {
/*
* 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
*/
/*
* 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;
}
@@
-144,15
+147,20
@@
static int fio_binject_getevents(struct thread_data *td, unsigned int min,
for (i = 0; i < events; i++) {
struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
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) {
ev_index++;
}
}
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));
}
}
}
}
@@
-165,7
+173,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->file_data
;
+ struct binject_file *bf =
FILE_ENG_DATA(io_u->file)
;
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
@@
-179,7
+187,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->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");
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
@@
-231,6
+239,17
@@
static struct io_u *fio_binject_event(struct thread_data *td, int event)
return bd->events[event];
}
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;
static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
{
struct b_ioctl_cmd bic;
@@
-241,19
+260,14
@@
static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
bf->fd = -1;
}
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;
return;
- }
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");
td_verror(td, errno, "binject dev unmap");
- close(fdb);
- return;
- }
close(fdb);
}
close(fdb);
}
@@
-266,15
+280,13
@@
static int binject_map_dev(struct thread_data *td, struct binject_file *bf,
struct stat sb;
int fdb, dev_there, loops;
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;
return 1;
- }
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;
@@
-317,12
+329,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->file_data
;
+ struct binject_file *bf =
FILE_ENG_DATA(f)
;
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
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);
}
return generic_close_file(td, f);
}
@@
-351,7
+363,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
;
+
FILE_SET_ENG_DATA(f, bf)
;
if (binject_map_dev(td, bf, f->fd)) {
err_close:
if (binject_map_dev(td, bf, f->fd)) {
err_close:
@@
-410,7
+422,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 */