diff --git a/Makefile b/Makefile
index 8e0d649288d5589f8b0b4aae48a3420154e39561..f390dea6788369a3551f24bd543158c31402255a 100644
--- a/Makefile
+++ b/Makefile
@@ -1723,6 +1723,7 @@ PUBLIC_HEADERS_C += \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \
include/grpc/support/log.h \
+ include/grpc/support/log_win32.h \
include/grpc/support/port_platform.h \
include/grpc/support/slice.h \
include/grpc/support/slice_buffer.h \
@@ -1885,8 +1886,10 @@ LIBGRPC_SRC = \
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 \
src/core/iomgr/pollset_kick.c \
src/core/iomgr/pollset_multipoller_with_poll_posix.c \
src/core/iomgr/pollset_multipoller_with_epoll.c \
@@ -1897,9 +1900,13 @@ LIBGRPC_SRC = \
src/core/iomgr/socket_utils_common_posix.c \
src/core/iomgr/socket_utils_linux.c \
src/core/iomgr/socket_utils_posix.c \
+ src/core/iomgr/socket_windows.c \
src/core/iomgr/tcp_client_posix.c \
+ src/core/iomgr/tcp_client_windows.c \
src/core/iomgr/tcp_posix.c \
src/core/iomgr/tcp_server_posix.c \
+ src/core/iomgr/tcp_server_windows.c \
+ src/core/iomgr/tcp_windows.c \
src/core/iomgr/time_averaged_stats.c \
src/core/iomgr/wakeup_fd_eventfd.c \
src/core/iomgr/wakeup_fd_nospecial.c \
@@ -2015,8 +2022,10 @@ src/core/iomgr/alarm_heap.c: $(OPENSSL_DEP)
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)
src/core/iomgr/pollset_kick.c: $(OPENSSL_DEP)
src/core/iomgr/pollset_multipoller_with_poll_posix.c: $(OPENSSL_DEP)
src/core/iomgr/pollset_multipoller_with_epoll.c: $(OPENSSL_DEP)
@@ -2027,9 +2036,13 @@ src/core/iomgr/sockaddr_utils.c: $(OPENSSL_DEP)
src/core/iomgr/socket_utils_common_posix.c: $(OPENSSL_DEP)
src/core/iomgr/socket_utils_linux.c: $(OPENSSL_DEP)
src/core/iomgr/socket_utils_posix.c: $(OPENSSL_DEP)
+src/core/iomgr/socket_windows.c: $(OPENSSL_DEP)
src/core/iomgr/tcp_client_posix.c: $(OPENSSL_DEP)
+src/core/iomgr/tcp_client_windows.c: $(OPENSSL_DEP)
src/core/iomgr/tcp_posix.c: $(OPENSSL_DEP)
src/core/iomgr/tcp_server_posix.c: $(OPENSSL_DEP)
+src/core/iomgr/tcp_server_windows.c: $(OPENSSL_DEP)
+src/core/iomgr/tcp_windows.c: $(OPENSSL_DEP)
src/core/iomgr/time_averaged_stats.c: $(OPENSSL_DEP)
src/core/iomgr/wakeup_fd_eventfd.c: $(OPENSSL_DEP)
src/core/iomgr/wakeup_fd_nospecial.c: $(OPENSSL_DEP)
@@ -2167,8 +2180,10 @@ objs/$(CONFIG)/src/core/iomgr/alarm_heap.o:
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:
objs/$(CONFIG)/src/core/iomgr/pollset_kick.o:
objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o:
objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o:
@@ -2179,9 +2194,13 @@ objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_posix.o:
+objs/$(CONFIG)/src/core/iomgr/socket_windows.o:
objs/$(CONFIG)/src/core/iomgr/tcp_client_posix.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_client_windows.o:
objs/$(CONFIG)/src/core/iomgr/tcp_posix.o:
objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_server_windows.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_windows.o:
objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o:
objs/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o:
objs/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o:
@@ -2403,8 +2422,10 @@ LIBGRPC_UNSECURE_SRC = \
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 \
src/core/iomgr/pollset_kick.c \
src/core/iomgr/pollset_multipoller_with_poll_posix.c \
src/core/iomgr/pollset_multipoller_with_epoll.c \
@@ -2415,9 +2436,13 @@ LIBGRPC_UNSECURE_SRC = \
src/core/iomgr/socket_utils_common_posix.c \
src/core/iomgr/socket_utils_linux.c \
src/core/iomgr/socket_utils_posix.c \
+ src/core/iomgr/socket_windows.c \
src/core/iomgr/tcp_client_posix.c \
+ src/core/iomgr/tcp_client_windows.c \
src/core/iomgr/tcp_posix.c \
src/core/iomgr/tcp_server_posix.c \
+ src/core/iomgr/tcp_server_windows.c \
+ src/core/iomgr/tcp_windows.c \
src/core/iomgr/time_averaged_stats.c \
src/core/iomgr/wakeup_fd_eventfd.c \
src/core/iomgr/wakeup_fd_nospecial.c \
@@ -2538,8 +2563,10 @@ objs/$(CONFIG)/src/core/iomgr/alarm_heap.o:
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:
objs/$(CONFIG)/src/core/iomgr/pollset_kick.o:
objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o:
objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o:
@@ -2550,9 +2577,13 @@ objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o:
objs/$(CONFIG)/src/core/iomgr/socket_utils_posix.o:
+objs/$(CONFIG)/src/core/iomgr/socket_windows.o:
objs/$(CONFIG)/src/core/iomgr/tcp_client_posix.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_client_windows.o:
objs/$(CONFIG)/src/core/iomgr/tcp_posix.o:
objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_server_windows.o:
+objs/$(CONFIG)/src/core/iomgr/tcp_windows.o:
objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o:
objs/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o:
objs/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o:
diff --git a/build.json b/build.json
index 2681cf5064c602bf1edbef8e2e2fcecd6b2a6122..68ebac9c00ebded04470b2e02104d39d57bc8653 100644
--- a/build.json
+++ b/build.json
@@ -42,6 +42,7 @@
"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",
@@ -57,9 +58,11 @@
"src/core/iomgr/sockaddr_utils.h",
"src/core/iomgr/sockaddr_win32.h",
"src/core/iomgr/socket_utils_posix.h",
+ "src/core/iomgr/socket_windows.h",
"src/core/iomgr/tcp_client.h",
"src/core/iomgr/tcp_posix.h",
"src/core/iomgr/tcp_server.h",
+ "src/core/iomgr/tcp_windows.h",
"src/core/iomgr/time_averaged_stats.h",
"src/core/iomgr/wakeup_fd_pipe.h",
"src/core/iomgr/wakeup_fd_posix.h",
@@ -130,8 +133,10 @@
"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",
"src/core/iomgr/pollset_kick.c",
"src/core/iomgr/pollset_multipoller_with_poll_posix.c",
"src/core/iomgr/pollset_multipoller_with_epoll.c",
@@ -142,9 +147,13 @@
"src/core/iomgr/socket_utils_common_posix.c",
"src/core/iomgr/socket_utils_linux.c",
"src/core/iomgr/socket_utils_posix.c",
+ "src/core/iomgr/socket_windows.c",
"src/core/iomgr/tcp_client_posix.c",
+ "src/core/iomgr/tcp_client_windows.c",
"src/core/iomgr/tcp_posix.c",
"src/core/iomgr/tcp_server_posix.c",
+ "src/core/iomgr/tcp_server_windows.c",
+ "src/core/iomgr/tcp_windows.c",
"src/core/iomgr/time_averaged_stats.c",
"src/core/iomgr/wakeup_fd_eventfd.c",
"src/core/iomgr/wakeup_fd_nospecial.c",
@@ -217,6 +226,7 @@
"include/grpc/support/histogram.h",
"include/grpc/support/host_port.h",
"include/grpc/support/log.h",
+ "include/grpc/support/log_win32.h",
"include/grpc/support/port_platform.h",
"include/grpc/support/slice.h",
"include/grpc/support/slice_buffer.h",
@@ -338,7 +348,8 @@
"deps": [
"gpr",
"grpc"
- ]
+ ],
+ "vs_project_guid": "{D64C6D63-4458-4A88-AB38-35678384A7E4}"
},
{
"name": "grpc_test_util",
diff --git a/include/grpc/support/log_win32.h b/include/grpc/support/log_win32.h
new file mode 100644
index 0000000000000000000000000000000000000000..0350056d26e853fa158aae7858389877ade37491
--- /dev/null
+++ b/include/grpc/support/log_win32.h
@@ -0,0 +1,53 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef __GRPC_SUPPORT_LOG_WIN32_H__
+#define __GRPC_SUPPORT_LOG_WIN32_H__
+
+#include <windows.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Returns a string allocated with gpr_malloc that contains a UTF-8
+ * formatted error message, corresponding to the error messageid.
+ * Use in conjunction with GetLastError() et al.
+ */
+char *gpr_format_message(DWORD messageid);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GRPC_SUPPORT_LOG_H__ */
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 69a2f9c6840250c06f752b822e11aafe75b271c8..68c827ad849b9d2bbc6c356ec4ec80214a0ff0c5 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -46,10 +46,12 @@
#define GPR_WIN32 1
#define GPR_ARCH_64 1
#define GPR_GETPID_IN_PROCESS_H 1
+#define GPR_WINSOCK_SOCKET 1
#elif defined(_WIN32) || defined(WIN32)
#define GPR_ARCH_32 1
#define GPR_WIN32 1
#define GPR_GETPID_IN_PROCESS_H 1
+#define GPR_WINSOCK_SOCKET 1
#elif defined(ANDROID) || defined(__ANDROID__)
#define GPR_ANDROID 1
#define GPR_ARCH_32 1
diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..729b11b78dce153714c70df066e21016f9cfc5cc
--- /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/iocp_windows.h b/src/core/iomgr/iocp_windows.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf5b90978ef12556b24d62a74162edaa62fd5125
--- /dev/null
+++ b/src/core/iomgr/iocp_windows.h
@@ -0,0 +1,52 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#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_iocp_init(void);
+void grpc_iocp_shutdown(void);
+void grpc_iocp_add_socket(grpc_winsocket *);
+
+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_posix.c b/src/core/iomgr/iomgr_posix.c
index 9297f08e99a9837ae61719eea2286f33b5d49456..bbf8cfc4190d6dc06833827d3b06d9828fb8f516 100644
--- a/src/core/iomgr/iomgr_posix.c
+++ b/src/core/iomgr/iomgr_posix.c
@@ -31,6 +31,10 @@
*
*/
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_POSIX_SOCKET
+
#include "src/core/iomgr/iomgr_posix.h"
#include "src/core/iomgr/fd_posix.h"
@@ -43,3 +47,5 @@ void grpc_iomgr_platform_shutdown(void) {
grpc_pollset_global_shutdown();
grpc_fd_global_shutdown();
}
+
+#endif /* GRPC_POSIX_SOCKET */
diff --git a/src/core/iomgr/iomgr_windows.c b/src/core/iomgr/iomgr_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..a3a255eaed225598f646811e4799a3fbc960a239
--- /dev/null
+++ b/src/core/iomgr/iomgr_windows.c
@@ -0,0 +1,67 @@
+/*
+ *
+ * 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 "src/core/iomgr/sockaddr_win32.h"
+
+#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"
+
+static void winsock_init(void) {
+ WSADATA wsaData;
+ int status = WSAStartup(MAKEWORD(2, 0), &wsaData);
+ GPR_ASSERT(status == 0);
+}
+
+static void winsock_shutdown(void) {
+ int status = WSACleanup();
+ GPR_ASSERT(status == 0);
+}
+
+void grpc_iomgr_platform_init(void) {
+ winsock_init();
+ grpc_iocp_init();
+}
+
+void grpc_iomgr_platform_shutdown(void) {
+ grpc_iocp_shutdown();
+ winsock_shutdown();
+}
+
+#endif /* GRPC_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c
index ceedfbd51fc3d0bf1274d6acbc3f0f4e7c17821a..53c9806fb9bdee1d74cb289c24095963202d93bf 100644
--- a/src/core/iomgr/pollset_posix.c
+++ b/src/core/iomgr/pollset_posix.c
@@ -206,8 +206,15 @@ static void unary_poll_pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) {
if (fd == pollset->data.ptr) return;
fds[0] = pollset->data.ptr;
fds[1] = fd;
- grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds));
- grpc_fd_unref(fds[0]);
+ if (!grpc_fd_is_orphaned(fds[0])) {
+ grpc_platform_become_multipoller(pollset, fds, GPR_ARRAY_SIZE(fds));
+ grpc_fd_unref(fds[0]);
+ } else {
+ /* old fd is orphaned and we haven't cleaned it up until now, so remain a
+ * unary poller */
+ grpc_fd_unref(fds[0]);
+ pollset->data.ptr = fd;
+ }
}
static void unary_poll_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd) {
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c
index 3fb39918b356c73ace1a55749d5033b32527147d..b81d23e57c2fb7d1ae95806860b4fecc99635f39 100644
--- a/src/core/iomgr/pollset_windows.c
+++ b/src/core/iomgr/pollset_windows.c
@@ -33,6 +33,39 @@
#include <grpc/support/port_platform.h>
-#ifdef GPR_WIN32
+#ifdef GPR_WINSOCK_SOCKET
-#endif /* GPR_WIN32 */
+#include <grpc/support/thd.h>
+
+#include "src/core/iomgr/alarm_internal.h"
+#include "src/core/iomgr/iomgr_internal.h"
+#include "src/core/iomgr/pollset_windows.h"
+
+void grpc_pollset_init(grpc_pollset *pollset) {
+ gpr_mu_init(&pollset->mu);
+ gpr_cv_init(&pollset->cv);
+}
+
+void grpc_pollset_destroy(grpc_pollset *pollset) {
+ gpr_mu_destroy(&pollset->mu);
+ gpr_cv_destroy(&pollset->cv);
+}
+
+int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) {
+ gpr_timespec now;
+ now = gpr_now();
+ if (gpr_time_cmp(now, deadline) > 0) {
+ return 0;
+ }
+ if (grpc_maybe_call_delayed_callbacks(NULL, 1)) {
+ return 1;
+ }
+ if (grpc_alarm_check(NULL, now, &deadline)) {
+ return 1;
+ }
+ return 0;
+}
+
+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 9214b04b170d5f210023769328a8c1db87b579bc..1a5e31f627b4a1d1cfc71c4e839e577d65601097 100644
--- a/src/core/iomgr/pollset_windows.h
+++ b/src/core/iomgr/pollset_windows.h
@@ -34,9 +34,11 @@
#ifndef __GRPC_INTERNAL_IOMGR_POLLSET_WINDOWS_H_
#define __GRPC_INTERNAL_IOMGR_POLLSET_WINDOWS_H_
+#include <windows.h>
#include <grpc/support/sync.h>
#include "src/core/iomgr/pollset_kick.h"
+#include "src/core/iomgr/socket_windows.h"
/* forward declare only in this file to avoid leaking impl details via
pollset.h; real users of grpc_fd should always include 'fd_posix.h' and not
diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c
index 07bf7b3a35ceaac6bc2ed3023aa234b18cba4718..8dcfca74c68b683193086233230054f54ddb0010 100644
--- a/src/core/iomgr/sockaddr_utils.c
+++ b/src/core/iomgr/sockaddr_utils.c
@@ -111,13 +111,20 @@ int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out) {
void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out,
struct sockaddr_in6 *wild6_out) {
- memset(wild4_out, 0, sizeof(*wild4_out));
- wild4_out->sin_family = AF_INET;
- wild4_out->sin_port = htons(port);
+ grpc_sockaddr_make_wildcard4(port, wild4_out);
+ grpc_sockaddr_make_wildcard6(port, wild6_out);
+}
+
+void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out) {
+ memset(wild_out, 0, sizeof(*wild_out));
+ wild_out->sin_family = AF_INET;
+ wild_out->sin_port = htons(port);
+}
- memset(wild6_out, 0, sizeof(*wild6_out));
- wild6_out->sin6_family = AF_INET6;
- wild6_out->sin6_port = htons(port);
+void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out) {
+ memset(wild_out, 0, sizeof(*wild_out));
+ wild_out->sin6_family = AF_INET6;
+ wild_out->sin6_port = htons(port);
}
int grpc_sockaddr_to_string(char **out, const struct sockaddr *addr,
diff --git a/src/core/iomgr/sockaddr_utils.h b/src/core/iomgr/sockaddr_utils.h
index 3f5b770e8654bd590a7be4343da927323c626e51..b49cc50491cf0fa61a45096b1a8f3d12a7ded308 100644
--- a/src/core/iomgr/sockaddr_utils.h
+++ b/src/core/iomgr/sockaddr_utils.h
@@ -57,6 +57,12 @@ int grpc_sockaddr_is_wildcard(const struct sockaddr *addr, int *port_out);
void grpc_sockaddr_make_wildcards(int port, struct sockaddr_in *wild4_out,
struct sockaddr_in6 *wild6_out);
+/* Writes 0.0.0.0:port. */
+void grpc_sockaddr_make_wildcard4(int port, struct sockaddr_in *wild_out);
+
+/* Writes [::]:port. */
+void grpc_sockaddr_make_wildcard6(int port, struct sockaddr_in6 *wild_out);
+
/* Return the IP port number of a sockaddr */
int grpc_sockaddr_get_port(const struct sockaddr *addr);
diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h
index cdea33fec075ae4a2b0c75fcf23c7edcb7dd3aa8..08be0e54f8ee5d46dfb56a0931fda1fcaefb0677 100644
--- a/src/core/iomgr/sockaddr_win32.h
+++ b/src/core/iomgr/sockaddr_win32.h
@@ -35,5 +35,7 @@
#define __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_
#include <ws2tcpip.h>
+#include <winsock2.h>
+#include <mswsock.h>
-#endif // __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_
+#endif /* __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_ */
diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..3639798dbcdae6f809cd0885bd526382eee9a520
--- /dev/null
+++ b/src/core/iomgr/socket_windows.c
@@ -0,0 +1,77 @@
+/*
+ *
+ * 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>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+
+#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"
+#include "src/core/iomgr/pollset.h"
+#include "src/core/iomgr/pollset_windows.h"
+
+grpc_winsocket *grpc_winsocket_create(SOCKET socket) {
+ grpc_winsocket *r = gpr_malloc(sizeof(grpc_winsocket));
+ gpr_log(GPR_DEBUG, "grpc_winsocket_create");
+ memset(r, 0, sizeof(grpc_winsocket));
+ r->socket = socket;
+ gpr_mu_init(&r->state_mu);
+ grpc_iomgr_ref();
+ grpc_iocp_add_socket(r);
+ return r;
+}
+
+void shutdown_op(grpc_winsocket_callback_info *info) {
+ if (!info->cb) return;
+ grpc_iomgr_add_delayed_callback(info->cb, info->opaque, 0);
+}
+
+void grpc_winsocket_shutdown(grpc_winsocket *socket) {
+ gpr_log(GPR_DEBUG, "grpc_winsocket_shutdown");
+ shutdown_op(&socket->read_info);
+ shutdown_op(&socket->write_info);
+}
+
+void grpc_winsocket_orphan(grpc_winsocket *socket) {
+ gpr_log(GPR_DEBUG, "grpc_winsocket_orphan");
+ grpc_iomgr_unref();
+ closesocket(socket->socket);
+ gpr_mu_destroy(&socket->state_mu);
+ gpr_free(socket);
+}
+
+#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h
new file mode 100644
index 0000000000000000000000000000000000000000..990b520c6dab74925703587ee9610361e0986197
--- /dev/null
+++ b/src/core/iomgr/socket_windows.h
@@ -0,0 +1,75 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef __GRPC_INTERNAL_IOMGR_HANDLE_WINDOWS_H__
+#define __GRPC_INTERNAL_IOMGR_HANDLE_WINDOWS_H__
+
+#include <windows.h>
+
+#include <grpc/support/sync.h>
+#include <grpc/support/atm.h>
+
+typedef struct grpc_winsocket_callback_info {
+ /* This is supposed to be a WSAOVERLAPPED, but in order to get that
+ * definition, we need to include ws2tcpip.h, which needs to be included
+ * from the top, otherwise it'll clash with a previous inclusion of
+ * windows.h that in turns includes winsock.h. If anyone knows a way
+ * to do it properly, feel free to send a patch.
+ */
+ OVERLAPPED overlapped;
+ void(*cb)(void *opaque, int success);
+ void *opaque;
+ int has_pending_iocp;
+ DWORD bytes_transfered;
+ int wsa_error;
+} grpc_winsocket_callback_info;
+
+typedef struct grpc_winsocket {
+ SOCKET socket;
+
+ int added_to_iocp;
+
+ grpc_winsocket_callback_info write_info;
+ grpc_winsocket_callback_info read_info;
+
+ gpr_mu state_mu;
+} grpc_winsocket;
+
+/* Create a wrapped windows handle.
+This takes ownership of closing it. */
+grpc_winsocket *grpc_winsocket_create(SOCKET socket);
+
+void grpc_winsocket_shutdown(grpc_winsocket *socket);
+void grpc_winsocket_orphan(grpc_winsocket *socket);
+
+#endif /* __GRPC_INTERNAL_IOMGR_HANDLE_WINDOWS_H__ */
diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..2ed5f39b390b1fc4304b9b6de41cb63395d2b13c
--- /dev/null
+++ b/src/core/iomgr/tcp_client_windows.c
@@ -0,0 +1,215 @@
+/*
+ *
+ * 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 "src/core/iomgr/sockaddr_win32.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/log_win32.h>
+#include <grpc/support/slice_buffer.h>
+#include <grpc/support/useful.h>
+
+#include "src/core/iomgr/tcp_client.h"
+#include "src/core/iomgr/tcp_windows.h"
+#include "src/core/iomgr/socket_windows.h"
+#include "src/core/iomgr/alarm.h"
+#include "src/core/iomgr/sockaddr.h"
+#include "src/core/iomgr/sockaddr_utils.h"
+
+typedef struct {
+ void(*cb)(void *arg, grpc_endpoint *tcp);
+ void *cb_arg;
+ gpr_mu mu;
+ grpc_winsocket *socket;
+ gpr_timespec deadline;
+ grpc_alarm alarm;
+ int refs;
+} async_connect;
+
+static void async_connect_cleanup(async_connect *ac) {
+ int done = (--ac->refs == 0);
+ gpr_mu_unlock(&ac->mu);
+ if (done) {
+ gpr_mu_destroy(&ac->mu);
+ gpr_free(ac);
+ }
+}
+
+static void on_alarm(void *acp, int success) {
+ async_connect *ac = acp;
+ gpr_mu_lock(&ac->mu);
+ if (ac->socket != NULL && success) {
+ grpc_winsocket_shutdown(ac->socket);
+ }
+ async_connect_cleanup(ac);
+}
+
+static void on_connect(void *acp, int success) {
+ async_connect *ac = acp;
+ SOCKET sock = ac->socket->socket;
+ grpc_endpoint *ep = NULL;
+ grpc_winsocket_callback_info *info = &ac->socket->write_info;
+ void(*cb)(void *arg, grpc_endpoint *tcp) = ac->cb;
+ void *cb_arg = ac->cb_arg;
+
+ grpc_alarm_cancel(&ac->alarm);
+
+ if (success) {
+ DWORD transfered_bytes = 0;
+ DWORD flags;
+ BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped,
+ &transfered_bytes, FALSE,
+ &flags);
+ GPR_ASSERT(transfered_bytes == 0);
+ if (!wsa_success) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message);
+ gpr_free(utf8_message);
+ goto finish;
+ } else {
+ gpr_log(GPR_DEBUG, "on_connect: connection established");
+ ep = grpc_tcp_create(ac->socket);
+ goto finish;
+ }
+ } else {
+ gpr_log(GPR_ERROR, "on_connect is shutting down");
+ goto finish;
+ }
+
+ abort();
+
+finish:
+ gpr_mu_lock(&ac->mu);
+ if (!ep) {
+ grpc_winsocket_orphan(ac->socket);
+ }
+ async_connect_cleanup(ac);
+ cb(cb_arg, ep);
+}
+
+void grpc_tcp_client_connect(void(*cb)(void *arg, grpc_endpoint *tcp),
+ void *arg, const struct sockaddr *addr,
+ int addr_len, gpr_timespec deadline) {
+ SOCKET sock = INVALID_SOCKET;
+ BOOL success;
+ int status;
+ struct sockaddr_in6 addr6_v4mapped;
+ struct sockaddr_in6 local_address;
+ async_connect *ac;
+ grpc_winsocket *socket = NULL;
+ LPFN_CONNECTEX ConnectEx;
+ GUID guid = WSAID_CONNECTEX;
+ DWORD ioctl_num_bytes;
+ const char *message = NULL;
+ char *utf8_message;
+ grpc_winsocket_callback_info *info;
+
+ /* Use dualstack sockets where available. */
+ if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) {
+ addr = (const struct sockaddr *)&addr6_v4mapped;
+ addr_len = sizeof(addr6_v4mapped);
+ }
+
+ sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+ WSA_FLAG_OVERLAPPED);
+ if (sock == INVALID_SOCKET) {
+ message = "Unable to create socket: %s";
+ goto failure;
+ }
+
+ if (!grpc_tcp_prepare_socket(sock)) {
+ message = "Unable to set socket options: %s";
+ goto failure;
+ }
+
+ status = WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
+ &guid, sizeof(guid), &ConnectEx, sizeof(ConnectEx),
+ &ioctl_num_bytes, NULL, NULL);
+
+ if (status != 0) {
+ message = "Unable to retreive ConnectEx pointer: %s";
+ goto failure;
+ }
+
+ grpc_sockaddr_make_wildcard6(0, &local_address);
+
+ status = bind(sock, (struct sockaddr *) &local_address,
+ sizeof(local_address));
+ if (status != 0) {
+ message = "Unable to bind socket: %s";
+ goto failure;
+ }
+
+ socket = grpc_winsocket_create(sock);
+ info = &socket->write_info;
+ success = ConnectEx(sock, addr, addr_len, NULL, 0, NULL, &info->overlapped);
+
+ if (success) {
+ gpr_log(GPR_DEBUG, "connected immediately - but we still go to sleep");
+ } else {
+ int error = WSAGetLastError();
+ if (error != ERROR_IO_PENDING) {
+ message = "ConnectEx failed: %s";
+ goto failure;
+ }
+ }
+
+ gpr_log(GPR_DEBUG, "grpc_tcp_client_connect: connection pending");
+ ac = gpr_malloc(sizeof(async_connect));
+ ac->cb = cb;
+ ac->cb_arg = arg;
+ ac->socket = socket;
+ gpr_mu_init(&ac->mu);
+ ac->refs = 2;
+
+ grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, gpr_now());
+ grpc_socket_notify_on_write(socket, on_connect, ac);
+ return;
+
+failure:
+ utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, message, utf8_message);
+ gpr_free(utf8_message);
+ if (socket) {
+ grpc_winsocket_orphan(socket);
+ } else if (sock != INVALID_SOCKET) {
+ closesocket(sock);
+ }
+ cb(arg, NULL);
+}
+
+#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..e6161eb1e86abfd48d93ca843b7c4977cbf81afe
--- /dev/null
+++ b/src/core/iomgr/tcp_server_windows.c
@@ -0,0 +1,374 @@
+/*
+ *
+ * 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
+
+#define _GNU_SOURCE
+#include "src/core/iomgr/sockaddr_utils.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/log_win32.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
+#include "src/core/iomgr/iocp_windows.h"
+#include "src/core/iomgr/pollset_windows.h"
+#include "src/core/iomgr/socket_windows.h"
+#include "src/core/iomgr/tcp_server.h"
+#include "src/core/iomgr/tcp_windows.h"
+
+#define INIT_PORT_CAP 2
+#define MIN_SAFE_ACCEPT_QUEUE_SIZE 100
+
+static gpr_once s_init_max_accept_queue_size;
+static int s_max_accept_queue_size;
+
+/* one listening port */
+typedef struct server_port {
+ gpr_uint8 addresses[sizeof(struct sockaddr_in6) * 2 + 32];
+ SOCKET new_socket;
+ grpc_winsocket *socket;
+ grpc_tcp_server *server;
+ LPFN_ACCEPTEX AcceptEx;
+} server_port;
+
+/* the overall server */
+struct grpc_tcp_server {
+ grpc_tcp_server_cb cb;
+ void *cb_arg;
+
+ gpr_mu mu;
+ gpr_cv cv;
+
+ /* active port count: how many ports are actually still listening */
+ int active_ports;
+
+ /* all listening ports */
+ server_port *ports;
+ size_t nports;
+ size_t port_capacity;
+};
+
+grpc_tcp_server *grpc_tcp_server_create(void) {
+ grpc_tcp_server *s = gpr_malloc(sizeof(grpc_tcp_server));
+ gpr_mu_init(&s->mu);
+ gpr_cv_init(&s->cv);
+ s->active_ports = 0;
+ s->cb = NULL;
+ s->cb_arg = NULL;
+ s->ports = gpr_malloc(sizeof(server_port) * INIT_PORT_CAP);
+ s->nports = 0;
+ s->port_capacity = INIT_PORT_CAP;
+ return s;
+}
+
+void grpc_tcp_server_destroy(grpc_tcp_server *s) {
+ size_t i;
+ gpr_mu_lock(&s->mu);
+ /* shutdown all fd's */
+ for (i = 0; i < s->nports; i++) {
+ grpc_winsocket_shutdown(s->ports[i].socket);
+ }
+ /* wait while that happens */
+ while (s->active_ports) {
+ gpr_cv_wait(&s->cv, &s->mu, gpr_inf_future);
+ }
+ gpr_mu_unlock(&s->mu);
+
+ /* delete ALL the things */
+ for (i = 0; i < s->nports; i++) {
+ server_port *sp = &s->ports[i];
+ grpc_winsocket_orphan(sp->socket);
+ }
+ gpr_free(s->ports);
+ gpr_free(s);
+}
+
+/* Prepare a recently-created socket for listening. */
+static int prepare_socket(SOCKET sock,
+ const struct sockaddr *addr, int addr_len) {
+ struct sockaddr_storage sockname_temp;
+ socklen_t sockname_len;
+
+ if (sock == INVALID_SOCKET) goto error;
+
+ if (!grpc_tcp_prepare_socket(sock)) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "Unable to prepare socket: %s", utf8_message);
+ gpr_free(utf8_message);
+ goto error;
+ }
+
+ if (bind(sock, addr, addr_len) == SOCKET_ERROR) {
+ char *addr_str;
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ grpc_sockaddr_to_string(&addr_str, addr, 0);
+ gpr_log(GPR_ERROR, "bind addr=%s: %s", addr_str, utf8_message);
+ gpr_free(utf8_message);
+ gpr_free(addr_str);
+ goto error;
+ }
+
+ if (listen(sock, SOMAXCONN) == SOCKET_ERROR) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "listen: %s", utf8_message);
+ gpr_free(utf8_message);
+ goto error;
+ }
+
+ sockname_len = sizeof(sockname_temp);
+ if (getsockname(sock, (struct sockaddr *) &sockname_temp, &sockname_len)
+ == SOCKET_ERROR) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "getsockname: %s", utf8_message);
+ gpr_free(utf8_message);
+ goto error;
+ }
+
+ return grpc_sockaddr_get_port((struct sockaddr *) &sockname_temp);
+
+error:
+ if (sock != INVALID_SOCKET) closesocket(sock);
+ return -1;
+}
+
+static void on_accept(void *arg, int success);
+
+static void start_accept(server_port *port) {
+ SOCKET sock = INVALID_SOCKET;
+ char *message;
+ char *utf8_message;
+ BOOL success;
+ DWORD addrlen = sizeof(struct sockaddr_in6) + 16;
+ DWORD bytes_received = 0;
+
+ sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+ WSA_FLAG_OVERLAPPED);
+
+ if (sock == INVALID_SOCKET) {
+ message = "Unable to create socket: %s";
+ goto failure;
+ }
+
+ if (!grpc_tcp_prepare_socket(sock)) {
+ message = "Unable to prepare socket: %s";
+ goto failure;
+ }
+
+ success = port->AcceptEx(port->socket->socket, sock, port->addresses, 0,
+ addrlen, addrlen, &bytes_received,
+ &port->socket->read_info.overlapped);
+
+ if (success) {
+ gpr_log(GPR_DEBUG, "accepted immediately - but we still go to sleep");
+ } else {
+ int error = WSAGetLastError();
+ if (error != ERROR_IO_PENDING) {
+ message = "AcceptEx failed: %s";
+ goto failure;
+ }
+ }
+
+ port->new_socket = sock;
+ grpc_socket_notify_on_read(port->socket, on_accept, port);
+ return;
+
+failure:
+ utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, message, utf8_message);
+ gpr_free(utf8_message);
+ if (sock != INVALID_SOCKET) closesocket(sock);
+}
+
+/* event manager callback when reads are ready */
+static void on_accept(void *arg, int success) {
+ server_port *sp = arg;
+ SOCKET sock = sp->new_socket;
+ grpc_winsocket_callback_info *info = &sp->socket->read_info;
+ grpc_endpoint *ep = NULL;
+
+ if (success) {
+ DWORD transfered_bytes = 0;
+ DWORD flags;
+ BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped,
+ &transfered_bytes, FALSE,
+ &flags);
+ if (!wsa_success) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "on_accept error: %s", utf8_message);
+ gpr_free(utf8_message);
+ closesocket(sock);
+ } else {
+ gpr_log(GPR_DEBUG, "on_accept: accepted connection");
+ ep = grpc_tcp_create(grpc_winsocket_create(sock));
+ }
+ } else {
+ gpr_log(GPR_DEBUG, "on_accept: shutting down");
+ closesocket(sock);
+ gpr_mu_lock(&sp->server->mu);
+ if (0 == --sp->server->active_ports) {
+ gpr_cv_broadcast(&sp->server->cv);
+ }
+ gpr_mu_unlock(&sp->server->mu);
+ }
+
+ if (ep) sp->server->cb(sp->server->cb_arg, ep);
+ start_accept(sp);
+}
+
+static int add_socket_to_server(grpc_tcp_server *s, SOCKET sock,
+ const struct sockaddr *addr, int addr_len) {
+ server_port *sp;
+ int port;
+ int status;
+ GUID guid = WSAID_ACCEPTEX;
+ DWORD ioctl_num_bytes;
+ LPFN_ACCEPTEX AcceptEx;
+
+ if (sock == INVALID_SOCKET) return -1;
+
+ status = WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
+ &guid, sizeof(guid), &AcceptEx, sizeof(AcceptEx),
+ &ioctl_num_bytes, NULL, NULL);
+
+ if (status != 0) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message);
+ gpr_free(utf8_message);
+ closesocket(sock);
+ return -1;
+ }
+
+ port = prepare_socket(sock, addr, addr_len);
+ if (port >= 0) {
+ gpr_mu_lock(&s->mu);
+ GPR_ASSERT(!s->cb && "must add ports before starting server");
+ /* append it to the list under a lock */
+ if (s->nports == s->port_capacity) {
+ s->port_capacity *= 2;
+ s->ports = gpr_realloc(s->ports, sizeof(server_port) * s->port_capacity);
+ }
+ sp = &s->ports[s->nports++];
+ sp->server = s;
+ sp->socket = grpc_winsocket_create(sock);
+ sp->AcceptEx = AcceptEx;
+ GPR_ASSERT(sp->socket);
+ gpr_mu_unlock(&s->mu);
+ }
+
+ return port;
+}
+
+int grpc_tcp_server_add_port(grpc_tcp_server *s, const void *addr,
+ int addr_len) {
+ int allocated_port = -1;
+ unsigned i;
+ SOCKET sock;
+ struct sockaddr_in6 addr6_v4mapped;
+ struct sockaddr_in6 wildcard;
+ struct sockaddr *allocated_addr = NULL;
+ struct sockaddr_storage sockname_temp;
+ socklen_t sockname_len;
+ int port;
+
+ /* Check if this is a wildcard port, and if so, try to keep the port the same
+ as some previously created listener. */
+ if (grpc_sockaddr_get_port(addr) == 0) {
+ for (i = 0; i < s->nports; i++) {
+ sockname_len = sizeof(sockname_temp);
+ if (0 == getsockname(s->ports[i].socket->socket,
+ (struct sockaddr *) &sockname_temp,
+ &sockname_len)) {
+ port = grpc_sockaddr_get_port((struct sockaddr *) &sockname_temp);
+ if (port > 0) {
+ allocated_addr = malloc(addr_len);
+ memcpy(allocated_addr, addr, addr_len);
+ grpc_sockaddr_set_port(allocated_addr, port);
+ addr = allocated_addr;
+ break;
+ }
+ }
+ }
+ }
+
+ if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) {
+ addr = (const struct sockaddr *)&addr6_v4mapped;
+ addr_len = sizeof(addr6_v4mapped);
+ }
+
+ /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */
+ if (grpc_sockaddr_is_wildcard(addr, &port)) {
+ grpc_sockaddr_make_wildcard6(port, &wildcard);
+
+ addr = (struct sockaddr *) &wildcard;
+ addr_len = sizeof(wildcard);
+ }
+
+ sock = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
+ WSA_FLAG_OVERLAPPED);
+ if (sock == INVALID_SOCKET) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ gpr_log(GPR_ERROR, "unable to create socket: %s", utf8_message);
+ gpr_free(utf8_message);
+ }
+
+ allocated_port = add_socket_to_server(s, sock, addr, addr_len);
+ gpr_free(allocated_addr);
+
+ return allocated_port;
+}
+
+SOCKET grpc_tcp_server_get_socket(grpc_tcp_server *s, unsigned index) {
+ return (index < s->nports) ? s->ports[index].socket->socket : INVALID_SOCKET;
+}
+
+void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset *pollset,
+ grpc_tcp_server_cb cb, void *cb_arg) {
+ size_t i;
+ GPR_ASSERT(cb);
+ gpr_mu_lock(&s->mu);
+ GPR_ASSERT(!s->cb);
+ GPR_ASSERT(s->active_ports == 0);
+ s->cb = cb;
+ s->cb_arg = cb_arg;
+ for (i = 0; i < s->nports; i++) {
+ start_accept(s->ports + i);
+ s->active_ports++;
+ }
+ gpr_mu_unlock(&s->mu);
+}
+
+#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c
new file mode 100644
index 0000000000000000000000000000000000000000..94d84f92b5901138b24c0e07ec9223536a0179a3
--- /dev/null
+++ b/src/core/iomgr/tcp_windows.c
@@ -0,0 +1,373 @@
+/*
+ *
+ * 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 "src/core/iomgr/sockaddr_win32.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/log_win32.h>
+#include <grpc/support/slice_buffer.h>
+#include <grpc/support/useful.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;
+ unsigned long param = 1;
+ DWORD ret;
+ status = WSAIoctl(sock, FIONBIO, ¶m, sizeof(param), NULL, 0, &ret,
+ NULL, NULL);
+ return status == 0;
+}
+
+static int set_dualstack(SOCKET sock) {
+ int status;
+ unsigned long param = 0;
+ status = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const char *) ¶m, sizeof(param));
+ return status == 0;
+}
+
+int grpc_tcp_prepare_socket(SOCKET sock) {
+ if (!set_non_block(sock))
+ return 0;
+ if (!set_dualstack(sock))
+ return 0;
+ return 1;
+}
+
+typedef struct grpc_tcp {
+ grpc_endpoint base;
+ grpc_winsocket *socket;
+ gpr_refcount refcount;
+
+ grpc_endpoint_read_cb read_cb;
+ void *read_user_data;
+ gpr_slice read_slice;
+ int outstanding_read;
+
+ grpc_endpoint_write_cb write_cb;
+ void *write_user_data;
+ gpr_slice_buffer write_slices;
+ int outstanding_write;
+
+} grpc_tcp;
+
+static void tcp_ref(grpc_tcp *tcp) {
+ gpr_log(GPR_DEBUG, "tcp_ref");
+ gpr_ref(&tcp->refcount);
+}
+
+static void tcp_unref(grpc_tcp *tcp) {
+ gpr_log(GPR_DEBUG, "tcp_unref");
+ if (gpr_unref(&tcp->refcount)) {
+ gpr_log(GPR_DEBUG, "tcp_unref: destroying");
+ gpr_slice_buffer_destroy(&tcp->write_slices);
+ grpc_winsocket_orphan(tcp->socket);
+ gpr_free(tcp);
+ }
+}
+
+static void on_read(void *tcpp, int success) {
+ grpc_tcp *tcp = (grpc_tcp *) tcpp;
+ grpc_winsocket *socket = tcp->socket;
+ gpr_slice sub;
+ gpr_slice *slice = NULL;
+ size_t nslices = 0;
+ grpc_endpoint_cb_status status;
+ grpc_endpoint_read_cb cb = tcp->read_cb;
+ grpc_winsocket_callback_info *info = &socket->read_info;
+ void *opaque = tcp->read_user_data;
+
+ GPR_ASSERT(tcp->outstanding_read);
+
+ if (!success) {
+ tcp_unref(tcp);
+ cb(opaque, NULL, 0, GRPC_ENDPOINT_CB_SHUTDOWN);
+ return;
+ }
+
+ gpr_log(GPR_DEBUG, "on_read");
+ tcp->outstanding_read = 0;
+
+ if (socket->read_info.wsa_error != 0) {
+ char *utf8_message = gpr_format_message(info->wsa_error);
+ __debugbreak();
+ gpr_log(GPR_ERROR, "ReadFile overlapped error: %s", utf8_message);
+ gpr_free(utf8_message);
+ status = GRPC_ENDPOINT_CB_ERROR;
+ } else {
+ if (info->bytes_transfered != 0) {
+ sub = gpr_slice_sub(tcp->read_slice, 0, info->bytes_transfered);
+ gpr_log(GPR_DEBUG, "on_read: calling callback");
+ status = GRPC_ENDPOINT_CB_OK;
+ slice = ⊂
+ nslices = 1;
+ } else {
+ gpr_log(GPR_DEBUG, "on_read: closed socket");
+ gpr_slice_unref(tcp->read_slice);
+ status = GRPC_ENDPOINT_CB_EOF;
+ }
+ }
+ tcp_unref(tcp);
+ cb(opaque, slice, nslices, status);
+}
+
+static void win_notify_on_read(grpc_endpoint *ep,
+ grpc_endpoint_read_cb cb, void *arg) {
+ grpc_tcp *tcp = (grpc_tcp *) ep;
+ grpc_winsocket *handle = tcp->socket;
+ grpc_winsocket_callback_info *info = &handle->read_info;
+ int status;
+ DWORD bytes_read = 0;
+ DWORD flags = 0;
+ int error;
+ WSABUF buffer;
+
+ GPR_ASSERT(!tcp->outstanding_read);
+ tcp_ref(tcp);
+ tcp->outstanding_read = 1;
+ tcp->read_cb = cb;
+ tcp->read_user_data = arg;
+
+ tcp->read_slice = gpr_slice_malloc(8192);
+
+ buffer.len = GPR_SLICE_LENGTH(tcp->read_slice);
+ buffer.buf = GPR_SLICE_START_PTR(tcp->read_slice);
+
+ gpr_log(GPR_DEBUG, "win_notify_on_read: calling WSARecv without overlap");
+ status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags,
+ NULL, NULL);
+ info->wsa_error = status == 0 ? 0 : WSAGetLastError();
+
+ if (info->wsa_error != WSAEWOULDBLOCK) {
+ gpr_log(GPR_DEBUG, "got response immediately, calling on_read");
+ info->bytes_transfered = bytes_read;
+ /* This might heavily recurse. */
+ on_read(tcp, 1);
+ return;
+ }
+
+ gpr_log(GPR_DEBUG, "got WSAEWOULDBLOCK - calling WSARecv with overlap");
+
+ memset(&tcp->socket->read_info.overlapped, 0, sizeof(OVERLAPPED));
+ status = WSARecv(tcp->socket->socket, &buffer, 1, &bytes_read, &flags,
+ &info->overlapped, NULL);
+
+ if (status == 0) {
+ gpr_log(GPR_DEBUG, "got response immediately, but we're going to sleep");
+ grpc_socket_notify_on_read(tcp->socket, on_read, tcp);
+ return;
+ }
+
+ error = WSAGetLastError();
+
+ if (error != WSA_IO_PENDING) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ __debugbreak();
+ gpr_log(GPR_ERROR, "WSARecv error: %s", utf8_message);
+ gpr_free(utf8_message);
+ /* would the IO completion port be called anyway... ? Let's assume not. */
+ tcp->outstanding_read = 0;
+ tcp_unref(tcp);
+ cb(arg, NULL, 0, GRPC_ENDPOINT_CB_ERROR);
+ return;
+ }
+
+ gpr_log(GPR_DEBUG, "waiting on the IO completion port now");
+ grpc_socket_notify_on_read(tcp->socket, on_read, tcp);
+}
+
+static void on_write(void *tcpp, int success) {
+ grpc_tcp *tcp = (grpc_tcp *) tcpp;
+ grpc_winsocket *handle = tcp->socket;
+ grpc_winsocket_callback_info *info = &handle->write_info;
+ grpc_endpoint_cb_status status = GRPC_ENDPOINT_CB_OK;
+ grpc_endpoint_write_cb cb = tcp->write_cb;
+ void *opaque = tcp->write_user_data;
+
+ GPR_ASSERT(tcp->outstanding_write);
+
+ gpr_log(GPR_DEBUG, "on_write");
+
+ if (!success) {
+ tcp_unref(tcp);
+ cb(opaque, GRPC_ENDPOINT_CB_SHUTDOWN);
+ return;
+ }
+
+ if (info->wsa_error != 0) {
+ char *utf8_message = gpr_format_message(info->wsa_error);
+ gpr_log(GPR_ERROR, "WSASend overlapped error: %s", utf8_message);
+ gpr_free(utf8_message);
+ status = GRPC_ENDPOINT_CB_ERROR;
+ } else {
+ GPR_ASSERT(info->bytes_transfered == tcp->write_slices.length);
+ }
+
+ gpr_slice_buffer_reset_and_unref(&tcp->write_slices);
+ tcp->outstanding_write = 0;
+
+ tcp_unref(tcp);
+ cb(opaque, status);
+}
+
+static grpc_endpoint_write_status win_write(grpc_endpoint *ep,
+ gpr_slice *slices, size_t nslices,
+ grpc_endpoint_write_cb cb,
+ void *arg) {
+ grpc_tcp *tcp = (grpc_tcp *) ep;
+ grpc_winsocket *socket = tcp->socket;
+ grpc_winsocket_callback_info *info = &socket->write_info;
+ unsigned i;
+ DWORD bytes_sent;
+ int status;
+ WSABUF local_buffers[16];
+ WSABUF *allocated = NULL;
+ WSABUF *buffers = local_buffers;
+
+ GPR_ASSERT(nslices != 0);
+ GPR_ASSERT(GPR_SLICE_LENGTH(slices[0]) != 0);
+ GPR_ASSERT(!tcp->outstanding_write);
+ tcp_ref(tcp);
+
+ gpr_log(GPR_DEBUG, "win_write");
+
+ tcp->outstanding_write = 1;
+ tcp->write_cb = cb;
+ tcp->write_user_data = arg;
+ gpr_slice_buffer_addn(&tcp->write_slices, slices, nslices);
+
+ if (tcp->write_slices.count > GPR_ARRAY_SIZE(local_buffers)) {
+ buffers = (WSABUF *) gpr_malloc(sizeof(WSABUF) * tcp->write_slices.count);
+ allocated = buffers;
+ }
+
+ for (i = 0; i < tcp->write_slices.count; i++) {
+ buffers[i].len = GPR_SLICE_LENGTH(tcp->write_slices.slices[i]);
+ buffers[i].buf = GPR_SLICE_START_PTR(tcp->write_slices.slices[i]);
+ }
+
+ gpr_log(GPR_DEBUG, "win_write: calling WSASend without overlap");
+ status = WSASend(socket->socket, buffers, tcp->write_slices.count,
+ &bytes_sent, 0, NULL, NULL);
+ info->wsa_error = status == 0 ? 0 : WSAGetLastError();
+
+ if (info->wsa_error != WSAEWOULDBLOCK) {
+ grpc_endpoint_write_status ret = GRPC_ENDPOINT_WRITE_ERROR;
+ gpr_log(GPR_DEBUG, "got response immediately, cleaning up and leaving");
+ if (status == 0) {
+ ret = GRPC_ENDPOINT_WRITE_DONE;
+ GPR_ASSERT(bytes_sent == tcp->write_slices.length);
+ } else {
+ char *utf8_message = gpr_format_message(info->wsa_error);
+ gpr_log(GPR_ERROR, "WSASend error: %s", utf8_message);
+ gpr_free(utf8_message);
+ }
+ if (allocated) gpr_free(allocated);
+ gpr_slice_buffer_reset_and_unref(&tcp->write_slices);
+ tcp->outstanding_write = 0;
+ tcp_unref(tcp);
+ return ret;
+ }
+
+ gpr_log(GPR_DEBUG, "got WSAEWOULDBLOCK - calling WSASend with overlap");
+
+ memset(&socket->write_info, 0, sizeof(OVERLAPPED));
+ status = WSASend(socket->socket, buffers, tcp->write_slices.count,
+ &bytes_sent, 0, &socket->write_info.overlapped, NULL);
+ if (allocated) gpr_free(allocated);
+
+ if (status != 0) {
+ int error = WSAGetLastError();
+ if (error != WSA_IO_PENDING) {
+ char *utf8_message = gpr_format_message(WSAGetLastError());
+ __debugbreak();
+ gpr_log(GPR_ERROR, "WSASend error: %s", utf8_message);
+ gpr_free(utf8_message);
+ /* would the IO completion port be called anyway ? Let's assume not. */
+ tcp->outstanding_write = 0;
+ tcp_unref(tcp);
+ return GRPC_ENDPOINT_WRITE_ERROR;
+ }
+ gpr_log(GPR_DEBUG, "win_write: got pending op");
+ } else {
+ gpr_log(GPR_DEBUG, "wrote data immediately - but we're going to sleep");
+ }
+
+ 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_iocp_add_socket(tcp->socket);
+}
+
+static void win_shutdown(grpc_endpoint *ep) {
+ grpc_tcp *tcp = (grpc_tcp *) ep;
+ gpr_log(GPR_DEBUG, "win_shutdown");
+ grpc_winsocket_shutdown(tcp->socket);
+}
+
+static void win_destroy(grpc_endpoint *ep) {
+ grpc_tcp *tcp = (grpc_tcp *) ep;
+ gpr_log(GPR_DEBUG, "win_destroy");
+ tcp_unref(tcp);
+}
+
+static grpc_endpoint_vtable vtable = {
+ win_notify_on_read, win_write, win_add_to_pollset, win_shutdown, win_destroy
+};
+
+grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket) {
+ grpc_tcp *tcp = (grpc_tcp *) gpr_malloc(sizeof(grpc_tcp));
+ memset(tcp, 0, sizeof(grpc_tcp));
+ tcp->base.vtable = &vtable;
+ tcp->socket = socket;
+ gpr_slice_buffer_init(&tcp->write_slices);
+ gpr_ref_init(&tcp->refcount, 1);
+ return &tcp->base;
+}
+
+#endif /* GPR_WINSOCK_SOCKET */
diff --git a/src/core/iomgr/tcp_windows.h b/src/core/iomgr/tcp_windows.h
new file mode 100644
index 0000000000000000000000000000000000000000..cbe60801b4955b80a7d8a3c7ac5e0f0120ac95ce
--- /dev/null
+++ b/src/core/iomgr/tcp_windows.h
@@ -0,0 +1,57 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef __GRPC_INTERNAL_IOMGR_TCP_WINDOWS_H__
+#define __GRPC_INTERNAL_IOMGR_TCP_WINDOWS_H__
+/*
+ Low level TCP "bottom half" implementation, for use by transports built on
+ top of a TCP connection.
+
+ Note that this file does not (yet) include APIs for creating the socket in
+ the first place.
+
+ All calls passing slice transfer ownership of a slice refcount unless
+ otherwise specified.
+*/
+
+#include "src/core/iomgr/endpoint.h"
+#include "src/core/iomgr/socket_windows.h"
+
+/* Create a tcp endpoint given a winsock handle.
+ * Takes ownership of the handle.
+ */
+grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket);
+
+int grpc_tcp_prepare_socket(SOCKET sock);
+
+#endif /* __GRPC_INTERNAL_IOMGR_TCP_WINDOWS_H__ */
diff --git a/src/core/support/log_win32.c b/src/core/support/log_win32.c
index dc8c1d0785ad9e7afdcf0333fc5901c29a7561c1..840f24f68aa6a77b01c243aff719d0a6db268516 100644
--- a/src/core/support/log_win32.c
+++ b/src/core/support/log_win32.c
@@ -35,11 +35,16 @@
#ifdef GPR_WIN32
-#include <grpc/support/log.h>
-#include <grpc/support/alloc.h>
#include <stdio.h>
#include <stdarg.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_win32.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
+
+#include "src/core/support/string_win32.h"
+
void gpr_log(const char *file, int line, gpr_log_severity severity,
const char *format, ...) {
char *message = NULL;
@@ -74,8 +79,35 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
/* Simple starter implementation */
void gpr_default_log(gpr_log_func_args *args) {
- fprintf(stderr, "%s %s:%d: %s\n", gpr_log_severity_string(args->severity),
+ char time_buffer[64];
+ gpr_timespec now = gpr_now();
+ struct tm tm;
+
+ if (localtime_s(&tm, &now.tv_sec)) {
+ strcpy(time_buffer, "error:localtime");
+ } else if (0 ==
+ strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) {
+ strcpy(time_buffer, "error:strftime");
+ }
+
+ fprintf(stderr, "%s%s.%09u %5u %s:%d: %s\n",
+ gpr_log_severity_string(args->severity), time_buffer,
+ (int)(now.tv_nsec), GetCurrentThreadId(),
args->file, args->line, args->message);
}
-#endif
+char *gpr_format_message(DWORD messageid) {
+ LPTSTR tmessage;
+ char *message;
+ DWORD status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, messageid,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)(&tmessage), 0, NULL);
+ message = gpr_tchar_to_char(tmessage);
+ LocalFree(tmessage);
+ return message;
+}
+
+#endif /* GPR_WIN32 */
diff --git a/templates/vsprojects/vs2013/gpr.vcxproj.filters.template b/templates/vsprojects/vs2013/gpr.vcxproj.filters.template
index 0ed1ed85d0dd1cf1e5503907c1bff3b68307bb2a..c8b2ce099eac235b6c5c97d70ee30c0a57c46259 100644
--- a/templates/vsprojects/vs2013/gpr.vcxproj.filters.template
+++ b/templates/vsprojects/vs2013/gpr.vcxproj.filters.template
@@ -1,2 +1,2 @@
-<%namespace file="vcxproj.filters_defs.include" import="gen_project"/>\
-${gen_project('gpr', libs, targets)}
+<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\
+${gen_filters('gpr', libs, targets)}
diff --git a/templates/vsprojects/vs2013/grpc.vcxproj.filters.template b/templates/vsprojects/vs2013/grpc.vcxproj.filters.template
index 0327c9422d9ddd407cb59ee8b2dd75550baa2592..b8e91bd61c43965c8005497f349b66078698f026 100644
--- a/templates/vsprojects/vs2013/grpc.vcxproj.filters.template
+++ b/templates/vsprojects/vs2013/grpc.vcxproj.filters.template
@@ -1,2 +1,2 @@
-<%namespace file="vcxproj.filters_defs.include" import="gen_project"/>\
-${gen_project('grpc', libs, targets)}
+<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\
+${gen_filters('grpc', libs, targets)}
diff --git a/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template b/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template
new file mode 100644
index 0000000000000000000000000000000000000000..84aa50209aa08f2b64c89c8ce700168edc82ed1e
--- /dev/null
+++ b/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template
@@ -0,0 +1,2 @@
+<%namespace file="vcxproj_defs.include" import="gen_project"/>\
+${gen_project('grpc_csharp_ext', libs, targets)}
diff --git a/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.filters.template b/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.filters.template
index 48cbbd30bb695354f0227c2a857ab8d2e4e91baa..ef918922ef77e025ec955e8d81fe650ac2c51379 100644
--- a/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.filters.template
+++ b/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.filters.template
@@ -1,2 +1,2 @@
-<%namespace file="vcxproj.filters_defs.include" import="gen_project"/>\
-${gen_project('grpc_unsecure', libs, targets)}
+<%namespace file="vcxproj.filters_defs.include" import="gen_filters"/>\
+${gen_filters('grpc_unsecure', libs, targets)}
diff --git a/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.template b/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.template
index 3de6453f5200fe69a03342a6498113f9118ed9e8..4f62b85a8569b3bcd26474fb788471d0e2161470 100644
--- a/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.template
+++ b/templates/vsprojects/vs2013/grpc_unsecure.vcxproj.template
@@ -1,2 +1,2 @@
<%namespace file="vcxproj_defs.include" import="gen_project"/>\
-${gen_project('grpc', libs, targets)}
\ No newline at end of file
+${gen_project('grpc_unsecure', libs, targets)}
\ No newline at end of file
diff --git a/templates/vsprojects/vs2013/vcxproj.filters_defs.include b/templates/vsprojects/vs2013/vcxproj.filters_defs.include
index c25718b802555571fa73b9702597413670c51bd5..539ae932f140a2026ed5f93c79cca6cabce2f430 100644
--- a/templates/vsprojects/vs2013/vcxproj.filters_defs.include
+++ b/templates/vsprojects/vs2013/vcxproj.filters_defs.include
@@ -8,7 +8,7 @@
<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
<%def name="to_filter(path)">${calc_to_filter(path)}</%def>\
<%def name="filter_to_guid(proj, filter)">${re.sub('(........)(....)(....)(....)', r'\1-\2-\3-\4-', hashlib.md5(''.join([filter, proj])).hexdigest())}</%def>\
-<%def name="gen_project(name, libs, targets)">\
+<%def name="gen_filters(name, libs, targets)">\
% for project in vsprojects:
% if project.name == name:
<?xml version="1.0" encoding="utf-8"?>
diff --git a/test/core/end2end/cq_verifier.c b/test/core/end2end/cq_verifier.c
index de65ef317d713262fdcbeab6bb56c27001bbd485..15dc4270d6ff23f5781fa415b2ae085b6e7ac246 100644
--- a/test/core/end2end/cq_verifier.c
+++ b/test/core/end2end/cq_verifier.c
@@ -31,13 +31,6 @@
*
*/
-/* Disable sprintf warnings on Windows (it's fine to do that for test code).
- Also, cases where sprintf is called are crash sites anyway.
- TODO(jtattermusch): b/18636890 */
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
#include "test/core/end2end/cq_verifier.h"
#include <stdarg.h>
diff --git a/vsprojects/vs2013/.gitignore b/vsprojects/vs2013/.gitignore
index 75fb4ed6b6fd87e58fbd222023610c809b1f48ab..304acf019cd2dd6430cb5cbec6eef6ca9a6061fc 100644
--- a/vsprojects/vs2013/.gitignore
+++ b/vsprojects/vs2013/.gitignore
@@ -1,5 +1,8 @@
Debug
Release
*.suo
+*.user
+test_bin
grpc.opensdf
grpc.sdf
+third_party/*.user
diff --git a/vsprojects/vs2013/global.props b/vsprojects/vs2013/global.props
index 6a9050e3d2bd81e0d11658a41c3d78484fcf6ae3..27efc13b2476be39c16e2a99427c696d1f2b16e4 100644
--- a/vsprojects/vs2013/global.props
+++ b/vsprojects/vs2013/global.props
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportGroup Label="PropertySheets" />
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup />
- <ItemDefinitionGroup>
- <ClCompile>
- <AdditionalIncludeDirectories>$(SolutionDir)\..\..;$(SolutionDir)\..\..\include;$(SolutionDir)\..\..\third_party\zlib;$(SolutionDir)\..\third_party;$(SolutionDir)\..\..\third_party\openssl\inc32</AdditionalIncludeDirectories>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\..;$(SolutionDir)\..\..\include;$(SolutionDir)\..\..\third_party\zlib;$(SolutionDir)\..\third_party;$(SolutionDir)\..\..\third_party\openssl\inc32</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <WarningLevel>EnableAllWarnings</WarningLevel>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
</Project>
\ No newline at end of file
diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj
index 8276082cfdaee5ae5bc64d91a3eebbd946074ba0..e54029390da2d9474995fc59400b70e24c3feb73 100644
--- a/vsprojects/vs2013/gpr.vcxproj
+++ b/vsprojects/vs2013/gpr.vcxproj
@@ -83,6 +83,7 @@
<ClInclude Include="..\..\include\grpc\support\histogram.h" />
<ClInclude Include="..\..\include\grpc\support\host_port.h" />
<ClInclude Include="..\..\include\grpc\support\log.h" />
+ <ClInclude Include="..\..\include\grpc\support\log_win32.h" />
<ClInclude Include="..\..\include\grpc\support\port_platform.h" />
<ClInclude Include="..\..\include\grpc\support\slice.h" />
<ClInclude Include="..\..\include\grpc\support\slice_buffer.h" />
diff --git a/vsprojects/vs2013/gpr.vcxproj.filters b/vsprojects/vs2013/gpr.vcxproj.filters
index 2329acc9daee8ef6371e7d469edbe2306ddb188c..20e4e07c49d7a95995ee8ab9bf064416f6a5e452 100644
--- a/vsprojects/vs2013/gpr.vcxproj.filters
+++ b/vsprojects/vs2013/gpr.vcxproj.filters
@@ -129,6 +129,9 @@
<ClInclude Include="..\..\include\grpc\support\log.h">
<Filter>include\grpc\support</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\grpc\support\log_win32.h">
+ <Filter>include\grpc\support</Filter>
+ </ClInclude>
<ClInclude Include="..\..\include\grpc\support\port_platform.h">
<Filter>include\grpc\support</Filter>
</ClInclude>
diff --git a/vsprojects/vs2013/grpc.sln b/vsprojects/vs2013/grpc.sln
index 9b3ebaf633bccdbffea1b4cbc1eb667d147894db..efc4725ed1853ab87a83710b61de6cb05c1419ca 100644
--- a/vsprojects/vs2013/grpc.sln
+++ b/vsprojects/vs2013/grpc.sln
@@ -12,6 +12,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc", "grpc.vcxproj", "{29
{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext", "grpc_csharp_ext.vcxproj", "{D64C6D63-4458-4A88-AB38-35678384A7E4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
+ {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_test_util", "grpc_test_util.vcxproj", "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsecure.vcxproj", "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}"
@@ -41,6 +47,10 @@ Global
{29D16885-7228-4C31-81ED-5F9187C7F2A9}.Debug|Win32.Build.0 = Debug|Win32
{29D16885-7228-4C31-81ED-5F9187C7F2A9}.Release|Win32.ActiveCfg = Release|Win32
{29D16885-7228-4C31-81ED-5F9187C7F2A9}.Release|Win32.Build.0 = Release|Win32
+ {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.Build.0 = Debug|Win32
+ {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.ActiveCfg = Release|Win32
+ {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.Build.0 = Release|Win32
{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Debug|Win32.ActiveCfg = Debug|Win32
{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Debug|Win32.Build.0 = Debug|Win32
{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 0050d8cec3bf20178182deca7498e82e1465f720..22d368adb40f08adb3647e31b2253818f39e583b 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -115,6 +115,7 @@
<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" />
@@ -130,9 +131,11 @@
<ClInclude Include="..\..\src\core\iomgr\sockaddr_utils.h" />
<ClInclude Include="..\..\src\core\iomgr\sockaddr_win32.h" />
<ClInclude Include="..\..\src\core\iomgr\socket_utils_posix.h" />
+ <ClInclude Include="..\..\src\core\iomgr\socket_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_client.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h" />
+ <ClInclude Include="..\..\src\core\iomgr\tcp_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
@@ -253,10 +256,14 @@
</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">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iomgr_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_kick.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_multipoller_with_poll_posix.c">
@@ -277,12 +284,20 @@
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\socket_utils_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\socket_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_client_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_client_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_posix.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_server_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_server_windows.c">
+ </ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\time_averaged_stats.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\wakeup_fd_eventfd.c">
diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters
index 26b4aadf1478ab687f2de46add26c4c786b8a604..75ecc7a822d5c46d99b9d36933613c3d47cfdb8b 100644
--- a/vsprojects/vs2013/grpc.vcxproj.filters
+++ b/vsprojects/vs2013/grpc.vcxproj.filters
@@ -112,12 +112,18 @@
<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>
<ClCompile Include="..\..\src\core\iomgr\iomgr_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iomgr_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_kick.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -148,15 +154,27 @@
<ClCompile Include="..\..\src\core\iomgr\socket_utils_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\socket_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_client_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_client_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_server_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_server_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\time_averaged_stats.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -440,6 +458,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>
@@ -485,6 +506,9 @@
<ClInclude Include="..\..\src\core\iomgr\socket_utils_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\socket_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\tcp_client.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -494,6 +518,9 @@
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\tcp_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
diff --git a/vsprojects/vs2013/grpc_csharp_ext.vcxproj b/vsprojects/vs2013/grpc_csharp_ext.vcxproj
new file mode 100644
index 0000000000000000000000000000000000000000..0f355661869b3485d42e8f1964127853993c3d0a
--- /dev/null
+++ b/vsprojects/vs2013/grpc_csharp_ext.vcxproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{D64C6D63-4458-4A88-AB38-35678384A7E4}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v120</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v120</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="global.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="global.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\csharp\ext\grpc_csharp_ext.c">
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="gpr.vcxproj">
+ <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project>
+ </ProjectReference>
+ <ProjectReference Include="grpc.vcxproj">
+ <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
+
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj
index 0050d8cec3bf20178182deca7498e82e1465f720..8b5237047ebf7ba8829de843a5f8a575587ab509 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj
@@ -11,7 +11,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</ProjectGuid>
+ <ProjectGuid>{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -73,24 +73,12 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="..\..\include\grpc\grpc_security.h" />
<ClInclude Include="..\..\include\grpc\byte_buffer.h" />
<ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" />
<ClInclude Include="..\..\include\grpc\grpc.h" />
<ClInclude Include="..\..\include\grpc\status.h" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\core\security\auth.h" />
- <ClInclude Include="..\..\src\core\security\base64.h" />
- <ClInclude Include="..\..\src\core\security\credentials.h" />
- <ClInclude Include="..\..\src\core\security\google_root_certs.h" />
- <ClInclude Include="..\..\src\core\security\json_token.h" />
- <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" />
- <ClInclude Include="..\..\src\core\security\security_context.h" />
- <ClInclude Include="..\..\src\core\tsi\fake_transport_security.h" />
- <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" />
- <ClInclude Include="..\..\src\core\tsi\transport_security.h" />
- <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" />
<ClInclude Include="..\..\src\core\channel\census_filter.h" />
<ClInclude Include="..\..\src\core\channel\channel_args.h" />
<ClInclude Include="..\..\src\core\channel\channel_stack.h" />
@@ -115,6 +103,7 @@
<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" />
@@ -130,9 +119,11 @@
<ClInclude Include="..\..\src\core\iomgr\sockaddr_utils.h" />
<ClInclude Include="..\..\src\core\iomgr\sockaddr_win32.h" />
<ClInclude Include="..\..\src\core\iomgr\socket_utils_posix.h" />
+ <ClInclude Include="..\..\src\core\iomgr\socket_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_client.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h" />
+ <ClInclude Include="..\..\src\core\iomgr\tcp_windows.h" />
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
@@ -179,32 +170,6 @@
<ClInclude Include="..\..\src\core\transport\transport_impl.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\core\security\auth.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\base64.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\credentials.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\factories.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\google_root_certs.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\json_token.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\secure_endpoint.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\secure_transport_setup.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\security_context.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\tsi\ssl_transport_security.c">
- </ClCompile>
- <ClCompile Include="..\..\src\core\tsi\transport_security.c">
- </ClCompile>
<ClCompile Include="..\..\src\core\channel\call_op_string.c">
</ClCompile>
<ClCompile Include="..\..\src\core\channel\census_filter.c">
@@ -253,10 +218,14 @@
</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">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iomgr_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_kick.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_multipoller_with_poll_posix.c">
@@ -277,12 +246,20 @@
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\socket_utils_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\socket_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_client_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_client_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_posix.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_server_posix.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_server_windows.c">
+ </ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_windows.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\time_averaged_stats.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\wakeup_fd_eventfd.c">
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
index 80525445f27f7ddeb2855ead5504bbef52eb3406..50f319066f145a1086b23eccb1f6dccb07e9264a 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
@@ -73,12 +73,18 @@
<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>
<ClCompile Include="..\..\src\core\iomgr\iomgr_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\iomgr_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\pollset_kick.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -109,15 +115,27 @@
<ClCompile Include="..\..\src\core\iomgr\socket_utils_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\socket_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_client_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_client_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\tcp_server_posix.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_server_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\core\iomgr\tcp_windows.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\time_averaged_stats.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -365,6 +383,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>
@@ -410,6 +431,9 @@
<ClInclude Include="..\..\src\core\iomgr\socket_utils_posix.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\socket_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\tcp_client.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -419,6 +443,9 @@
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\iomgr\tcp_windows.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>