diff options
Diffstat (limited to 'file_io/win32/readwrite.c')
| -rw-r--r-- | file_io/win32/readwrite.c | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index bf7cbfb30..23d2358e7 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -31,7 +31,6 @@ static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t len_in, apr_size_t *nbytes) { apr_status_t rv; - DWORD res; DWORD len = (DWORD)len_in; DWORD bytesread = 0; @@ -80,19 +79,26 @@ static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t le else { rv = apr_get_os_error(); if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) { - /* Wait for the pending i/o, timeout converted from us to ms - * Note that we loop if someone gives up the event, since - * folks suggest that WAIT_ABANDONED isn't actually a result - * but an alert that ownership of the event has passed from - * one owner to a new proc/thread. - */ - do { - res = WaitForSingleObject(file->pOverlapped->hEvent, - (file->timeout > 0) - ? (DWORD)(file->timeout/1000) - : ((file->timeout == -1) - ? INFINITE : 0)); - } while (res == WAIT_ABANDONED); + DWORD res; + + /* It seems that ReadFile() return ERROR_IO_PENDING even + * when I/O operation completed syncronously. + * Use fast macro to check that overlapped I/O already + * completed to avoid kernel call. + */ + if (HasOverlappedIoCompleted(file->pOverlapped)) { + res = WAIT_OBJECT_0; + } + else { + /* Wait for the pending i/o, timeout converted from us to ms + * Note that we loop if someone gives up the event. + * + * NOTE: We do not handle WAIT_ABANDONED here because they + * can be returned only when waiting for mutex. + */ + res = apr_wait_for_single_object(file->pOverlapped->hEvent, + file->timeout); + } /* There is one case that represents entirely * successful operations, otherwise we will cancel @@ -241,7 +247,7 @@ APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size if ((thefile->flags & APR_FOPEN_XTHREAD) && !thefile->pOverlapped ) { thefile->pOverlapped = (OVERLAPPED*) apr_pcalloc(thefile->pool, sizeof(OVERLAPPED)); - thefile->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + thefile->pOverlapped->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (!thefile->pOverlapped->hEvent) { rv = apr_get_os_error(); return rv; @@ -388,7 +394,7 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a if ((thefile->flags & APR_FOPEN_XTHREAD) && !thefile->pOverlapped ) { thefile->pOverlapped = (OVERLAPPED*) apr_pcalloc(thefile->pool, sizeof(OVERLAPPED)); - thefile->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + thefile->pOverlapped->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (!thefile->pOverlapped->hEvent) { rv = apr_get_os_error(); return rv; @@ -492,20 +498,20 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) { - DWORD timeout_ms; DWORD res; - if (thefile->timeout == 0) { - timeout_ms = 0; - } - else if (thefile->timeout < 0) { - timeout_ms = INFINITE; + /* It seems that WriteFile() return ERROR_IO_PENDING even + * when I/O operation completed syncronously. + * Use fast macro to check that overlapped I/O already + * completed to avoid kernel call. + */ + if (HasOverlappedIoCompleted(thefile->pOverlapped)) { + res = WAIT_OBJECT_0; } else { - timeout_ms = (DWORD)(thefile->timeout / 1000); + res = apr_wait_for_single_object(thefile->pOverlapped->hEvent, + thefile->timeout); } - - res = WaitForSingleObject(thefile->pOverlapped->hEvent, timeout_ms); /* There is one case that represents entirely * successful operations, otherwise we will cancel @@ -533,7 +539,7 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a && (res == WAIT_TIMEOUT)) rv = APR_TIMEUP; - if (rv == APR_TIMEUP && timeout_ms == 0) { + if (rv == APR_TIMEUP && thefile->timeout == 0) { rv = APR_EAGAIN; } } @@ -624,7 +630,7 @@ APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile) if ((thefile->flags & APR_FOPEN_XTHREAD) && !thefile->pOverlapped) { thefile->pOverlapped = (OVERLAPPED*) apr_pcalloc(thefile->pool, sizeof(OVERLAPPED)); - thefile->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + thefile->pOverlapped->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (!thefile->pOverlapped->hEvent) { rv = apr_get_os_error(); return rv; |