projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Net engine: move connection setup into ->init()
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 39433207afd6f5984f981eeed52d689c6f6e38db..a7ccad66f810b982b7a0d15b355aa6efcbde0334 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-77,16
+77,10
@@
static struct ioengine_ops *find_ioengine(const char *name)
{
struct ioengine_ops *ops;
struct list_head *entry;
{
struct ioengine_ops *ops;
struct list_head *entry;
- char engine[16];
-
- strncpy(engine, name, sizeof(engine) - 1);
-
- if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
- strcpy(engine, "libaio");
list_for_each(entry, &engine_list) {
ops = list_entry(entry, struct ioengine_ops, list);
list_for_each(entry, &engine_list) {
ops = list_entry(entry, struct ioengine_ops, list);
- if (!strcmp(
engin
e, ops->name))
+ if (!strcmp(
nam
e, ops->name))
return ops;
}
return ops;
}
@@
-102,7
+96,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;
}
@@
-112,7
+106,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;
}
@@
-164,7
+158,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;
}
@@
-179,6
+176,12
@@
int td_io_prep(struct thread_data *td, struct io_u *io_u)
int td_io_getevents(struct thread_data *td, int min, int max,
struct timespec *t)
{
int td_io_getevents(struct thread_data *td, int min, int max,
struct timespec *t)
{
+ if (min > 0 && td->io_ops->commit) {
+ int r = td->io_ops->commit(td);
+
+ if (r < 0)
+ return r;
+ }
if (td->io_ops->getevents)
return td->io_ops->getevents(td, min, max, t);
if (td->io_ops->getevents)
return td->io_ops->getevents(td, min, max, t);
@@
-207,6
+210,17
@@
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);
+ if (ret == FIO_Q_QUEUED) {
+ int r;
+
+ td->io_u_queued++;
+ if (td->io_u_queued > td->iodepth_batch) {
+ r = td_io_commit(td);
+ if (r < 0)
+ return r;
+ }
+ }
+
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);
@@
-231,6
+245,10
@@
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;
+
+ 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);