luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: fix iocp emulation bugs for tcp handles

Browse Source 
Makes ipc_tcp_connection pass on Windows XP
This commit is contained in:
Bert Belder 2012-05-04 13:54:02 -07:00
parent ef9a9f1f78
commit b750dec517
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/win/tcp.c
View File

@ -310,10 +310,10 @@ int uv__tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
static void CALLBACK post_completion(void* context, BOOLEAN timed_out) { static void CALLBACK post_completion(void* context, BOOLEAN timed_out) {
uv_tcp_accept_t* req; uv_req_t* req;
uv_tcp_t* handle; uv_tcp_t* handle;
req = (uv_tcp_accept_t*) context; req = (uv_req_t*) context;
assert(req != NULL); assert(req != NULL);
handle = (uv_tcp_t*)req->data; handle = (uv_tcp_t*)req->data;
assert(handle != NULL); assert(handle != NULL);
@ -328,6 +328,25 @@ static void CALLBACK post_completion(void* context, BOOLEAN timed_out) {
} }
static void CALLBACK post_write_completion(void* context, BOOLEAN timed_out) {
uv_write_t* req;
uv_tcp_t* handle;
req = (uv_write_t*) context;
assert(req != NULL);
handle = (uv_tcp_t*)req->handle;
assert(handle != NULL);
assert(!timed_out);
if (!PostQueuedCompletionStatus(handle->loop->iocp,
req->overlapped.InternalHigh,
0,
&req->overlapped)) {
uv_fatal_error(GetLastError(), "PostQueuedCompletionStatus");
}
}
static void uv_tcp_queue_accept(uv_tcp_t* handle, uv_tcp_accept_t* req) { static void uv_tcp_queue_accept(uv_tcp_t* handle, uv_tcp_accept_t* req) {
uv_loop_t* loop = handle->loop; uv_loop_t* loop = handle->loop;
BOOL success; BOOL success;
@ -381,7 +400,7 @@ static void uv_tcp_queue_accept(uv_tcp_t* handle, uv_tcp_accept_t* req) {
if (handle->flags & UV_HANDLE_EMULATE_IOCP && if (handle->flags & UV_HANDLE_EMULATE_IOCP &&
req->wait_handle == INVALID_HANDLE_VALUE && req->wait_handle == INVALID_HANDLE_VALUE &&
!RegisterWaitForSingleObject(&req->wait_handle, !RegisterWaitForSingleObject(&req->wait_handle,
req->overlapped.hEvent, post_completion, (void*) req, req->event_handle, post_completion, (void*) req,
INFINITE, WT_EXECUTEINWAITTHREAD)) { INFINITE, WT_EXECUTEINWAITTHREAD)) {
SET_REQ_ERROR(req, GetLastError()); SET_REQ_ERROR(req, GetLastError());
uv_insert_pending_req(loop, (uv_req_t*)req); uv_insert_pending_req(loop, (uv_req_t*)req);
@ -460,7 +479,7 @@ static void uv_tcp_queue_read(uv_loop_t* loop, uv_tcp_t* handle) {
if (handle->flags & UV_HANDLE_EMULATE_IOCP && if (handle->flags & UV_HANDLE_EMULATE_IOCP &&
req->wait_handle == INVALID_HANDLE_VALUE && req->wait_handle == INVALID_HANDLE_VALUE &&
!RegisterWaitForSingleObject(&req->wait_handle, !RegisterWaitForSingleObject(&req->wait_handle,
req->overlapped.hEvent, post_completion, (void*) req, req->event_handle, post_completion, (void*) req,
INFINITE, WT_EXECUTEINWAITTHREAD)) { INFINITE, WT_EXECUTEINWAITTHREAD)) {
SET_REQ_ERROR(req, GetLastError()); SET_REQ_ERROR(req, GetLastError());
uv_insert_pending_req(loop, (uv_req_t*)req); uv_insert_pending_req(loop, (uv_req_t*)req);
@ -837,6 +856,7 @@ int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle,
uv_fatal_error(GetLastError(), "CreateEvent"); uv_fatal_error(GetLastError(), "CreateEvent");
} }
req->overlapped.hEvent = (HANDLE) ((ULONG_PTR) req->event_handle | 1); req->overlapped.hEvent = (HANDLE) ((ULONG_PTR) req->event_handle | 1);
req->wait_handle = INVALID_HANDLE_VALUE;
} }
result = WSASend(handle->socket, result = WSASend(handle->socket,
@ -862,10 +882,9 @@ int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle,
handle->write_queue_size += req->queued_bytes; handle->write_queue_size += req->queued_bytes;
uv_ref(loop); uv_ref(loop);
if (handle->flags & UV_HANDLE_EMULATE_IOCP && if (handle->flags & UV_HANDLE_EMULATE_IOCP &&
req->wait_handle == INVALID_HANDLE_VALUE &&
!RegisterWaitForSingleObject(&req->wait_handle, !RegisterWaitForSingleObject(&req->wait_handle,
req->overlapped.hEvent, post_completion, (void*) req, req->event_handle, post_write_completion, (void*) req,
INFINITE, WT_EXECUTEINWAITTHREAD)) { INFINITE, WT_EXECUTEINWAITTHREAD | WT_EXECUTEONLYONCE)) {
SET_REQ_ERROR(req, GetLastError()); SET_REQ_ERROR(req, GetLastError());
uv_insert_pending_req(loop, (uv_req_t*)req); uv_insert_pending_req(loop, (uv_req_t*)req);
} }
@ -1005,11 +1024,9 @@ void uv_process_tcp_write_req(uv_loop_t* loop, uv_tcp_t* handle,
if (handle->flags & UV_HANDLE_EMULATE_IOCP) { if (handle->flags & UV_HANDLE_EMULATE_IOCP) {
if (req->wait_handle != INVALID_HANDLE_VALUE) { if (req->wait_handle != INVALID_HANDLE_VALUE) {
UnregisterWait(req->wait_handle); UnregisterWait(req->wait_handle);
req->wait_handle = INVALID_HANDLE_VALUE;
} }
if (req->event_handle) { if (req->event_handle) {
CloseHandle(req->event_handle); CloseHandle(req->event_handle);
req->event_handle = NULL;
} }
} }