projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix io piece logging to not have O(n) runtime
[fio.git]
/
engines
/
syslet-rw.c
diff --git
a/engines/syslet-rw.c
b/engines/syslet-rw.c
index 8ab217f40b407e0c628016d8794bd90ed5f1e6aa..a293e7f4715d415622f50b971ac1012a513ec9a2 100644
(file)
--- a/
engines/syslet-rw.c
+++ b/
engines/syslet-rw.c
@@
-1,5
+1,8
@@
/*
/*
- * read/write() engine that uses syslet to be async
+ * syslet engine
+ *
+ * IO engine that does regular pread(2)/pwrite(2) to transfer data, but
+ * with syslets to make the execution async.
*
*/
#include <stdio.h>
*
*/
#include <stdio.h>
@@
-7,12
+10,21
@@
#include <unistd.h>
#include <errno.h>
#include <assert.h>
#include <unistd.h>
#include <errno.h>
#include <assert.h>
+#include <asm/unistd.h>
#include "../fio.h"
#include "../os.h"
#ifdef FIO_HAVE_SYSLET
#include "../fio.h"
#include "../os.h"
#ifdef FIO_HAVE_SYSLET
+#ifdef __NR_pread64
+#define __NR_fio_pread __NR_pread64
+#define __NR_fio_pwrite __NR_pwrite64
+#else
+#define __NR_fio_pread __NR_pread
+#define __NR_fio_pwrite __NR_pwrite
+#endif
+
struct syslet_data {
struct io_u **events;
unsigned int nr_events;
struct syslet_data {
struct io_u **events;
unsigned int nr_events;
@@
-46,12
+58,12
@@
static void fio_syslet_complete_atom(struct thread_data *td,
io_u = atom->private;
ret = *atom->ret_ptr;
io_u = atom->private;
ret = *atom->ret_ptr;
- if (ret > 0)
+ if (ret >
=
0)
io_u->resid = io_u->xfer_buflen - ret;
else if (ret < 0)
io_u->error = ret;
io_u->resid = io_u->xfer_buflen - ret;
else if (ret < 0)
io_u->error = ret;
- assert(sd->nr_events < td->iodepth);
+ assert(sd->nr_events < td->
o.
iodepth);
sd->events[sd->nr_events++] = io_u;
if (atom == last)
sd->events[sd->nr_events++] = io_u;
if (atom == last)
@@
-78,7
+90,7
@@
static void fio_syslet_complete(struct thread_data *td)
break;
sd->ring[sd->ahu.user_ring_idx] = NULL;
break;
sd->ring[sd->ahu.user_ring_idx] = NULL;
- if (++sd->ahu.user_ring_idx == td->iodepth)
+ if (++sd->ahu.user_ring_idx == td->
o.
iodepth)
sd->ahu.user_ring_idx = 0;
fio_syslet_complete_atom(td, atom);
sd->ahu.user_ring_idx = 0;
fio_syslet_complete_atom(td, atom);
@@
-154,9
+166,9
@@
static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f)
* prepare rw
*/
if (io_u->ddir == DDIR_READ)
* prepare rw
*/
if (io_u->ddir == DDIR_READ)
- nr = __NR_
pread64
;
+ nr = __NR_
fio_pread
;
else
else
- nr = __NR_
pwrite64
;
+ nr = __NR_
fio_pwrite
;
init_atom(&io_u->req.atom, nr, &f->fd, &io_u->xfer_buf,
&io_u->xfer_buflen, &io_u->offset, &io_u->req.ret, 0, io_u);
init_atom(&io_u->req.atom, nr, &f->fd, &io_u->xfer_buf,
&io_u->xfer_buflen, &io_u->offset, &io_u->req.ret, 0, io_u);
@@
-291,13
+303,13
@@
static int fio_syslet_init(struct thread_data *td)
sd = malloc(sizeof(*sd));
memset(sd, 0, sizeof(*sd));
sd = malloc(sizeof(*sd));
memset(sd, 0, sizeof(*sd));
- sd->events = malloc(sizeof(struct io_u *) * td->iodepth);
- memset(sd->events, 0, sizeof(struct io_u *) * td->iodepth);
+ sd->events = malloc(sizeof(struct io_u *) * td->
o.
iodepth);
+ memset(sd->events, 0, sizeof(struct io_u *) * td->
o.
iodepth);
/*
* This will handily fail for kernels where syslet isn't available
*/
/*
* This will handily fail for kernels where syslet isn't available
*/
- if (async_head_init(sd, td->iodepth)) {
+ if (async_head_init(sd, td->
o.
iodepth)) {
free(sd->events);
free(sd);
return 1;
free(sd->events);
free(sd);
return 1;
@@
-317,6
+329,8
@@
static struct ioengine_ops ioengine = {
.getevents = fio_syslet_getevents,
.event = fio_syslet_event,
.cleanup = fio_syslet_cleanup,
.getevents = fio_syslet_getevents,
.event = fio_syslet_event,
.cleanup = fio_syslet_cleanup,
+ .open_file = generic_open_file,
+ .close_file = generic_close_file,
};
#else /* FIO_HAVE_SYSLET */
};
#else /* FIO_HAVE_SYSLET */