projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't check st_size for special files
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index db333796f57c273250d60d40ed11b8a69c697412..441f36fc530969b47474f43d240385edf32f11c3 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-14,6
+14,7
@@
#include <unistd.h>
#include <string.h>
#include <dlfcn.h>
#include <unistd.h>
#include <string.h>
#include <dlfcn.h>
+#include <assert.h>
#include "fio.h"
#include "os.h"
#include "fio.h"
#include "os.h"
@@
-66,11
+67,10
@@
void unregister_ioengine(struct ioengine_ops *ops)
INIT_LIST_HEAD(&ops->list);
}
INIT_LIST_HEAD(&ops->list);
}
-
int
register_ioengine(struct ioengine_ops *ops)
+
void
register_ioengine(struct ioengine_ops *ops)
{
INIT_LIST_HEAD(&ops->list);
list_add_tail(&ops->list, &engine_list);
{
INIT_LIST_HEAD(&ops->list);
list_add_tail(&ops->list, &engine_list);
- return 0;
}
static struct ioengine_ops *find_ioengine(const char *name)
}
static struct ioengine_ops *find_ioengine(const char *name)
@@
-164,7
+164,10
@@
void close_ioengine(struct thread_data *td)
if (td->io_ops->dlhandle)
dlclose(td->io_ops->dlhandle);
if (td->io_ops->dlhandle)
dlclose(td->io_ops->dlhandle);
+#if 0
+ /* we can't do this for threads, so just leak it, it's exiting */
free(td->io_ops);
free(td->io_ops);
+#endif
td->io_ops = NULL;
}
td->io_ops = NULL;
}
@@
-189,17
+192,35
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
{
int ret;
{
int ret;
- if (td->io_ops->flags & FIO_SYNCIO)
+ assert((io_u->flags & IO_U_F_FLIGHT) == 0);
+ io_u->flags |= IO_U_F_FLIGHT;
+
+ if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
fio_gettime(&io_u->issue_time, NULL);
+ /*
+ * for a sync engine, set the timeout upfront
+ */
+ if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ io_u_set_timeout(td);
+ }
+
if (io_u->ddir != DDIR_SYNC)
td->io_issues[io_u->ddir]++;
ret = td->io_ops->queue(td, io_u);
if (io_u->ddir != DDIR_SYNC)
td->io_issues[io_u->ddir]++;
ret = td->io_ops->queue(td, io_u);
- if ((td->io_ops->flags & FIO_SYNCIO) == 0)
+ if ((td->io_ops->flags & FIO_SYNCIO) == 0)
{
fio_gettime(&io_u->issue_time, NULL);
fio_gettime(&io_u->issue_time, NULL);
+ /*
+ * async engine, set the timeout here
+ */
+ if (ret == FIO_Q_QUEUED &&
+ mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+ io_u_set_timeout(td);
+ }
+
return ret;
}
return ret;
}