projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We need to grab and mark the file open before jumping to an error path
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 5a2d6b90fb0c6d73d45d0b6c5ce5307f505691d2..1a7a6301d0b6b4d42112e62b8c520813a3c4530b 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-18,12
+18,13
@@
#include "fio.h"
#include "fio.h"
-static LIST_HEAD(engine_list);
+static
F
LIST_HEAD(engine_list);
static int check_engine_ops(struct ioengine_ops *ops)
{
if (ops->version != FIO_IOOPS_VERSION) {
static int check_engine_ops(struct ioengine_ops *ops)
{
if (ops->version != FIO_IOOPS_VERSION) {
- log_err("bad ioops version %d (want %d)\n", ops->version, FIO_IOOPS_VERSION);
+ log_err("bad ioops version %d (want %d)\n", ops->version,
+ FIO_IOOPS_VERSION);
return 1;
}
return 1;
}
@@
-37,7
+38,7
@@
static int check_engine_ops(struct ioengine_ops *ops)
*/
if (ops->flags & FIO_SYNCIO)
return 0;
*/
if (ops->flags & FIO_SYNCIO)
return 0;
-
+
if (!ops->event) {
log_err("%s: no event handler\n", ops->name);
return 1;
if (!ops->event) {
log_err("%s: no event handler\n", ops->name);
return 1;
@@
-50,31
+51,31
@@
static int check_engine_ops(struct ioengine_ops *ops)
log_err("%s: no queue handler\n", ops->name);
return 1;
}
log_err("%s: no queue handler\n", ops->name);
return 1;
}
-
+
return 0;
}
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
return 0;
}
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
- list_del(&ops->list);
- INIT_LIST_HEAD(&ops->list);
+
f
list_del(&ops->list);
+ INIT_
F
LIST_HEAD(&ops->list);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
- INIT_LIST_HEAD(&ops->list);
- list_add_tail(&ops->list, &engine_list);
+ INIT_
F
LIST_HEAD(&ops->list);
+
f
list_add_tail(&ops->list, &engine_list);
}
static struct ioengine_ops *find_ioengine(const char *name)
{
struct ioengine_ops *ops;
}
static struct ioengine_ops *find_ioengine(const char *name)
{
struct ioengine_ops *ops;
- struct list_head *entry;
+ struct
f
list_head *entry;
- list_for_each(entry, &engine_list) {
- ops = list_entry(entry, struct ioengine_ops, list);
+
f
list_for_each(entry, &engine_list) {
+ ops =
f
list_entry(entry, struct ioengine_ops, list);
if (!strcmp(name, ops->name))
return ops;
}
if (!strcmp(name, ops->name))
return ops;
}
@@
-153,8
+154,10
@@
void close_ioengine(struct thread_data *td)
{
dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
{
dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
- if (td->io_ops->cleanup)
+ if (td->io_ops->cleanup)
{
td->io_ops->cleanup(td);
td->io_ops->cleanup(td);
+ td->io_ops->data = NULL;
+ }
if (td->io_ops->dlhandle)
dlclose(td->io_ops->dlhandle);
if (td->io_ops->dlhandle)
dlclose(td->io_ops->dlhandle);
@@
-168,14
+171,14
@@
int td_io_prep(struct thread_data *td, struct io_u *io_u)
dprint_io_u(io_u, "prep");
fio_ro_check(td, io_u);
dprint_io_u(io_u, "prep");
fio_ro_check(td, io_u);
- lock_file(td, io_u->file);
+ lock_file(td, io_u->file
, io_u->ddir
);
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
if (ret)
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
if (ret)
- unlock_file(io_u->file);
+ unlock_file(
td,
io_u->file);
return ret;
}
return ret;
}
@@
-197,6
+200,8
@@
int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
if (td->io_ops->getevents)
r = td->io_ops->getevents(td, min, max, t);
out:
if (td->io_ops->getevents)
r = td->io_ops->getevents(td, min, max, t);
out:
+ if (r >= 0)
+ io_u_mark_complete(td, r);
dprint(FD_IO, "getevents: %d\n", r);
return r;
}
dprint(FD_IO, "getevents: %d\n", r);
return r;
}
@@
-218,12
+223,14
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
- memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+ memcpy(&td->last_issue, &io_u->issue_time,
+ sizeof(struct timeval));
/*
* for a sync engine, set the timeout upfront
*/
/*
* for a sync engine, set the timeout upfront
*/
- if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ if (mtime_since(&td->timeout_end, &io_u->issue_time)
+ < IO_U_TIMEOUT)
io_u_set_timeout(td);
}
io_u_set_timeout(td);
}
@@
-232,16
+239,27
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
ret = td->io_ops->queue(td, io_u);
ret = td->io_ops->queue(td, io_u);
- unlock_file(io_u->file);
+ unlock_file(
td,
io_u->file);
- if (ret != FIO_Q_BUSY)
- io_u_mark_depth(td, io_u);
+ if (!td->io_ops->commit) {
+ io_u_mark_submit(td, 1);
+ io_u_mark_complete(td, 1);
+ }
- if (ret == FIO_Q_QUEUED) {
+ if (ret == FIO_Q_COMPLETED) {
+ if (io_u->ddir != DDIR_SYNC) {
+ io_u_mark_depth(td, 1);
+ td->ts.total_io_u[io_u->ddir]++;
+ }
+ } else if (ret == FIO_Q_QUEUED) {
int r;
int r;
- td->io_u_queued++;
- if (td->io_u_queued > td->o.iodepth_batch) {
+ if (io_u->ddir != DDIR_SYNC) {
+ td->io_u_queued++;
+ 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;
r = td_io_commit(td);
if (r < 0)
return r;
@@
-250,14
+268,17
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
fio_gettime(&io_u->issue_time, NULL);
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
fio_gettime(&io_u->issue_time, NULL);
- memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
+ memcpy(&td->last_issue, &io_u->issue_time,
+ sizeof(struct timeval));
/*
* async engine, set the timeout here
*/
if (ret == FIO_Q_QUEUED &&
/*
* async engine, set the timeout here
*/
if (ret == FIO_Q_QUEUED &&
- mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ (mtime_since(&td->timeout_end, &io_u->issue_time)
+ < IO_U_TIMEOUT)) {
io_u_set_timeout(td);
io_u_set_timeout(td);
+ }
}
return ret;
}
return ret;
@@
-269,8
+290,10
@@
int td_io_init(struct thread_data *td)
if (td->io_ops->init) {
ret = td->io_ops->init(td);
if (td->io_ops->init) {
ret = td->io_ops->init(td);
- if (ret && td->o.iodepth > 1)
- log_err("fio: io engine init failed. Perhaps try reducing io depth?\n");
+ if (ret && td->o.iodepth > 1) {
+ log_err("fio: io engine init failed. Perhaps try"
+ " reducing io depth?\n");
+ }
}
return ret;
}
return ret;
@@
-280,10
+303,12
@@
int td_io_commit(struct thread_data *td)
{
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
{
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
- if (!td->cur_depth)
+ if (!td->cur_depth
|| !td->io_u_queued
)
return 0;
return 0;
+ io_u_mark_depth(td, td->io_u_queued);
td->io_u_queued = 0;
td->io_u_queued = 0;
+
if (td->io_ops->commit)
return td->io_ops->commit(td);
if (td->io_ops->commit)
return td->io_ops->commit(td);
@@
-295,12
+320,22
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
log_err("fio: destination does not support O_DIRECT\n");
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
log_err("fio: destination does not support O_DIRECT\n");
- if (td->error == EMFILE)
- log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+ if (td->error == EMFILE) {
+ log_err("fio: try reducing/setting openfiles (failed"
+ " at %u of %u)\n", td->nr_open_files,
+ td->o.nr_files);
+ }
return 1;
}
return 1;
}
+ fio_file_reset(f);
+ f->flags |= FIO_FILE_OPEN;
+ f->flags &= ~FIO_FILE_CLOSING;
+
+ td->nr_open_files++;
+ get_file(f);
+
if (f->filetype == FIO_TYPE_PIPE) {
if (td_random(td)) {
log_err("fio: can't seek on pipes (no random io)\n");
if (f->filetype == FIO_TYPE_PIPE) {
if (td_random(td)) {
log_err("fio: can't seek on pipes (no random io)\n");
@@
-308,11
+343,6
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
}
}
}
- f->last_free_lookup = 0;
- f->last_pos = f->file_offset;
- f->flags |= FIO_FILE_OPEN;
- f->flags &= ~FIO_FILE_CLOSING;
-
if (td->io_ops->flags & FIO_DISKLESSIO)
goto done;
if (td->io_ops->flags & FIO_DISKLESSIO)
goto done;
@@
-321,7
+351,6
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
if (td->o.fadvise_hint &&
(f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
if (td->o.fadvise_hint &&
(f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
-
int flags;
if (td_random(td))
int flags;
if (td_random(td))
@@
-336,12
+365,10
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
if (f->file_map)
}
if (f->file_map)
- memset(f->file_map, 0, f->num_maps * sizeof(
long
));
+ memset(f->file_map, 0, f->num_maps * sizeof(
int
));
done:
log_file(td, f, FIO_LOG_OPEN_FILE);
done:
log_file(td, f, FIO_LOG_OPEN_FILE);
- td->nr_open_files++;
- get_file(f);
return 0;
err:
if (td->io_ops->close_file)
return 0;
err:
if (td->io_ops->close_file)
@@
-359,5
+386,7
@@
int td_io_close_file(struct thread_data *td, struct fio_file *f)
*/
f->flags |= FIO_FILE_CLOSING;
*/
f->flags |= FIO_FILE_CLOSING;
+ unlock_file_all(td, f);
+
return put_file(td, f);
}
return put_file(td, f);
}