-
-
Save pietern/93bffdb246545f272a8f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/include/uv-private/uv-win.h b/include/uv-private/uv-win.h | |
index c43313f..1364a20 100644 | |
--- a/include/uv-private/uv-win.h | |
+++ b/include/uv-private/uv-win.h | |
@@ -125,6 +125,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s); | |
#define uv_stream_connection_fields \ | |
unsigned int write_reqs_pending; \ | |
+ uv_write_t* write_reqs_tail; \ | |
uv_shutdown_t* shutdown_req; | |
#define uv_stream_server_fields \ | |
diff --git a/src/win/internal.h b/src/win/internal.h | |
index ee1834e..1376646 100644 | |
--- a/src/win/internal.h | |
+++ b/src/win/internal.h | |
@@ -110,6 +110,7 @@ void uv_process_reqs(uv_loop_t* loop); | |
*/ | |
void uv_stream_init(uv_loop_t* loop, uv_stream_t* handle); | |
void uv_connection_init(uv_stream_t* handle); | |
+void uv_insert_pending_write_req(uv_stream_t* handle, uv_write_t* req); | |
size_t uv_count_bufs(uv_buf_t bufs[], int count); | |
diff --git a/src/win/pipe.c b/src/win/pipe.c | |
index 7832c6a..fa90488 100644 | |
--- a/src/win/pipe.c | |
+++ b/src/win/pipe.c | |
@@ -747,8 +747,11 @@ int uv_pipe_write(uv_loop_t* loop, uv_write_t* req, uv_pipe_t* handle, | |
req->type = UV_WRITE; | |
req->handle = (uv_stream_t*) handle; | |
req->cb = cb; | |
+ req->done = 0; | |
memset(&req->overlapped, 0, sizeof(req->overlapped)); | |
+ uv_insert_pending_write_req(handle, req); | |
+ | |
result = WriteFile(handle->handle, | |
bufs[0].base, | |
bufs[0].len, | |
@@ -886,22 +889,38 @@ void uv_process_pipe_write_req(uv_loop_t* loop, uv_pipe_t* handle, | |
handle->write_queue_size -= req->queued_bytes; | |
- if (req->cb) { | |
- if (!REQ_SUCCESS(req)) { | |
- loop->last_error = GET_REQ_UV_ERROR(req); | |
- ((uv_write_cb)req->cb)(req, -1); | |
+ req->done = 1; | |
+ | |
+ while (handle->write_reqs_tail) { | |
+ req = loop->pending_reqs_tail->next_req; | |
+ | |
+ if (!req->done) { | |
+ break; | |
+ } | |
+ | |
+ if (req == loop->pending_reqs_tail) { | |
+ handle->write_reqs_tail = NULL; | |
} else { | |
- ((uv_write_cb)req->cb)(req, 0); | |
+ handle->write_reqs_tail->next_req = req->next_req; | |
} | |
- } | |
- handle->write_reqs_pending--; | |
- if (handle->write_reqs_pending == 0 && | |
- handle->flags & UV_HANDLE_SHUTTING) { | |
- uv_want_endgame(loop, (uv_handle_t*)handle); | |
- } | |
+ if (req->cb) { | |
+ if (!REQ_SUCCESS(req)) { | |
+ loop->last_error = GET_REQ_UV_ERROR(req); | |
+ ((uv_write_cb)req->cb)(req, -1); | |
+ } else { | |
+ ((uv_write_cb)req->cb)(req, 0); | |
+ } | |
+ } | |
- DECREASE_PENDING_REQ_COUNT(handle); | |
+ handle->write_reqs_pending--; | |
+ if (handle->flags & UV_HANDLE_SHUTTING && | |
+ handle->write_reqs_pending == 0) { | |
+ uv_want_endgame(loop, (uv_handle_t*)handle); | |
+ } | |
+ | |
+ DECREASE_PENDING_REQ_COUNT(handle); | |
+ } | |
} | |
diff --git a/src/win/stream.c b/src/win/stream.c | |
index 2696411..cb03c2f 100644 | |
--- a/src/win/stream.c | |
+++ b/src/win/stream.c | |
@@ -41,6 +41,7 @@ void uv_stream_init(uv_loop_t* loop, uv_stream_t* handle) { | |
void uv_connection_init(uv_stream_t* handle) { | |
handle->flags |= UV_HANDLE_CONNECTION; | |
handle->write_reqs_pending = 0; | |
+ handle->write_reqs_tail = NULL; | |
uv_req_init(handle->loop, (uv_req_t*) &(handle->read_req)); | |
handle->read_req.type = UV_READ; | |
@@ -48,6 +49,19 @@ void uv_connection_init(uv_stream_t* handle) { | |
} | |
+void uv_insert_pending_write_req(uv_stream_t* handle, uv_write_t* req) { | |
+ req->next_req = NULL; | |
+ if (loop->pending_reqs_tail) { | |
+ req->next_req = handle->write_reqs_tail->next_req; | |
+ handle->write_reqs_tail->next_req = req; | |
+ handle->write_reqs_tail = req; | |
+ } else { | |
+ req->next_req = req; | |
+ handle->write_reqs_tail = req; | |
+ } | |
+} | |
+ | |
+ | |
int uv_listen(uv_stream_t* stream, int backlog, uv_connection_cb cb) { | |
switch (stream->type) { | |
case UV_TCP: | |
diff --git a/src/win/tcp.c b/src/win/tcp.c | |
index ebd8353..d2ebcbd 100644 | |
--- a/src/win/tcp.c | |
+++ b/src/win/tcp.c | |
@@ -644,8 +644,11 @@ int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle, | |
req->type = UV_WRITE; | |
req->handle = (uv_stream_t*) handle; | |
req->cb = cb; | |
+ req->done = 0; | |
memset(&req->overlapped, 0, sizeof(req->overlapped)); | |
+ uv_insert_pending_write_req(handle, req); | |
+ | |
result = WSASend(handle->socket, | |
(WSABUF*)bufs, | |
bufcnt, | |
@@ -781,18 +784,34 @@ void uv_process_tcp_write_req(uv_loop_t* loop, uv_tcp_t* handle, | |
handle->write_queue_size -= req->queued_bytes; | |
- if (req->cb) { | |
- loop->last_error = GET_REQ_UV_SOCK_ERROR(req); | |
- ((uv_write_cb)req->cb)(req, loop->last_error.code == UV_OK ? 0 : -1); | |
- } | |
+ req->done = 1; | |
- handle->write_reqs_pending--; | |
- if (handle->flags & UV_HANDLE_SHUTTING && | |
- handle->write_reqs_pending == 0) { | |
- uv_want_endgame(loop, (uv_handle_t*)handle); | |
- } | |
+ while (handle->write_reqs_tail) { | |
+ req = loop->pending_reqs_tail->next_req; | |
- DECREASE_PENDING_REQ_COUNT(handle); | |
+ if (!req->done) { | |
+ break; | |
+ } | |
+ | |
+ if (req == loop->pending_reqs_tail) { | |
+ handle->write_reqs_tail = NULL; | |
+ } else { | |
+ handle->write_reqs_tail->next_req = req->next_req; | |
+ } | |
+ | |
+ if (req->cb) { | |
+ loop->last_error = GET_REQ_UV_SOCK_ERROR(req); | |
+ ((uv_write_cb)req->cb)(req, loop->last_error.code == UV_OK ? 0 : -1); | |
+ } | |
+ | |
+ handle->write_reqs_pending--; | |
+ if (handle->flags & UV_HANDLE_SHUTTING && | |
+ handle->write_reqs_pending == 0) { | |
+ uv_want_endgame(loop, (uv_handle_t*)handle); | |
+ } | |
+ | |
+ DECREASE_PENDING_REQ_COUNT(handle); | |
+ } | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment