#include <assert.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_GUASI
#define GDBG_PRINT(a) (void) 0
#endif
-#define STFU_GCC(a) a = a
-
-
struct guasi_data {
guasi_t hctx;
int max_reqs;
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;
r = guasi_fetch(ld->hctx, ld->reqs + n, min - n,
max - n, timeo);
if (r < 0) {
- fprintf(stderr, "guasi_fetch() FAILED! (%d)\n", r);
+ log_err("guasi_fetch() FAILED! (%d)\n", r);
break;
}
n += r;
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) {
- fprintf(stderr, "fio_guasi_commit() FAILED: submit failed (%s)\n",
+ log_err("fio_guasi_commit() FAILED: submit failed (%s)\n",
strerror(errno));
return -1;
}
return 0;
}
-static int fio_guasi_cancel(struct thread_data *td, struct io_u *io_u)
+static int fio_guasi_cancel(struct thread_data fio_unused *td,
+ struct io_u *io_u)
{
- struct guasi_data *ld = td->io_ops->data;
-
- STFU_GCC(ld);
GDBG_PRINT(("fio_guasi_cancel(%p) req=%p\n", io_u, io_u->greq));
if (io_u->greq != NULL)
guasi_req_cancel(io_u->greq);
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, 0)) == NULL) {
+ if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {
td_verror(td, errno, "guasi_create");
free(ld);
return 1;