projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move handling of possible values into the option parser
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index ab5b2245131fb1abb5d2e6b51a94227522e78991..0b3ec16485124df5eb3e3e7396e0208a4cd4ac27 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"
@@
-101,7
+102,7
@@
static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
dlerror();
dlhandle = dlopen(engine_lib, RTLD_LAZY);
if (!dlhandle) {
dlerror();
dlhandle = dlopen(engine_lib, RTLD_LAZY);
if (!dlhandle) {
- td_vmsg(td, -1, dlerror());
+ td_vmsg(td, -1, dlerror()
, "dlopen"
);
return NULL;
}
return NULL;
}
@@
-111,7
+112,7
@@
static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
*/
ops = dlsym(dlhandle, "ioengine");
if (!ops) {
*/
ops = dlsym(dlhandle, "ioengine");
if (!ops) {
- td_vmsg(td, -1, dlerror());
+ td_vmsg(td, -1, dlerror()
, "dlsym"
);
dlclose(dlhandle);
return NULL;
}
dlclose(dlhandle);
return NULL;
}
@@
-163,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;
}
@@
-188,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;
}
@@
-212,6
+234,8
@@
int td_io_init(struct thread_data *td)
int td_io_commit(struct thread_data *td)
{
int td_io_commit(struct thread_data *td)
{
+ if (!td->cur_depth)
+ return 0;
if (td->io_ops->commit)
return td->io_ops->commit(td);
if (td->io_ops->commit)
return td->io_ops->commit(td);