#define GFIO_MIN_THREADS 32
#ifndef GFIO_MAX_THREADS
-#define GFIO_MAX_THREADS 280
+#define GFIO_MAX_THREADS 2000
#endif
#include <guasi.h>
GDBG_PRINT(("fio_guasi_event(%d)\n", event));
if (guasi_req_info(ld->reqs[event], &rinf) < 0) {
- fprintf(stderr, "guasi_req_info(%d) FAILED!\n", event);
+ log_err("guasi_req_info(%d) FAILED!\n", event);
return NULL;
}
io_u = rinf.asid;
guasi_req_free(ld->reqs[n]);
n = 0;
do {
- r = guasi_fetch(ld->hctx, ld->reqs + n, max - n, timeo);
- if (r < 0)
+ r = guasi_fetch(ld->hctx, ld->reqs + n, min - n,
+ max - n, timeo);
+ if (r < 0) {
+ log_err("guasi_fetch() FAILED! (%d)\n", r);
break;
+ }
n += r;
if (n >= min)
break;
return FIO_Q_QUEUED;
}
-static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us,
- unsigned int nr)
+static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr)
{
+ int i;
+ struct io_u *io_u;
struct timeval now;
- struct io_u *io_u = io_us[nr];
fio_gettime(&now, NULL);
- memcpy(&io_u->issue_time, &now, sizeof(now));
- io_u_queued(td, io_u);
+ for (i = 0; i < nr; i++) {
+ io_u = io_us[i];
+ memcpy(&io_u->issue_time, &now, sizeof(now));
+ io_u_queued(td, io_u);
+ }
}
static int fio_guasi_commit(struct thread_data *td)
else if (io_u->ddir == DDIR_SYNC)
io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
else {
- fprintf(stderr, "fio_guasi_commit() FAILED: unknow request %d\n",
+ log_err("fio_guasi_commit() FAILED: unknow request %d\n",
io_u->ddir);
}
- if (io_u->greq != NULL)
- fio_guasi_queued(td, ld->io_us, i);
- else {
- fprintf(stderr, "fio_guasi_commit() FAILED: submit failed (%s)\n",
+ if (io_u->greq == NULL) {
+ log_err("fio_guasi_commit() FAILED: submit failed (%s)\n",
strerror(errno));
return -1;
}
}
+ fio_guasi_queued(td, ld->io_us, i);
ld->queued_nr = 0;
GDBG_PRINT(("fio_guasi_commit() -> %d\n", i));
static void fio_guasi_cleanup(struct thread_data *td)
{
struct guasi_data *ld = td->io_ops->data;
+ int n;
GDBG_PRINT(("fio_guasi_cleanup(%p)\n", ld));
if (ld) {
+ for (n = 0; n < ld->reqs_nr; n++)
+ guasi_req_free(ld->reqs[n]);
guasi_free(ld->hctx);
free(ld->reqs);
free(ld->io_us);
maxthr = td->o.iodepth > GFIO_MIN_THREADS ? td->o.iodepth: GFIO_MIN_THREADS;
if (maxthr > GFIO_MAX_THREADS)
maxthr = GFIO_MAX_THREADS;
- if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {
+ if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1, 0)) == NULL) {
td_verror(td, errno, "guasi_create");
free(ld);
return 1;