From: Bruce Cran Date: Tue, 5 Feb 2013 11:33:04 +0000 (+0000) Subject: windowsaio: fix file header format and improve error reporting. X-Git-Tag: fio-2.0.14~34 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=03244c1966aa645aa490a5671fdfb2cad41424c7 windowsaio: fix file header format and improve error reporting. Use the same file header format as other engines. Remove the copyright line. Add calls to log_err to improve error reporting. Signed-off-by: Jens Axboe --- diff --git a/engines/windowsaio.c b/engines/windowsaio.c index c0d1bd7d..4a007943 100644 --- a/engines/windowsaio.c +++ b/engines/windowsaio.c @@ -1,6 +1,7 @@ /* - * Native Windows async IO engine - * Copyright (C) 2012-2013 Bruce Cran + * windowsaio engine + * + * IO engine using Windows IO Completion Ports. */ #include @@ -37,13 +38,13 @@ struct thread_ctx { }; static int fio_windowsaio_cancel(struct thread_data *td, - struct io_u *io_u); + struct io_u *io_u); static BOOL timeout_expired(DWORD start_count, DWORD end_count); static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, - unsigned int max, struct timespec *t); + unsigned int max, struct timespec *t); static struct io_u *fio_windowsaio_event(struct thread_data *td, int event); static int fio_windowsaio_queue(struct thread_data *td, - struct io_u *io_u); + struct io_u *io_u); static void fio_windowsaio_cleanup(struct thread_data *td); static DWORD WINAPI IoCompletionRoutine(LPVOID lpParameter); static int fio_windowsaio_init(struct thread_data *td); @@ -132,23 +133,27 @@ static int fio_windowsaio_init(struct thread_data *td) HANDLE hKernel32Dll; int rc = 0; - wd = malloc(sizeof(struct windowsaio_data)); - if (wd != NULL) - ZeroMemory(wd, sizeof(struct windowsaio_data)); - else + wd = calloc(1, sizeof(struct windowsaio_data)); + if (wd == NULL) { + log_err("windowsaio: failed to allocate memory for engine data\n"); rc = 1; + } if (!rc) { wd->aio_events = malloc(td->o.iodepth * sizeof(struct io_u*)); - if (wd->aio_events == NULL) + if (wd->aio_events == NULL) { + log_err("windowsaio: failed to allocate memory for aio events list\n"); rc = 1; + } } if (!rc) { /* Create an auto-reset event */ wd->iocomplete_event = CreateEvent(NULL, FALSE, FALSE, NULL); - if (wd->iocomplete_event == NULL) + if (wd->iocomplete_event == NULL) { + log_err("windowsaio: failed to create io complete event handle\n"); rc = 1; + } } if (rc) { @@ -164,15 +169,16 @@ static int fio_windowsaio_init(struct thread_data *td) wd->pCancelIoEx = (CANCELIOEX)GetProcAddress(hKernel32Dll, "CancelIoEx"); td->io_ops->data = wd; - if (!rc) { struct thread_ctx *ctx; struct windowsaio_data *wd; HANDLE hFile; hFile = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { + log_err("windowsaio: failed to create io completion port\n"); rc = 1; + } wd = td->io_ops->data; wd->iothread_running = TRUE; @@ -183,7 +189,7 @@ static int fio_windowsaio_init(struct thread_data *td) if (!rc && ctx == NULL) { - log_err("fio: out of memory in windowsaio\n"); + log_err("windowsaio: failed to allocate memory for thread context structure\n"); CloseHandle(hFile); rc = 1; } @@ -193,6 +199,8 @@ static int fio_windowsaio_init(struct thread_data *td) ctx->iocp = hFile; ctx->wd = wd; wd->iothread = CreateThread(NULL, 0, IoCompletionRoutine, ctx, 0, NULL); + if (wd->iothread == NULL) + log_err("windowsaio: failed to create io completion thread\n"); } if (rc || wd->iothread == NULL) @@ -234,12 +242,12 @@ static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) dprint(FD_FILE, "fd open %s\n", f->file_name); if (f->filetype == FIO_TYPE_PIPE) { - log_err("fio: windowsaio doesn't support pipes\n"); + log_err("windowsaio: pipes are not supported\n"); return 1; } if (!strcmp(f->file_name, "-")) { - log_err("fio: can't read/write to stdin/out\n"); + log_err("windowsaio: can't read/write to stdin/out\n"); return 1; } @@ -271,8 +279,10 @@ static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) f->hFile = CreateFile(f->file_name, access, sharemode, NULL, openmode, flags, NULL); - if (f->hFile == INVALID_HANDLE_VALUE) + if (f->hFile == INVALID_HANDLE_VALUE) { + log_err("windowsaio: failed to open file \"%s\"\n", f->file_name); rc = 1; + } /* Only set up the completion port and thread if we're not just * querying the device size */ @@ -281,8 +291,10 @@ static int fio_windowsaio_open_file(struct thread_data *td, struct fio_file *f) wd = td->io_ops->data; - if (CreateIoCompletionPort(f->hFile, wd->iocp, 0, 0) == NULL) + if (CreateIoCompletionPort(f->hFile, wd->iocp, 0, 0) == NULL) { + log_err("windowsaio: failed to create io completion port\n"); rc = 1; + } } return rc; @@ -295,8 +307,10 @@ static int fio_windowsaio_close_file(struct thread_data fio_unused *td, struct f dprint(FD_FILE, "fd close %s\n", f->file_name); if (f->hFile != INVALID_HANDLE_VALUE) { - if (!CloseHandle(f->hFile)) + if (!CloseHandle(f->hFile)) { + log_info("windowsaio: failed to close file handle for \"%s\"\n", f->file_name); rc = 1; + } } f->hFile = INVALID_HANDLE_VALUE; @@ -325,7 +339,7 @@ static struct io_u* fio_windowsaio_event(struct thread_data *td, int event) } static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, - unsigned int max, struct timespec *t) + unsigned int max, struct timespec *t) { struct windowsaio_data *wd = td->io_ops->data; struct flist_head *entry; @@ -362,7 +376,7 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min, if (dequeued < min) { status = WaitForSingleObject(wd->iocomplete_event, mswait); if (status != WAIT_OBJECT_0 && dequeued >= min) - break; + break; } if (dequeued >= min || (t != NULL && timeout_expired(start_count, end_count))) @@ -398,13 +412,15 @@ static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u) case DDIR_DATASYNC: case DDIR_SYNC_FILE_RANGE: success = FlushFileBuffers(io_u->file->hFile); - if (!success) - io_u->error = win_to_posix_error(GetLastError()); + if (!success) { + log_err("windowsaio: failed to flush file buffers\n"); + io_u->error = win_to_posix_error(GetLastError()); + } return FIO_Q_COMPLETED; break; case DDIR_TRIM: - log_err("manual TRIM isn't supported on Windows"); + log_err("windowsaio: manual TRIM isn't supported on Windows\n"); io_u->error = 1; io_u->resid = io_u->xfer_buflen; return FIO_Q_COMPLETED; @@ -463,7 +479,7 @@ static DWORD WINAPI IoCompletionRoutine(LPVOID lpParameter) } static int fio_windowsaio_cancel(struct thread_data *td, - struct io_u *io_u) + struct io_u *io_u) { int rc = 0; @@ -473,8 +489,10 @@ static int fio_windowsaio_cancel(struct thread_data *td, if (wd->pCancelIoEx != NULL) { struct fio_overlapped *ovl = io_u->engine_data; - if (!wd->pCancelIoEx(io_u->file->hFile, &ovl->o)) + if (!wd->pCancelIoEx(io_u->file->hFile, &ovl->o)) { + log_err("windowsaio: failed to cancel io\n"); rc = 1; + } } else rc = 1; @@ -500,7 +518,8 @@ static int fio_windowsaio_io_u_init(struct thread_data *td, struct io_u *io_u) o->io_complete = FALSE; o->io_u = io_u; o->o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - if (!o->o.hEvent) { + if (o->o.hEvent == NULL) { + log_err("windowsaio: failed to create event handle\n"); free(o); return 1; }