Addressing comments.
diff --git a/Makefile b/Makefile
index 7a4ca93..8ca21b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1420,6 +1420,7 @@
src/core/iomgr/endpoint.c \
src/core/iomgr/endpoint_pair_posix.c \
src/core/iomgr/fd_posix.c \
+ src/core/iomgr/iocp_windows.c \
src/core/iomgr/iomgr.c \
src/core/iomgr/iomgr_posix.c \
src/core/iomgr/iomgr_windows.c \
@@ -1551,6 +1552,7 @@
src/core/iomgr/endpoint.c: $(OPENSSL_DEP)
src/core/iomgr/endpoint_pair_posix.c: $(OPENSSL_DEP)
src/core/iomgr/fd_posix.c: $(OPENSSL_DEP)
+src/core/iomgr/iocp_windows.c: $(OPENSSL_DEP)
src/core/iomgr/iomgr.c: $(OPENSSL_DEP)
src/core/iomgr/iomgr_posix.c: $(OPENSSL_DEP)
src/core/iomgr/iomgr_windows.c: $(OPENSSL_DEP)
@@ -1704,6 +1706,7 @@
objs/$(CONFIG)/src/core/iomgr/endpoint.o:
objs/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o:
objs/$(CONFIG)/src/core/iomgr/fd_posix.o:
+objs/$(CONFIG)/src/core/iomgr/iocp_windows.o:
objs/$(CONFIG)/src/core/iomgr/iomgr.o:
objs/$(CONFIG)/src/core/iomgr/iomgr_posix.o:
objs/$(CONFIG)/src/core/iomgr/iomgr_windows.o:
@@ -1876,6 +1879,7 @@
src/core/iomgr/endpoint.c \
src/core/iomgr/endpoint_pair_posix.c \
src/core/iomgr/fd_posix.c \
+ src/core/iomgr/iocp_windows.c \
src/core/iomgr/iomgr.c \
src/core/iomgr/iomgr_posix.c \
src/core/iomgr/iomgr_windows.c \
@@ -2012,6 +2016,7 @@
objs/$(CONFIG)/src/core/iomgr/endpoint.o:
objs/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o:
objs/$(CONFIG)/src/core/iomgr/fd_posix.o:
+objs/$(CONFIG)/src/core/iomgr/iocp_windows.o:
objs/$(CONFIG)/src/core/iomgr/iomgr.o:
objs/$(CONFIG)/src/core/iomgr/iomgr_posix.o:
objs/$(CONFIG)/src/core/iomgr/iomgr_windows.o:
diff --git a/build.json b/build.json
index 4a23f24..d2ce510 100644
--- a/build.json
+++ b/build.json
@@ -42,10 +42,10 @@
"src/core/iomgr/endpoint.h",
"src/core/iomgr/endpoint_pair.h",
"src/core/iomgr/fd_posix.h",
+ "src/core/iomgr/iocp_windows.h",
"src/core/iomgr/iomgr.h",
"src/core/iomgr/iomgr_internal.h",
"src/core/iomgr/iomgr_posix.h",
- "src/core/iomgr/iomgr_windows.h",
"src/core/iomgr/pollset.h",
"src/core/iomgr/pollset_kick.h",
"src/core/iomgr/pollset_kick_posix.h",
@@ -132,6 +132,7 @@
"src/core/iomgr/endpoint.c",
"src/core/iomgr/endpoint_pair_posix.c",
"src/core/iomgr/fd_posix.c",
+ "src/core/iomgr/iocp_windows.c",
"src/core/iomgr/iomgr.c",
"src/core/iomgr/iomgr_posix.c",
"src/core/iomgr/iomgr_windows.c",
diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c
new file mode 100644
index 0000000..729b11b
--- /dev/null
+++ b/src/core/iomgr/iocp_windows.c
@@ -0,0 +1,200 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_WINSOCK_SOCKET
+
+#include <winsock2.h>
+
+#include <grpc/support/log.h>
+#include <grpc/support/log_win32.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/thd.h>
+
+#include "src/core/iomgr/alarm_internal.h"
+#include "src/core/iomgr/iocp_windows.h"
+#include "src/core/iomgr/iomgr_internal.h"
+#include "src/core/iomgr/socket_windows.h"
+
+static ULONG g_iocp_kick_token;
+static OVERLAPPED g_iocp_custom_overlap;
+
+static gpr_event g_shutdown_iocp;
+static gpr_event g_iocp_done;
+
+static HANDLE g_iocp;
+
+static int do_iocp_work() {
+ BOOL success;
+ DWORD bytes = 0;
+ DWORD flags = 0;
+ ULONG_PTR completion_key;
+ LPOVERLAPPED overlapped;
+ gpr_timespec wait_time = gpr_inf_future;
+ grpc_winsocket *socket;
+ grpc_winsocket_callback_info *info;
+ void(*f)(void *, int) = NULL;
+ void *opaque = NULL;
+ success = GetQueuedCompletionStatus(g_iocp, &bytes,
+ &completion_key, &overlapped,
+ gpr_time_to_millis(wait_time));
+ if (!success && !overlapped) {
+ /* The deadline got attained. */
+ return 0;
+ }
+ GPR_ASSERT(completion_key && overlapped);
+ if (overlapped == &g_iocp_custom_overlap) {
+ if (completion_key == (ULONG_PTR) &g_iocp_kick_token) {
+ /* We were awoken from a kick. */
+ gpr_log(GPR_DEBUG, "do_iocp_work - got a kick");
+ return 1;
+ }
+ gpr_log(GPR_ERROR, "Unknown custom completion key.");
+ abort();
+ }
+
+ socket = (grpc_winsocket*) completion_key;
+ if (overlapped == &socket->write_info.overlapped) {
+ gpr_log(GPR_DEBUG, "do_iocp_work - got write packet");
+ info = &socket->write_info;
+ } else if (overlapped == &socket->read_info.overlapped) {
+ gpr_log(GPR_DEBUG, "do_iocp_work - got read packet");
+ info = &socket->read_info;
+ } else {
+ gpr_log(GPR_ERROR, "Unknown IOCP operation");
+ abort();
+ }
+ success = WSAGetOverlappedResult(socket->socket, &info->overlapped, &bytes,
+ FALSE, &flags);
+ gpr_log(GPR_DEBUG, "bytes: %u, flags: %u - op %s", bytes, flags,
+ success ? "succeeded" : "failed");
+ info->bytes_transfered = bytes;
+ info->wsa_error = success ? 0 : WSAGetLastError();
+ GPR_ASSERT(overlapped == &info->overlapped);
+ gpr_mu_lock(&socket->state_mu);
+ GPR_ASSERT(!info->has_pending_iocp);
+ if (info->cb) {
+ f = info->cb;
+ opaque = info->opaque;
+ info->cb = NULL;
+ } else {
+ info->has_pending_iocp = 1;
+ }
+ gpr_mu_unlock(&socket->state_mu);
+ if (f) f(opaque, 1);
+
+ return 1;
+}
+
+static void iocp_loop(void *p) {
+ while (!gpr_event_get(&g_shutdown_iocp)) {
+ grpc_maybe_call_delayed_callbacks(NULL, 1);
+ do_iocp_work();
+ }
+
+ gpr_event_set(&g_iocp_done, (void *)1);
+}
+
+void grpc_iocp_init(void) {
+ gpr_thd_id id;
+
+ g_iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL,
+ (ULONG_PTR)NULL, 0);
+ GPR_ASSERT(g_iocp);
+
+ gpr_event_init(&g_iocp_done);
+ gpr_event_init(&g_shutdown_iocp);
+ gpr_thd_new(&id, iocp_loop, NULL, NULL);
+}
+
+void grpc_iocp_shutdown(void) {
+ BOOL success;
+ gpr_event_set(&g_shutdown_iocp, (void *)1);
+ success = PostQueuedCompletionStatus(g_iocp, 0,
+ (ULONG_PTR) &g_iocp_kick_token,
+ &g_iocp_custom_overlap);
+ GPR_ASSERT(success);
+ gpr_event_wait(&g_iocp_done, gpr_inf_future);
+ success = CloseHandle(g_iocp);
+ GPR_ASSERT(success);
+}
+
+void grpc_iocp_add_socket(grpc_winsocket *socket) {
+ HANDLE ret;
+ if (socket->added_to_iocp) return;
+ ret = CreateIoCompletionPort((HANDLE)socket->socket,
+ g_iocp, (gpr_uintptr) socket, 0);
+ if (!ret) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message);
+ gpr_free(utf8_message);
+ __debugbreak();
+ abort();
+ }
+ socket->added_to_iocp = 1;
+ GPR_ASSERT(ret == g_iocp);
+}
+
+static void socket_notify_on_iocp(grpc_winsocket *socket,
+ void(*cb)(void *, int), void *opaque,
+ grpc_winsocket_callback_info *info) {
+ int run_now = 0;
+ GPR_ASSERT(!info->cb);
+ gpr_mu_lock(&socket->state_mu);
+ if (info->has_pending_iocp) {
+ run_now = 1;
+ info->has_pending_iocp = 0;
+ gpr_log(GPR_DEBUG, "socket_notify_on_iocp - runs now");
+ } else {
+ info->cb = cb;
+ info->opaque = opaque;
+ gpr_log(GPR_DEBUG, "socket_notify_on_iocp - queued");
+ }
+ gpr_mu_unlock(&socket->state_mu);
+ if (run_now) cb(opaque, 1);
+}
+
+void grpc_socket_notify_on_write(grpc_winsocket *socket,
+ void(*cb)(void *, int), void *opaque) {
+ gpr_log(GPR_DEBUG, "grpc_socket_notify_on_write");
+ socket_notify_on_iocp(socket, cb, opaque, &socket->write_info);
+}
+
+void grpc_socket_notify_on_read(grpc_winsocket *socket,
+ void(*cb)(void *, int), void *opaque) {
+ gpr_log(GPR_DEBUG, "grpc_socket_notify_on_read");
+ socket_notify_on_iocp(socket, cb, opaque, &socket->read_info);
+}
+
+#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/iomgr_windows.h b/src/core/iomgr/iocp_windows.h
similarity index 74%
rename from src/core/iomgr/iomgr_windows.h
rename to src/core/iomgr/iocp_windows.h
index 2d9449c..bf5b909 100644
--- a/src/core/iomgr/iomgr_windows.h
+++ b/src/core/iomgr/iocp_windows.h
@@ -31,12 +31,22 @@
*
*/
-#ifndef __GRPC_INTERNAL_IOMGR_IOMGR_WINDOWS_H_
-#define __GRPC_INTERNAL_IOMGR_IOMGR_WINDOWS_H_
+#ifndef __GRPC_INTERNAL_IOMGR_IOCP_WINDOWS_H_
+#define __GRPC_INTERNAL_IOMGR_IOCP_WINDOWS_H_
+
+#include <windows.h>
+#include <grpc/support/sync.h>
#include "src/core/iomgr/socket_windows.h"
-void grpc_pollset_global_init(void);
-void grpc_pollset_global_shutdown(void);
+void grpc_iocp_init(void);
+void grpc_iocp_shutdown(void);
+void grpc_iocp_add_socket(grpc_winsocket *);
-#endif /* __GRPC_INTERNAL_IOMGR_IOMGR_WINDOWS_H_ */
+void grpc_socket_notify_on_write(grpc_winsocket *, void(*cb)(void *, int success),
+ void *opaque);
+
+void grpc_socket_notify_on_read(grpc_winsocket *, void(*cb)(void *, int success),
+ void *opaque);
+
+#endif /* __GRPC_INTERNAL_IOMGR_IOCP_WINDOWS_H_ */
diff --git a/src/core/iomgr/iomgr_windows.c b/src/core/iomgr/iomgr_windows.c
index 5c8382e..a3a255e 100644
--- a/src/core/iomgr/iomgr_windows.c
+++ b/src/core/iomgr/iomgr_windows.c
@@ -40,8 +40,8 @@
#include <grpc/support/log.h>
#include "src/core/iomgr/socket_windows.h"
+#include "src/core/iomgr/iocp_windows.h"
#include "src/core/iomgr/iomgr.h"
-#include "src/core/iomgr/iomgr_windows.h"
static void winsock_init(void) {
WSADATA wsaData;
@@ -56,11 +56,11 @@
void grpc_iomgr_platform_init(void) {
winsock_init();
- grpc_pollset_global_init();
+ grpc_iocp_init();
}
void grpc_iomgr_platform_shutdown(void) {
- grpc_pollset_global_shutdown();
+ grpc_iocp_shutdown();
winsock_shutdown();
}
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c
index 134e6f4..b81d23e 100644
--- a/src/core/iomgr/pollset_windows.c
+++ b/src/core/iomgr/pollset_windows.c
@@ -35,106 +35,20 @@
#ifdef GPR_WINSOCK_SOCKET
-#include <winsock2.h>
-
-#include <grpc/support/log.h>
-#include <grpc/support/log_win32.h>
-#include <grpc/support/alloc.h>
#include <grpc/support/thd.h>
#include "src/core/iomgr/alarm_internal.h"
-#include "src/core/iomgr/socket_windows.h"
#include "src/core/iomgr/iomgr_internal.h"
#include "src/core/iomgr/pollset_windows.h"
-static grpc_pollset g_global_pollset;
-static ULONG g_pollset_kick_token;
-static OVERLAPPED g_pollset_custom_overlap;
-
-static gpr_event g_shutdown_global_poller;
-static gpr_event g_global_poller_done;
-
void grpc_pollset_init(grpc_pollset *pollset) {
gpr_mu_init(&pollset->mu);
gpr_cv_init(&pollset->cv);
- pollset->iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL,
- (ULONG_PTR)NULL, 0);
- GPR_ASSERT(pollset->iocp);
}
void grpc_pollset_destroy(grpc_pollset *pollset) {
- BOOL status;
gpr_mu_destroy(&pollset->mu);
gpr_cv_destroy(&pollset->cv);
- status = CloseHandle(pollset->iocp);
- GPR_ASSERT(status);
-}
-
-static int pollset_poll(grpc_pollset *pollset,
- gpr_timespec deadline, gpr_timespec now) {
- BOOL success;
- DWORD bytes = 0;
- DWORD flags = 0;
- ULONG_PTR completion_key;
- LPOVERLAPPED overlapped;
- gpr_timespec wait_time = gpr_time_sub(deadline, now);
- grpc_winsocket *socket;
- grpc_winsocket_callback_info *info;
- void(*f)(void *, int) = NULL;
- void *opaque = NULL;
- gpr_mu_unlock(&pollset->mu);
- success = GetQueuedCompletionStatus(pollset->iocp, &bytes,
- &completion_key, &overlapped,
- gpr_time_to_millis(wait_time));
- gpr_mu_lock(&pollset->mu);
- if (!success && !overlapped) {
- /* The deadline got attained. */
- return 0;
- }
- GPR_ASSERT(completion_key && overlapped);
- if (overlapped == &g_pollset_custom_overlap) {
- if (completion_key == (ULONG_PTR) &g_pollset_kick_token) {
- /* We were awoken from a kick. */
- gpr_log(GPR_DEBUG, "pollset_poll - got a kick");
- return 1;
- }
- gpr_log(GPR_ERROR, "Unknown custom completion key.");
- abort();
- }
-
- GPR_ASSERT(pollset == &g_global_pollset);
-
- socket = (grpc_winsocket*) completion_key;
- if (overlapped == &socket->write_info.overlapped) {
- gpr_log(GPR_DEBUG, "pollset_poll - got write packet");
- info = &socket->write_info;
- } else if (overlapped == &socket->read_info.overlapped) {
- gpr_log(GPR_DEBUG, "pollset_poll - got read packet");
- info = &socket->read_info;
- } else {
- gpr_log(GPR_ERROR, "Unknown IOCP operation");
- abort();
- }
- success = WSAGetOverlappedResult(socket->socket, &info->overlapped, &bytes,
- FALSE, &flags);
- gpr_log(GPR_DEBUG, "bytes: %u, flags: %u - op %s", bytes, flags,
- success ? "succeeded" : "failed");
- info->bytes_transfered = bytes;
- info->wsa_error = success ? 0 : WSAGetLastError();
- GPR_ASSERT(overlapped == &info->overlapped);
- gpr_mu_lock(&socket->state_mu);
- GPR_ASSERT(!info->has_pending_iocp);
- if (info->cb) {
- f = info->cb;
- opaque = info->opaque;
- info->cb = NULL;
- } else {
- info->has_pending_iocp = 1;
- }
- gpr_mu_unlock(&socket->state_mu);
- if (f) f(opaque, 1);
-
- return 1;
}
int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) {
@@ -149,93 +63,9 @@
if (grpc_alarm_check(NULL, now, &deadline)) {
return 1;
}
- return pollset_poll(pollset, deadline, now);
+ return 0;
}
-void grpc_pollset_kick(grpc_pollset *pollset) {
- BOOL status;
- status = PostQueuedCompletionStatus(pollset->iocp, 0,
- (ULONG_PTR) &g_pollset_kick_token,
- &g_pollset_custom_overlap);
- GPR_ASSERT(status);
-}
-
-static void global_poller(void *p) {
- while (!gpr_event_get(&g_shutdown_global_poller)) {
- gpr_mu_lock(&g_global_pollset.mu);
- grpc_pollset_work(&g_global_pollset, gpr_inf_future);
- gpr_mu_unlock(&g_global_pollset.mu);
- }
-
- gpr_event_set(&g_global_poller_done, (void *) 1);
-}
-
-void grpc_pollset_global_init(void) {
- gpr_thd_id id;
-
- grpc_pollset_init(&g_global_pollset);
- gpr_event_init(&g_global_poller_done);
- gpr_event_init(&g_shutdown_global_poller);
- gpr_thd_new(&id, global_poller, NULL, NULL);
-}
-
-void grpc_pollset_global_shutdown(void) {
- gpr_event_set(&g_shutdown_global_poller, (void *) 1);
- grpc_pollset_kick(&g_global_pollset);
- gpr_event_wait(&g_global_poller_done, gpr_inf_future);
- grpc_pollset_destroy(&g_global_pollset);
-}
-
-void grpc_pollset_add_handle(grpc_pollset *pollset, grpc_winsocket *socket) {
- HANDLE ret;
- if (socket->added_to_iocp) return;
- ret = CreateIoCompletionPort((HANDLE)socket->socket,
- g_global_pollset.iocp,
- (gpr_uintptr) socket, 0);
- if (!ret) {
- char *utf8_message = gpr_format_message(WSAGetLastError());
- gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message);
- gpr_free(utf8_message);
- __debugbreak();
- abort();
- }
- socket->added_to_iocp = 1;
- GPR_ASSERT(ret == g_global_pollset.iocp);
-}
-
-static void handle_notify_on_iocp(grpc_winsocket *socket,
- void(*cb)(void *, int), void *opaque,
- grpc_winsocket_callback_info *info) {
- int run_now = 0;
- GPR_ASSERT(!info->cb);
- gpr_mu_lock(&socket->state_mu);
- if (info->has_pending_iocp) {
- run_now = 1;
- info->has_pending_iocp = 0;
- gpr_log(GPR_DEBUG, "handle_notify_on_iocp - runs now");
- } else {
- info->cb = cb;
- info->opaque = opaque;
- gpr_log(GPR_DEBUG, "handle_notify_on_iocp - queued");
- }
- gpr_mu_unlock(&socket->state_mu);
- if (run_now) cb(opaque, 1);
-}
-
-void grpc_handle_notify_on_write(grpc_winsocket *socket,
- void(*cb)(void *, int), void *opaque) {
- gpr_log(GPR_DEBUG, "grpc_handle_notify_on_write");
- handle_notify_on_iocp(socket, cb, opaque, &socket->write_info);
-}
-
-void grpc_handle_notify_on_read(grpc_winsocket *socket,
- void(*cb)(void *, int), void *opaque) {
- gpr_log(GPR_DEBUG, "grpc_handle_notify_on_read");
- handle_notify_on_iocp(socket, cb, opaque, &socket->read_info);
-}
-
-grpc_pollset *grpc_global_pollset(void) {
- return &g_global_pollset;
-}
+void grpc_pollset_kick(grpc_pollset *p) { }
#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/pollset_windows.h b/src/core/iomgr/pollset_windows.h
index 919af5d..1a5e31f 100644
--- a/src/core/iomgr/pollset_windows.h
+++ b/src/core/iomgr/pollset_windows.h
@@ -48,20 +48,9 @@
typedef struct grpc_pollset {
gpr_mu mu;
gpr_cv cv;
- HANDLE iocp;
} grpc_pollset;
#define GRPC_POLLSET_MU(pollset) (&(pollset)->mu)
#define GRPC_POLLSET_CV(pollset) (&(pollset)->cv)
-void grpc_pollset_add_handle(grpc_pollset *, grpc_winsocket *);
-
-grpc_pollset *grpc_global_pollset(void);
-
-void grpc_handle_notify_on_write(grpc_winsocket *, void(*cb)(void *, int success),
- void *opaque);
-
-void grpc_handle_notify_on_read(grpc_winsocket *, void(*cb)(void *, int success),
- void *opaque);
-
#endif /* __GRPC_INTERNAL_IOMGR_POLLSET_WINDOWS_H_ */
diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c
index 805e96a..3639798 100644
--- a/src/core/iomgr/socket_windows.c
+++ b/src/core/iomgr/socket_windows.c
@@ -37,6 +37,7 @@
#ifdef GPR_WINSOCK_SOCKET
+#include "src/core/iomgr/iocp_windows.h"
#include "src/core/iomgr/iomgr.h"
#include "src/core/iomgr/iomgr_internal.h"
#include "src/core/iomgr/socket_windows.h"
@@ -50,7 +51,7 @@
r->socket = socket;
gpr_mu_init(&r->state_mu);
grpc_iomgr_ref();
- grpc_pollset_add_handle(grpc_global_pollset(), r);
+ grpc_iocp_add_socket(r);
return r;
}
diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c
index 37e6b12..2ed5f39 100644
--- a/src/core/iomgr/tcp_client_windows.c
+++ b/src/core/iomgr/tcp_client_windows.c
@@ -197,7 +197,7 @@
ac->refs = 2;
grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, gpr_now());
- grpc_handle_notify_on_write(socket, on_connect, ac);
+ grpc_socket_notify_on_write(socket, on_connect, ac);
return;
failure:
diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c
index 2190195..97f8fe4 100644
--- a/src/core/iomgr/tcp_server_windows.c
+++ b/src/core/iomgr/tcp_server_windows.c
@@ -201,7 +201,7 @@
}
port->new_socket = sock;
- grpc_handle_notify_on_read(port->socket, on_accept, port);
+ grpc_socket_notify_on_read(port->socket, on_accept, port);
return;
failure:
diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c
index bd0b2dd..94d84f9 100644
--- a/src/core/iomgr/tcp_windows.c
+++ b/src/core/iomgr/tcp_windows.c
@@ -43,11 +43,12 @@
#include <grpc/support/slice_buffer.h>
#include <grpc/support/useful.h>
-#include "src/core/iomgr/tcp_client.h"
-#include "src/core/iomgr/socket_windows.h"
#include "src/core/iomgr/alarm.h"
+#include "src/core/iomgr/iocp_windows.h"
#include "src/core/iomgr/sockaddr.h"
#include "src/core/iomgr/sockaddr_utils.h"
+#include "src/core/iomgr/socket_windows.h"
+#include "src/core/iomgr/tcp_client.h"
static int set_non_block(SOCKET sock) {
int status;
@@ -121,7 +122,7 @@
if (!success) {
tcp_unref(tcp);
- cb(opaque, GRPC_ENDPOINT_CB_SHUTDOWN);
+ cb(opaque, NULL, 0, GRPC_ENDPOINT_CB_SHUTDOWN);
return;
}
@@ -194,7 +195,7 @@
if (status == 0) {
gpr_log(GPR_DEBUG, "got response immediately, but we're going to sleep");
- grpc_handle_notify_on_read(tcp->socket, on_read, tcp);
+ grpc_socket_notify_on_read(tcp->socket, on_read, tcp);
return;
}
@@ -213,7 +214,7 @@
}
gpr_log(GPR_DEBUG, "waiting on the IO completion port now");
- grpc_handle_notify_on_read(tcp->socket, on_read, tcp);
+ grpc_socket_notify_on_read(tcp->socket, on_read, tcp);
}
static void on_write(void *tcpp, int success) {
@@ -333,14 +334,14 @@
gpr_log(GPR_DEBUG, "wrote data immediately - but we're going to sleep");
}
- grpc_handle_notify_on_write(socket, on_write, tcp);
+ grpc_socket_notify_on_write(socket, on_write, tcp);
return GRPC_ENDPOINT_WRITE_PENDING;
}
static void win_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) {
grpc_tcp *tcp = (grpc_tcp *) ep;
gpr_log(GPR_DEBUG, "win_add_to_pollset");
- grpc_pollset_add_handle(pollset, tcp->socket);
+ grpc_iocp_add_socket(tcp->socket);
}
static void win_shutdown(grpc_endpoint *ep) {
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 6d79178..9db2309 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -115,10 +115,10 @@
<ClInclude Include="..\..\src\core\iomgr\endpoint.h" />
<ClInclude Include="..\..\src\core\iomgr\endpoint_pair.h" />
<ClInclude Include="..\..\src\core\iomgr\fd_posix.h" />
+ <ClInclude Include="..\..\src\core\iomgr\iocp_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr_internal.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h" />
- <ClInclude Include="..\..\src\core\iomgr\iomgr_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset_kick.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset_kick_posix.h" />
@@ -255,6 +255,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\fd_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iocp_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr_posix.c">
diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters
index 55f0108..5059e57 100644
--- a/vsprojects/vs2013/grpc.vcxproj.filters
+++ b/vsprojects/vs2013/grpc.vcxproj.filters
@@ -112,6 +112,9 @@
<ClCompile Include="..\..\src\core\iomgr\fd_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iocp_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -443,6 +446,9 @@
<ClInclude Include="..\..\src\core\iomgr\fd_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\iocp_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\iomgr.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -452,9 +458,6 @@
<ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\core\iomgr\iomgr_windows.h">
- <Filter>src\core\iomgr</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\pollset.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj
index 6d79178..9db2309 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj
@@ -115,10 +115,10 @@
<ClInclude Include="..\..\src\core\iomgr\endpoint.h" />
<ClInclude Include="..\..\src\core\iomgr\endpoint_pair.h" />
<ClInclude Include="..\..\src\core\iomgr\fd_posix.h" />
+ <ClInclude Include="..\..\src\core\iomgr\iocp_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr_internal.h" />
<ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h" />
- <ClInclude Include="..\..\src\core\iomgr\iomgr_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset_kick.h" />
<ClInclude Include="..\..\src\core\iomgr\pollset_kick_posix.h" />
@@ -255,6 +255,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\fd_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iocp_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr_posix.c">
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
index 23daa46..29afb52 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
@@ -73,6 +73,9 @@
<ClCompile Include="..\..\src\core\iomgr\fd_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iocp_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\iomgr.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -368,6 +371,9 @@
<ClInclude Include="..\..\src\core\iomgr\fd_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\iocp_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\iomgr.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -377,9 +383,6 @@
<ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\core\iomgr\iomgr_windows.h">
- <Filter>src\core\iomgr</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\pollset.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>