projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdma ioengine improvement
[fio.git]
/
engines
/
windowsaio.c
diff --git
a/engines/windowsaio.c
b/engines/windowsaio.c
index 45d23d20ef46bb8785be94c3624e06fdbd510e09..ea899698b25e1474406e3c9a1fd7e3ddcc63c5a5 100644
(file)
--- a/
engines/windowsaio.c
+++ b/
engines/windowsaio.c
@@
-1,6
+1,6
@@
/*
* Native Windows async IO engine
/*
* Native Windows async IO engine
- * Copyright (C) 201
1
Bruce Cran <bruce@cran.org.uk>
+ * Copyright (C) 201
2
Bruce Cran <bruce@cran.org.uk>
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-82,16
+82,16
@@
static int fio_windowsaio_init(struct thread_data *td)
}
if (!rc) {
}
if (!rc) {
- for (i = 0; i < td->o.iodepth; i++) {
- wd->ovls[i].io_free = TRUE;
- wd->ovls[i].io_complete = FALSE;
+
for (i = 0; i < td->o.iodepth; i++) {
+
wd->ovls[i].io_free = TRUE;
+
wd->ovls[i].io_complete = FALSE;
wd->ovls[i].o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (wd->ovls[i].o.hEvent == NULL) {
rc = 1;
break;
}
wd->ovls[i].o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (wd->ovls[i].o.hEvent == NULL) {
rc = 1;
break;
}
- }
+
}
}
if (!rc) {
}
if (!rc) {
@@
-113,9
+113,9
@@
static int fio_windowsaio_init(struct thread_data *td)
}
hKernel32Dll = GetModuleHandle("kernel32.dll");
}
hKernel32Dll = GetModuleHandle("kernel32.dll");
- wd->pCancelIoEx = GetProcAddress(hKernel32Dll, "CancelIoEx");
-
+ wd->pCancelIoEx = (CANCELIOEX)GetProcAddress(hKernel32Dll, "CancelIoEx");
td->io_ops->data = wd;
td->io_ops->data = wd;
+
return rc;
}
return rc;
}
@@
-133,8
+133,9
@@
static void fio_windowsaio_cleanup(struct thread_data *td)
CloseHandle(wd->iothread);
CloseHandle(wd->iocomplete_event);
CloseHandle(wd->iothread);
CloseHandle(wd->iocomplete_event);
- for (i = 0; i < td->o.iodepth; i++)
+ for (i = 0; i < td->o.iodepth; i++)
{
CloseHandle(wd->ovls[i].o.hEvent);
CloseHandle(wd->ovls[i].o.hEvent);
+ }
free(wd->aio_events);
free(wd->ovls);
free(wd->aio_events);
free(wd->ovls);
@@
-171,6
+172,10
@@
static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f)
if (td->o.sync_io)
flags |= FILE_FLAG_WRITE_THROUGH;
if (td->o.sync_io)
flags |= FILE_FLAG_WRITE_THROUGH;
+ /*
+ * Inform Windows whether we're going to be doing sequential or
+ * random io so it can tune the Cache Manager
+ */
if (td->o.td_ddir == TD_DDIR_READ ||
td->o.td_ddir == TD_DDIR_WRITE)
flags |= FILE_FLAG_SEQUENTIAL_SCAN;
if (td->o.td_ddir == TD_DDIR_READ ||
td->o.td_ddir == TD_DDIR_WRITE)
flags |= FILE_FLAG_SEQUENTIAL_SCAN;
@@
-182,7
+187,7
@@
static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f)
else
access = (GENERIC_READ | GENERIC_WRITE);
else
access = (GENERIC_READ | GENERIC_WRITE);
- if (td->o.create_on_open
> 0
)
+ if (td->o.create_on_open)
openmode = OPEN_ALWAYS;
else
openmode = OPEN_EXISTING;
openmode = OPEN_ALWAYS;
else
openmode = OPEN_EXISTING;
@@
-193,7
+198,7
@@
static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f)
if (f->hFile == INVALID_HANDLE_VALUE)
rc = 1;
if (f->hFile == INVALID_HANDLE_VALUE)
rc = 1;
- /* Only set up the competion port and thread if we're not just
+ /* Only set up the comp
l
etion port and thread if we're not just
* querying the device size */
if (!rc && td->io_ops->data != NULL) {
struct thread_ctx *ctx;
* querying the device size */
if (!rc && td->io_ops->data != NULL) {
struct thread_ctx *ctx;
@@
-282,6
+287,7
@@
static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
if (fov->io_complete) {
fov->io_complete = FALSE;
fov->io_free = TRUE;
if (fov->io_complete) {
fov->io_complete = FALSE;
fov->io_free = TRUE;
+ ResetEvent(fov->o.hEvent);
wd->aio_events[dequeued] = io_u;
dequeued++;
}
wd->aio_events[dequeued] = io_u;
dequeued++;
}
@@
-292,7
+298,7
@@
static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
if (dequeued < min) {
status = WaitForSingleObject(wd->iocomplete_event, mswait);
if (dequeued < min) {
status = WaitForSingleObject(wd->iocomplete_event, mswait);
- if (status != WAIT_OBJECT_0 && dequeued >
0
)
+ if (status != WAIT_OBJECT_0 && dequeued >
= min
)
break;
}
break;
}
@@
-308,7
+314,7
@@
static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
LPOVERLAPPED lpOvl = NULL;
struct windowsaio_data *wd;
DWORD iobytes;
LPOVERLAPPED lpOvl = NULL;
struct windowsaio_data *wd;
DWORD iobytes;
- BOOL success;
+ BOOL success
= FALSE
;
int index;
int rc = FIO_Q_COMPLETED;
int index;
int rc = FIO_Q_COMPLETED;
@@
-317,17
+323,15
@@
static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
wd = td->io_ops->data;
for (index = 0; index < td->o.iodepth; index++) {
wd = td->io_ops->data;
for (index = 0; index < td->o.iodepth; index++) {
- if (wd->ovls[index].io_free) {
- wd->ovls[index].io_free = FALSE;
- ResetEvent(wd->ovls[index].o.hEvent);
+ if (wd->ovls[index].io_free)
break;
break;
- }
}
assert(index < td->o.iodepth);
}
assert(index < td->o.iodepth);
-
lpOvl = &wd->ovls[index].o
;
+
wd->ovls[index].io_free = FALSE
;
wd->ovls[index].io_u = io_u;
wd->ovls[index].io_u = io_u;
+ lpOvl = &wd->ovls[index].o;
lpOvl->Internal = STATUS_PENDING;
lpOvl->InternalHigh = 0;
lpOvl->Offset = io_u->offset & 0xFFFFFFFF;
lpOvl->Internal = STATUS_PENDING;
lpOvl->InternalHigh = 0;
lpOvl->Offset = io_u->offset & 0xFFFFFFFF;
@@
-358,6
+362,7
@@
static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
break;
default:
assert(0);
break;
default:
assert(0);
+ break;
}
if (success || GetLastError() == ERROR_IO_PENDING)
}
if (success || GetLastError() == ERROR_IO_PENDING)