projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error check fcntl() calls
[fio.git]
/
engines
/
sg.c
diff --git
a/engines/sg.c
b/engines/sg.c
index 99c5856a5082d816863af2b693c3effb100edb48..fcd9c41397a8bf20644b04336c2020bdc63b2215 100644
(file)
--- a/
engines/sg.c
+++ b/
engines/sg.c
@@
-12,7
+12,6
@@
#include <sys/poll.h>
#include "../fio.h"
#include <sys/poll.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_SGIO
#ifdef FIO_HAVE_SGIO
@@
-62,18
+61,14
@@
static int pollin_events(struct pollfd *pfds, int fds)
return 0;
}
return 0;
}
-static int fio_sgio_getevents(struct thread_data *td,
int min, int max
,
- struct timespec fio_unused *t)
+static int fio_sgio_getevents(struct thread_data *td,
unsigned int min
,
+
unsigned int max,
struct timespec fio_unused *t)
{
{
- /*
- * normally hard coding &td->files[0] is a bug that needs to be fixed,
- * but it's ok here as all files should point to the same device.
- */
- struct fio_file *f = &td->files[0];
struct sgio_data *sd = td->io_ops->data;
int left = max, ret, r = 0;
void *buf = sd->sgbuf;
unsigned int i, events;
struct sgio_data *sd = td->io_ops->data;
int left = max, ret, r = 0;
void *buf = sd->sgbuf;
unsigned int i, events;
+ struct fio_file *f;
/*
* Fill in the file descriptors
/*
* Fill in the file descriptors
@@
-82,10
+77,9
@@
static int fio_sgio_getevents(struct thread_data *td, int min, int max,
/*
* don't block for min events == 0
*/
/*
* don't block for min events == 0
*/
- if (!min) {
- sd->fd_flags[i] = fcntl(f->fd, F_GETFL);
- fcntl(f->fd, F_SETFL, sd->fd_flags[i] | O_NONBLOCK);
- }
+ if (!min)
+ fio_set_fd_nonblocking(f->fd, "sg");
+
sd->pfds[i].fd = f->fd;
sd->pfds[i].events = POLLIN;
}
sd->pfds[i].fd = f->fd;
sd->pfds[i].events = POLLIN;
}
@@
-166,38
+160,38
@@
static int fio_sgio_ioctl_doio(struct thread_data *td,
ret = ioctl(f->fd, SG_IO, hdr);
if (ret < 0)
ret = ioctl(f->fd, SG_IO, hdr);
if (ret < 0)
- return
-errno
;
+ return
ret
;
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}
-static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
+static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int
do_
sync)
{
struct sg_io_hdr *hdr = &io_u->hdr;
int ret;
ret = write(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
{
struct sg_io_hdr *hdr = &io_u->hdr;
int ret;
ret = write(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
- return
errno
;
+ return
ret
;
- if (sync) {
+ if (
do_
sync) {
ret = read(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
ret = read(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
- return
-errno
;
+ return
ret
;
return FIO_Q_COMPLETED;
}
return FIO_Q_QUEUED;
}
return FIO_Q_COMPLETED;
}
return FIO_Q_QUEUED;
}
-static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int sync)
+static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int
do_
sync)
{
struct fio_file *f = io_u->file;
if (f->filetype == FIO_TYPE_BD)
return fio_sgio_ioctl_doio(td, f, io_u);
{
struct fio_file *f = io_u->file;
if (f->filetype == FIO_TYPE_BD)
return fio_sgio_ioctl_doio(td, f, io_u);
- return fio_sgio_rw_doio(f, io_u, sync);
+ return fio_sgio_rw_doio(f, io_u,
do_
sync);
}
static int fio_sgio_prep(struct thread_data *td, struct io_u *io_u)
}
static int fio_sgio_prep(struct thread_data *td, struct io_u *io_u)
@@
-245,9
+239,14
@@
static int fio_sgio_prep(struct thread_data *td, struct io_u *io_u)
static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
{
struct sg_io_hdr *hdr = &io_u->hdr;
static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
{
struct sg_io_hdr *hdr = &io_u->hdr;
- int ret;
+ int ret
, do_sync = 0
;
- ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
+ fio_ro_check(td, io_u);
+
+ if (td->o.sync_io || td->o.odirect || ddir_sync(io_u->ddir))
+ do_sync = 1;
+
+ ret = fio_sgio_doio(td, io_u, do_sync);
if (ret < 0)
io_u->error = errno;
if (ret < 0)
io_u->error = errno;
@@
-274,17
+273,16
@@
static struct io_u *fio_sgio_event(struct thread_data *td, int event)
static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
{
struct sgio_data *sd = td->io_ops->data;
static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
{
struct sgio_data *sd = td->io_ops->data;
- struct io_u
*
io_u;
+ struct io_u io_u;
struct sg_io_hdr *hdr;
unsigned char buf[8];
int ret;
struct sg_io_hdr *hdr;
unsigned char buf[8];
int ret;
- io_u = __get_io_u(td);
- io_u->file = &td->files[0];
- assert(io_u);
+ memset(&io_u, 0, sizeof(io_u));
+ io_u.file = td->files[0];
- hdr = &io_u
->
hdr;
- sgio_hdr_init(sd, hdr, io_u, 0);
+ hdr = &io_u
.
hdr;
+ sgio_hdr_init(sd, hdr,
&
io_u, 0);
memset(buf, 0, sizeof(buf));
hdr->cmdp[0] = 0x25;
memset(buf, 0, sizeof(buf));
hdr->cmdp[0] = 0x25;
@@
-292,14
+290,11
@@
static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
hdr->dxferp = buf;
hdr->dxfer_len = sizeof(buf);
hdr->dxferp = buf;
hdr->dxfer_len = sizeof(buf);
- ret = fio_sgio_doio(td, io_u, 1);
- if (ret) {
- put_io_u(td, io_u);
+ ret = fio_sgio_doio(td, &io_u, 1);
+ if (ret)
return ret;
return ret;
- }
*bs = (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7];
*bs = (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7];
- put_io_u(td, io_u);
return 0;
}
return 0;
}
@@
-314,8
+309,6
@@
static void fio_sgio_cleanup(struct thread_data *td)
free(sd->pfds);
free(sd->sgbuf);
free(sd);
free(sd->pfds);
free(sd->sgbuf);
free(sd);
-
- td->io_ops->data = NULL;
}
}
}
}
@@
-367,7
+360,7
@@
static int fio_sgio_type_check(struct thread_data *td, struct fio_file *f)
if (ret)
return 1;
} else {
if (ret)
return 1;
} else {
- log_err("ioengine sg
io
only works on block devices\n");
+ log_err("ioengine sg only works on block devices\n");
return 1;
}
return 1;
}
@@
-390,8
+383,8
@@
static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
if (ret)
return ret;
if (ret)
return ret;
- if (!sd->type_checked && fio_sgio_type_check(td, f)) {
- generic_close_file(td, f);
+ if (
sd &&
!sd->type_checked && fio_sgio_type_check(td, f)) {
+
ret =
generic_close_file(td, f);
return 1;
}
return 1;
}
@@
-409,6
+402,7
@@
static struct ioengine_ops ioengine = {
.cleanup = fio_sgio_cleanup,
.open_file = fio_sgio_open,
.close_file = generic_close_file,
.cleanup = fio_sgio_cleanup,
.open_file = fio_sgio_open,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
.flags = FIO_SYNCIO | FIO_RAWIO,
};
.flags = FIO_SYNCIO | FIO_RAWIO,
};
@@
-421,12
+415,12
@@
static struct ioengine_ops ioengine = {
*/
static int fio_sgio_init(struct thread_data fio_unused *td)
{
*/
static int fio_sgio_init(struct thread_data fio_unused *td)
{
-
fprintf(stderr, "fio: sgio
not available\n");
+
log_err("fio: ioengine sg
not available\n");
return 1;
}
static struct ioengine_ops ioengine = {
return 1;
}
static struct ioengine_ops ioengine = {
- .name = "sg
io
",
+ .name = "sg",
.version = FIO_IOOPS_VERSION,
.init = fio_sgio_init,
};
.version = FIO_IOOPS_VERSION,
.init = fio_sgio_init,
};