projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: just ignore zero byte traces
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index cec0c760f4a4a2c8c5cc089b8abc6d843dc492ea..d579682f4a051ce332b509b811e043c55b592c62 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-9,7
+9,6
@@
* generic io engine that could be used for other projects.
*
*/
* generic io engine that could be used for other projects.
*
*/
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@
-224,7
+223,8
@@
int td_io_prep(struct thread_data *td, struct io_u *io_u)
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
- dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
+ dprint(FD_IO, "prep: io_u %p: ret=%d\n", io_u, ret);
+
if (ret)
unlock_file(td, io_u->file);
return ret;
if (ret)
unlock_file(td, io_u->file);
return ret;
@@
-276,11
+276,11
@@
out:
return r;
}
return r;
}
-
int
td_io_queue(struct thread_data *td, struct io_u *io_u)
+
enum fio_q_status
td_io_queue(struct thread_data *td, struct io_u *io_u)
{
const enum fio_ddir ddir = acct_ddir(io_u);
unsigned long buflen = io_u->xfer_buflen;
{
const enum fio_ddir ddir = acct_ddir(io_u);
unsigned long buflen = io_u->xfer_buflen;
-
int
ret;
+
enum fio_q_status
ret;
dprint_io_u(io_u, "queue");
fio_ro_check(td, io_u);
dprint_io_u(io_u, "queue");
fio_ro_check(td, io_u);
@@
-356,23
+356,18
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
}
if (ret == FIO_Q_COMPLETED) {
}
if (ret == FIO_Q_COMPLETED) {
- if (ddir_rw(io_u->ddir)) {
+ if (ddir_rw(io_u->ddir)
|| ddir_sync(io_u->ddir)
) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
}
} else if (ret == FIO_Q_QUEUED) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
}
} else if (ret == FIO_Q_QUEUED) {
- int r;
-
td->io_u_queued++;
td->io_u_queued++;
- if (ddir_rw(io_u->ddir))
+ if (ddir_rw(io_u->ddir)
|| ddir_sync(io_u->ddir)
)
td->ts.total_io_u[io_u->ddir]++;
td->ts.total_io_u[io_u->ddir]++;
- if (td->io_u_queued >= td->o.iodepth_batch) {
- r = td_io_commit(td);
- if (r < 0)
- return r;
- }
+ if (td->io_u_queued >= td->o.iodepth_batch)
+ td_io_commit(td);
}
if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
}
if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
@@
-410,14
+405,14
@@
int td_io_init(struct thread_data *td)
return ret;
}
return ret;
}
-
int
td_io_commit(struct thread_data *td)
+
void
td_io_commit(struct thread_data *td)
{
int ret;
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
if (!td->cur_depth || !td->io_u_queued)
{
int ret;
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
if (!td->cur_depth || !td->io_u_queued)
- return
0
;
+ return;
io_u_mark_depth(td, td->io_u_queued);
io_u_mark_depth(td, td->io_u_queued);
@@
-432,8
+427,6
@@
int td_io_commit(struct thread_data *td)
*/
td->io_u_in_flight += td->io_u_queued;
td->io_u_queued = 0;
*/
td->io_u_in_flight += td->io_u_queued;
td->io_u_queued = 0;
-
- return 0;
}
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
int td_io_open_file(struct thread_data *td, struct fio_file *f)
@@
-497,8
+490,8
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
}
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
- td_verror(td, errno, "fadvise");
-
goto err
;
+ if (!fio_did_warn(FIO_WARN_FADVISE))
+
log_err("fio: fadvise hint failed\n")
;
}
}
#ifdef FIO_HAVE_WRITE_HINT
}
}
#ifdef FIO_HAVE_WRITE_HINT
@@
-581,6
+574,7
@@
int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
int fio_show_ioengine_help(const char *engine)
{
struct flist_head *entry;
int fio_show_ioengine_help(const char *engine)
{
struct flist_head *entry;
+ struct thread_data td;
struct ioengine_ops *io_ops;
char *sep;
int ret = 1;
struct ioengine_ops *io_ops;
char *sep;
int ret = 1;
@@
-599,7
+593,10
@@
int fio_show_ioengine_help(const char *engine)
sep++;
}
sep++;
}
- io_ops = __load_ioengine(engine);
+ memset(&td, 0, sizeof(struct thread_data));
+ td.o.ioengine = (char *)engine;
+ io_ops = load_ioengine(&td);
+
if (!io_ops) {
log_info("IO engine %s not found\n", engine);
return 1;
if (!io_ops) {
log_info("IO engine %s not found\n", engine);
return 1;
@@
-610,5
+607,6
@@
int fio_show_ioengine_help(const char *engine)
else
log_info("IO engine %s has no options\n", io_ops->name);
else
log_info("IO engine %s has no options\n", io_ops->name);
+ free_ioengine(&td);
return ret;
}
return ret;
}