projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add note saying that HP-UX should work
[fio.git]
/
engines
/
guasi.c
diff --git
a/engines/guasi.c
b/engines/guasi.c
index c083eb361472e97db80ea3ddba7d5a20605d8af0..4839019fc49c3ec88facc04eda4e5c812b3a68f9 100644
(file)
--- a/
engines/guasi.c
+++ b/
engines/guasi.c
@@
-20,7
+20,6
@@
#include <assert.h>
#include "../fio.h"
#include <assert.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_GUASI
#ifdef FIO_HAVE_GUASI
@@
-38,9
+37,6
@@
#define GDBG_PRINT(a) (void) 0
#endif
#define GDBG_PRINT(a) (void) 0
#endif
-#define STFU_GCC(a) a = a
-
-
struct guasi_data {
guasi_t hctx;
int max_reqs;
struct guasi_data {
guasi_t hctx;
int max_reqs;
@@
-67,7
+63,7
@@
static struct io_u *fio_guasi_event(struct thread_data *td, int event)
GDBG_PRINT(("fio_guasi_event(%d)\n", event));
if (guasi_req_info(ld->reqs[event], &rinf) < 0) {
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;
return NULL;
}
io_u = rinf.asid;
@@
-90,8
+86,8
@@
static struct io_u *fio_guasi_event(struct thread_data *td, int event)
return io_u;
}
return io_u;
}
-static int fio_guasi_getevents(struct thread_data *td,
int min, int max
,
- struct timespec *t)
+static int fio_guasi_getevents(struct thread_data *td,
unsigned int min
,
+
unsigned int max,
struct timespec *t)
{
struct guasi_data *ld = td->io_ops->data;
int n, r;
{
struct guasi_data *ld = td->io_ops->data;
int n, r;
@@
-111,7
+107,7
@@
static int fio_guasi_getevents(struct thread_data *td, int min, int max,
r = guasi_fetch(ld->hctx, ld->reqs + n, min - n,
max - n, timeo);
if (r < 0) {
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;
break;
}
n += r;
@@
-128,6
+124,8
@@
static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
{
struct guasi_data *ld = td->io_ops->data;
{
struct guasi_data *ld = td->io_ops->data;
+ fio_ro_check(td, io_u);
+
GDBG_PRINT(("fio_guasi_queue(%p)\n", io_u));
if (ld->queued_nr == (int) td->o.iodepth)
return FIO_Q_BUSY;
GDBG_PRINT(("fio_guasi_queue(%p)\n", io_u));
if (ld->queued_nr == (int) td->o.iodepth)
return FIO_Q_BUSY;
@@
-143,6
+141,10
@@
static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr
struct io_u *io_u;
struct timeval now;
struct io_u *io_u;
struct timeval now;
+ if (!fio_fill_issue_time(td))
+ return;
+
+ io_u_mark_submit(td, nr);
fio_gettime(&now, NULL);
for (i = 0; i < nr; i++) {
io_u = io_us[i];
fio_gettime(&now, NULL);
for (i = 0; i < nr; i++) {
io_u = io_us[i];
@@
-172,14
+174,14
@@
static int fio_guasi_commit(struct thread_data *td)
io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
f->fd, io_u->xfer_buf, io_u->xfer_buflen,
io_u->offset);
io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
f->fd, io_u->xfer_buf, io_u->xfer_buflen,
io_u->offset);
- else if (
io_u->ddir == DDIR_SYNC
)
+ else if (
ddir_sync(io_u->ddir)
)
io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
else {
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) {
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;
}
strerror(errno));
return -1;
}
@@
-191,11
+193,9
@@
static int fio_guasi_commit(struct thread_data *td)
return 0;
}
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);
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);
@@
-216,7
+216,6
@@
static void fio_guasi_cleanup(struct thread_data *td)
free(ld->reqs);
free(ld->io_us);
free(ld);
free(ld->reqs);
free(ld->io_us);
free(ld);
- td->io_ops->data = NULL;
}
GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
}
}
GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
}
@@
-231,7
+230,7
@@
static int fio_guasi_init(struct thread_data *td)
maxthr = td->o.iodepth > GFIO_MIN_THREADS ? td->o.iodepth: GFIO_MIN_THREADS;
if (maxthr > GFIO_MAX_THREADS)
maxthr = GFIO_MAX_THREADS;
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;
td_verror(td, errno, "guasi_create");
free(ld);
return 1;
@@
-262,6
+261,7
@@
static struct ioengine_ops ioengine = {
.cleanup = fio_guasi_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
.cleanup = fio_guasi_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
};
#else /* FIO_HAVE_GUASI */
};
#else /* FIO_HAVE_GUASI */
@@
-273,7
+273,7
@@
static struct ioengine_ops ioengine = {
*/
static int fio_guasi_init(struct thread_data fio_unused *td)
{
*/
static int fio_guasi_init(struct thread_data fio_unused *td)
{
-
fprintf(stderr,
"fio: guasi not available\n");
+
log_err(
"fio: guasi not available\n");
return 1;
}
return 1;
}