Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Separate out iomgr-specific constants into a separate header

Browse Source
pull/7665/head
murgatroid99 8 years ago
parent 79b322751f
commit 5407089b37
57 changed files with 154 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      BUILD
  2. 1
      build.yaml
  3. 2
      gRPC-Core.podspec
  4. 1
      grpc.gemspec
  5. 76
      include/grpc/impl/codegen/port_platform.h
  6. 1
      package.xml
  7. 2
      src/core/lib/iomgr/endpoint_pair_posix.c
  8. 2
      src/core/lib/iomgr/endpoint_pair_windows.c
  9. 2
      src/core/lib/iomgr/ev_epoll_linux.c
  10. 1
      src/core/lib/iomgr/ev_epoll_linux.h
  11. 2
      src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  12. 2
      src/core/lib/iomgr/ev_poll_posix.c
  13. 2
      src/core/lib/iomgr/ev_posix.c
  14. 2
      src/core/lib/iomgr/iocp_windows.c
  15. 2
      src/core/lib/iomgr/iomgr_posix.c
  16. 2
      src/core/lib/iomgr/iomgr_windows.c
  17. 2
      src/core/lib/iomgr/pollset_set_windows.c
  18. 2
      src/core/lib/iomgr/pollset_windows.c
  19. 83
      src/core/lib/iomgr/port.h
  20. 2
      src/core/lib/iomgr/resolve_address_posix.c
  21. 2
      src/core/lib/iomgr/resolve_address_windows.c
  22. 2
      src/core/lib/iomgr/sockaddr.h
  23. 2
      src/core/lib/iomgr/socket_utils.h
  24. 2
      src/core/lib/iomgr/socket_utils_common_posix.c
  25. 2
      src/core/lib/iomgr/socket_utils_linux.c
  26. 2
      src/core/lib/iomgr/socket_utils_posix.c
  27. 2
      src/core/lib/iomgr/socket_utils_windows.c
  28. 2
      src/core/lib/iomgr/socket_windows.c
  29. 2
      src/core/lib/iomgr/tcp_client_posix.c
  30. 2
      src/core/lib/iomgr/tcp_client_windows.c
  31. 2
      src/core/lib/iomgr/tcp_posix.c
  32. 2
      src/core/lib/iomgr/tcp_server_posix.c
  33. 2
      src/core/lib/iomgr/tcp_server_windows.c
  34. 2
      src/core/lib/iomgr/tcp_windows.c
  35. 2
      src/core/lib/iomgr/udp_server.c
  36. 5
      src/core/lib/iomgr/unix_sockets_posix.c
  37. 2
      src/core/lib/iomgr/unix_sockets_posix.h
  38. 2
      src/core/lib/iomgr/wakeup_fd_eventfd.c
  39. 2
      src/core/lib/iomgr/wakeup_fd_nospecial.c
  40. 2
      src/core/lib/iomgr/wakeup_fd_pipe.c
  41. 2
      src/core/lib/iomgr/wakeup_fd_posix.c
  42. 1
      src/core/lib/iomgr/workqueue.h
  43. 2
      src/core/lib/iomgr/workqueue_posix.c
  44. 1
      test/core/end2end/fixtures/h2_full+trace.c
  45. 1
      test/core/end2end/fixtures/h2_sockpair+trace.c
  46. 2
      test/core/iomgr/ev_epoll_linux_test.c
  47. 2
      test/core/util/port_posix.c
  48. 2
      test/core/util/port_windows.c
  49. 1
      test/cpp/end2end/async_end2end_test.cc
  50. 1
      tools/doxygen/Doxyfile.core.internal
  51. 2
      tools/run_tests/sources_and_headers.json
  52. 1
      vsprojects/vcxproj/grpc/grpc.vcxproj
  53. 3
      vsprojects/vcxproj/grpc/grpc.vcxproj.filters
  54. 1
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
  55. 3
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
  56. 1
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
  57. 3
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters

4
BUILD
Unescape View File

@ -195,6 +195,7 @@ cc_library(
"src/core/lib/iomgr/pollset_set.h",
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/sockaddr.h",
"src/core/lib/iomgr/sockaddr_posix.h",
@ -592,6 +593,7 @@ cc_library(
"src/core/lib/iomgr/pollset_set.h",
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/sockaddr.h",
"src/core/lib/iomgr/sockaddr_posix.h",
@ -948,6 +950,7 @@ cc_library(
"src/core/lib/iomgr/pollset_set.h",
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/sockaddr.h",
"src/core/lib/iomgr/sockaddr_posix.h",
@ -2065,6 +2068,7 @@ objc_library(
"src/core/lib/iomgr/pollset_set.h",
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/sockaddr.h",
"src/core/lib/iomgr/sockaddr_posix.h",

1
build.yaml
Unescape View File

@ -190,6 +190,7 @@ filegroups:
- src/core/lib/iomgr/pollset_set.h
- src/core/lib/iomgr/pollset_set_windows.h
- src/core/lib/iomgr/pollset_windows.h
- src/core/lib/iomgr/port.h
- src/core/lib/iomgr/resolve_address.h
- src/core/lib/iomgr/sockaddr.h
- src/core/lib/iomgr/sockaddr_posix.h

2
gRPC-Core.podspec
Unescape View File

@ -288,6 +288,7 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/pollset_set.h',
'src/core/lib/iomgr/pollset_set_windows.h',
'src/core/lib/iomgr/pollset_windows.h',
'src/core/lib/iomgr/port.h',
'src/core/lib/iomgr/resolve_address.h',
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_posix.h',
@ -651,6 +652,7 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/pollset_set.h',
'src/core/lib/iomgr/pollset_set_windows.h',
'src/core/lib/iomgr/pollset_windows.h',
'src/core/lib/iomgr/port.h',
'src/core/lib/iomgr/resolve_address.h',
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_posix.h',

1
grpc.gemspec
Unescape View File

@ -207,6 +207,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/iomgr/pollset_set.h )
s.files += %w( src/core/lib/iomgr/pollset_set_windows.h )
s.files += %w( src/core/lib/iomgr/pollset_windows.h )
s.files += %w( src/core/lib/iomgr/port.h )
s.files += %w( src/core/lib/iomgr/resolve_address.h )
s.files += %w( src/core/lib/iomgr/sockaddr.h )
s.files += %w( src/core/lib/iomgr/sockaddr_posix.h )

76
include/grpc/impl/codegen/port_platform.h
Unescape View File

@ -90,10 +90,8 @@
#endif
#define GPR_PLATFORM_STRING "windows"
#define GPR_WINDOWS 1
#define GPR_WINSOCK_SOCKET 1
#define GPR_WINDOWS_SUBPROCESS 1
#define GPR_WINDOWS_ENV
#define GPR_WINDOWS_SOCKETUTILS
#ifdef __MSYS__
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_MSYS_TMPFILE
@ -125,15 +123,7 @@
#define GPR_GCC_TLS 1
#define GPR_LINUX 1
#define GPR_LINUX_LOG 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_SUPPORT_CHANNELS_FROM_FD 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#define GPR_LINUX_ENV 1
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
@ -142,7 +132,6 @@
#define GPR_POSIX_SYNC 1
#define GPR_POSIX_TIME 1
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#ifdef _LP64
#define GPR_ARCH_64 1
#else /* _LP64 */
@ -159,12 +148,6 @@
#define GPR_CPU_LINUX 1
#define GPR_GCC_SYNC 1
#define GPR_GCC_TLS 1
#define GPR_POSIX_MULTIPOLL_WITH_POLL 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_LINUX_EVENTFD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_ENV 1
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
@ -175,10 +158,6 @@
#define GPR_POSIX_TIME 1
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_SUPPORT_CHANNELS_FROM_FD 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#elif defined(__linux__)
#define GPR_POSIX_CRASH_HANDLER 1
#define GPR_PLATFORM_STRING "linux"
@ -197,30 +176,11 @@
#define GPR_GCC_TLS 1
#define GPR_LINUX 1
#define GPR_LINUX_LOG
#define GPR_LINUX_MULTIPOLL_WITH_EPOLL 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_SUPPORT_CHANNELS_FROM_FD 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 9)
#define GPR_LINUX_EVENTFD 1
#define GPR_LINUX_EPOLL 1
#endif
#if __GLIBC_PREREQ(2, 10)
#define GPR_LINUX_SOCKETUTILS 1
#endif
#endif
#define GPR_LINUX_ENV 1
#ifndef GPR_LINUX_EVENTFD
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#endif
#ifndef GPR_LINUX_SOCKETUTILS
#define GPR_POSIX_SOCKETUTILS
#endif
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
#define GPR_POSIX_STRING 1
@ -228,7 +188,6 @@
#define GPR_POSIX_SYNC 1
#define GPR_POSIX_TIME 1
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#ifdef _LP64
#define GPR_ARCH_64 1
#else /* _LP64 */
@ -239,7 +198,6 @@
#ifndef _BSD_SOURCE
#define _BSD_SOURCE
#endif
#define GPR_MSG_IOVLEN_TYPE int
#if TARGET_OS_IPHONE
#define GPR_FORBID_UNREACHABLE_CODE 1
#define GPR_PLATFORM_STRING "ios"
@ -251,14 +209,9 @@
#define GPR_GCC_TLS 1
#define GPR_POSIX_CRASH_HANDLER 1
#endif
#define GPR_APPLE 1
#define GPR_GCC_ATOMIC 1
#define GPR_POSIX_LOG 1
#define GPR_POSIX_MULTIPOLL_WITH_POLL 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_ENV 1
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
@ -268,9 +221,6 @@
#define GPR_POSIX_TIME 1
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_SUPPORT_CHANNELS_FROM_FD 1
#define GPR_HAVE_SO_NOSIGPIPE 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_HAVE_IP_PKTINFO 1
#ifdef _LP64
#define GPR_ARCH_64 1
#else /* _LP64 */
@ -281,16 +231,11 @@
#ifndef _BSD_SOURCE
#define _BSD_SOURCE
#endif
#define GPR_FREEBSD 1
#define GPR_CPU_POSIX 1
#define GPR_GCC_ATOMIC 1
#define GPR_GCC_TLS 1
#define GPR_POSIX_LOG 1
#define GPR_POSIX_MULTIPOLL_WITH_POLL 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_ENV 1
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
@ -300,10 +245,6 @@
#define GPR_POSIX_TIME 1
#define GPR_GETPID_IN_UNISTD_H 1
#define GPR_SUPPORT_CHANNELS_FROM_FD 1
#define GPR_HAVE_SO_NOSIGPIPE 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#ifdef _LP64
#define GPR_ARCH_64 1
#else /* _LP64 */
@ -320,16 +261,11 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#define GPR_NACL 1
#define GPR_CPU_POSIX 1
#define GPR_GCC_ATOMIC 1
#define GPR_GCC_TLS 1
#define GPR_POSIX_LOG 1
#define GPR_POSIX_MULTIPOLL_WITH_POLL 1
#define GPR_POSIX_WAKEUP_FD 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_ENV 1
#define GPR_POSIX_FILE 1
#define GPR_POSIX_TMPFILE 1
@ -416,12 +352,6 @@ typedef unsigned __int64 uint64_t;
#error Must define GPR_POSIX_SOCKET to use GPR_POSIX_MULTIPOLL_WITH_POLL
#endif
#if defined(GPR_POSIX_SOCKET) + defined(GPR_WINSOCK_SOCKET) + \
defined(GPR_CUSTOM_SOCKET) != \
1
#error Must define exactly one of GPR_POSIX_SOCKET, GPR_WINSOCK_SOCKET, GPR_CUSTOM_SOCKET
#endif
#if defined(GPR_MSVC_TLS) + defined(GPR_GCC_TLS) + defined(GPR_PTHREAD_TLS) + \
defined(GPR_CUSTOM_TLS) != \
1

1
package.xml
Unescape View File

@ -215,6 +215,7 @@
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/port.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_posix.h" role="src" />

2
src/core/lib/iomgr/endpoint_pair_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/endpoint_pair_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET
#include "src/core/lib/iomgr/endpoint_pair.h"

2
src/core/lib/iomgr/ev_epoll_linux.c
Unescape View File

@ -32,7 +32,7 @@
*/
#include <grpc/grpc_posix.h>
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
/* This polling engine is only relevant on linux kernels supporting epoll() */
#ifdef GPR_LINUX_EPOLL

1
src/core/lib/iomgr/ev_epoll_linux.h
Unescape View File

@ -34,6 +34,7 @@
#ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H
#define GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/iomgr/ev_posix.h"
const grpc_event_engine_vtable *grpc_init_epoll_linux(void);

2
src/core/lib/iomgr/ev_poll_and_epoll_posix.c
Unescape View File

@ -42,7 +42,7 @@
* - ev_epoll_posix.{h,c}
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/ev_poll_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/ev_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/iocp_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/iomgr_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/iomgr_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/pollset_set_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#include <stdint.h>
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/pollset_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

83
src/core/lib/iomgr/port.h
Unescape View File

@ -36,8 +36,89 @@
#ifndef GRPC_CORE_LIB_IOMGR_PORT_H
#define GRPC_CORE_LIB_IOMGR_PORT_H
#if GPR_WINDOWS
#if defined(GPR_WINDOWS)
#define GPR_WINSOCK_SOCKET 1
#define GPR_WINDOWS_SOCKETUTILS 1
/* #undef GPR_POSIX_SOCKET */
/* #undef GPR_POSIX_WAKEUP_FD */
#elif defined(GPR_MANYLINUX1)
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_WAKEUP_FD 1
#elif defined(GPR_ANDROID)
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_LINUX_EVENTFD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_WAKEUP_FD 1
#elif defined(GPR_LINUX)
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_MSG_NOSIGNAL 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_LINUX_MULTIPOLL_WITH_EPOLL 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_WAKEUP_FD 1
#ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 9)
#define GPR_LINUX_EPOLL 1
#define GPR_LINUX_EVENTFD 1
#endif
#if __GLIBC_PREREQ(2, 10)
#define GPR_LINUX_SOCKETUTILS 1
#endif
#endif
#ifndef GPR_LINUX_EVENTFD
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#endif
#ifndef GPR_LINUX_SOCKETUTILS
#define GPR_POSIX_SOCKETUTILS
#endif
#elif defined(GPR_APPLE)
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_SO_NOSIGPIPE 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_MSG_IOVLEN_TYPE int
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_WAKEUP_FD 1
#elif defined(GPR_FREEBSD)
#define GPR_HAVE_IPV6_RECVPKTINFO 1
#define GPR_HAVE_IP_PKTINFO 1
#define GPR_HAVE_SO_NOSIGPIPE 1
#define GPR_HAVE_UNIX_SOCKET 1
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_WAKEUP_FD 1
#elif defined(GPR_NACL)
#define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
#define GPR_POSIX_SOCKET 1
#define GPR_POSIX_SOCKETADDR 1
#define GPR_POSIX_SOCKETUTILS 1
#define GPR_POSIX_WAKEUP_FD 1
#elif !defined(GPR_NO_AUTODETECT_PLATFORM)
#error "Platform not recognized"
#endif
#if defined(GPR_POSIX_SOCKET) + defined(GPR_WINSOCK_SOCKET) + \
defined(GPR_CUSTOM_SOCKET) != \
1
#error Must define exactly one of GPR_POSIX_SOCKET, GPR_WINSOCK_SOCKET, GPR_CUSTOM_SOCKET
#endif
#endif /* GRPC_CORE_LIB_IOMGR_PORT_H */

2
src/core/lib/iomgr/resolve_address_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET
#include "src/core/lib/iomgr/resolve_address.h"

2
src/core/lib/iomgr/resolve_address_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET
#include "src/core/lib/iomgr/resolve_address.h"

2
src/core/lib/iomgr/sockaddr.h
Unescape View File

@ -34,7 +34,7 @@
#ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_H
#define GRPC_CORE_LIB_IOMGR_SOCKADDR_H
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINDOWS
#include "src/core/lib/iomgr/sockaddr_windows.h"

2
src/core/lib/iomgr/socket_utils.h
Unescape View File

@ -34,6 +34,8 @@
#ifndef GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H
#define GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET
#include "sockaddr_windows.h"
#else

2
src/core/lib/iomgr/socket_utils_common_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/socket_utils_linux.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_LINUX_SOCKETUTILS

2
src/core/lib/iomgr/socket_utils_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKETUTILS

2
src/core/lib/iomgr/socket_utils_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINDOWS_SOCKETUTILS

2
src/core/lib/iomgr/socket_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/tcp_client_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/tcp_client_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/tcp_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/tcp_server_posix.c
Unescape View File

@ -36,7 +36,7 @@
#define _GNU_SOURCE
#endif
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

2
src/core/lib/iomgr/tcp_server_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/tcp_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_WINSOCK_SOCKET

2
src/core/lib/iomgr/udp_server.c
Unescape View File

@ -36,7 +36,7 @@
#define _GNU_SOURCE
#endif
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GRPC_NEED_UDP
#ifdef GPR_POSIX_SOCKET

5
src/core/lib/iomgr/unix_sockets_posix.c
Unescape View File

@ -30,8 +30,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "src/core/lib/iomgr/unix_sockets_posix.h"
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_HAVE_UNIX_SOCKET
@ -40,6 +39,8 @@
#include <sys/types.h>
#include <sys/un.h>
#include "src/core/lib/iomgr/unix_sockets_posix.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>

2
src/core/lib/iomgr/unix_sockets_posix.h
Unescape View File

@ -34,7 +34,7 @@
#ifndef GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
#define GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#include <grpc/support/string_util.h>

2
src/core/lib/iomgr/wakeup_fd_eventfd.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_LINUX_EVENTFD

2
src/core/lib/iomgr/wakeup_fd_nospecial.c
Unescape View File

@ -36,7 +36,7 @@
* systems without anything better than pipe.
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_NO_SPECIAL_WAKEUP_FD

2
src/core/lib/iomgr/wakeup_fd_pipe.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_WAKEUP_FD

2
src/core/lib/iomgr/wakeup_fd_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_WAKEUP_FD

1
src/core/lib/iomgr/workqueue.h
Unescape View File

@ -39,6 +39,7 @@
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/pollset.h"
#include "src/core/lib/iomgr/pollset_set.h"
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET
#include "src/core/lib/iomgr/workqueue_posix.h"

2
src/core/lib/iomgr/workqueue_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#ifdef GPR_POSIX_SOCKET

1
test/core/end2end/fixtures/h2_full+trace.c
Unescape View File

@ -45,6 +45,7 @@
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/channel/http_server_filter.h"
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/support/env.h"
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/server.h"

1
test/core/end2end/fixtures/h2_sockpair+trace.c
Unescape View File

@ -48,6 +48,7 @@
#include "src/core/lib/channel/http_server_filter.h"
#include "src/core/lib/iomgr/endpoint_pair.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/port.h"
#include "src/core/lib/support/env.h"
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/completion_queue.h"

2
test/core/iomgr/ev_epoll_linux_test.c
Unescape View File

@ -30,7 +30,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
/* This test only relevant on linux systems where epoll() is available */
#ifdef GPR_LINUX_EPOLL

2
test/core/util/port_posix.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#include "test/core/util/test_config.h"
#if defined(GPR_POSIX_SOCKET) && defined(GRPC_TEST_PICK_PORT)

2
test/core/util/port_windows.c
Unescape View File

@ -31,7 +31,7 @@
*
*/
#include <grpc/support/port_platform.h>
#include "src/core/lib/iomgr/port.h"
#include "test/core/util/test_config.h"
#if defined(GPR_WINSOCK_SOCKET) && defined(GRPC_TEST_PICK_PORT)

1
test/cpp/end2end/async_end2end_test.cc
Unescape View File

@ -47,6 +47,7 @@
#include <grpc/support/tls.h>
#include <gtest/gtest.h>
#include "src/core/lib/iomgr/port.h"
#include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h"
#include "test/core/util/port.h"

1
tools/doxygen/Doxyfile.core.internal
Unescape View File

@ -826,6 +826,7 @@ src/core/lib/iomgr/pollset.h \
src/core/lib/iomgr/pollset_set.h \
src/core/lib/iomgr/pollset_set_windows.h \
src/core/lib/iomgr/pollset_windows.h \
src/core/lib/iomgr/port.h \
src/core/lib/iomgr/resolve_address.h \
src/core/lib/iomgr/sockaddr.h \
src/core/lib/iomgr/sockaddr_posix.h \

2
tools/run_tests/sources_and_headers.json
Unescape View File

@ -5801,6 +5801,7 @@
"src/core/lib/iomgr/pollset_set.h",
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/sockaddr.h",
"src/core/lib/iomgr/sockaddr_posix.h",
@ -5926,6 +5927,7 @@
"src/core/lib/iomgr/pollset_set_windows.h",
"src/core/lib/iomgr/pollset_windows.c",
"src/core/lib/iomgr/pollset_windows.h",
"src/core/lib/iomgr/port.h",
"src/core/lib/iomgr/resolve_address.h",
"src/core/lib/iomgr/resolve_address_posix.c",
"src/core/lib/iomgr/resolve_address_windows.c",

1
vsprojects/vcxproj/grpc/grpc.vcxproj
Unescape View File

@ -335,6 +335,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />

3
vsprojects/vcxproj/grpc/grpc.vcxproj.filters
Unescape View File

@ -776,6 +776,9 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>

1
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
Unescape View File

@ -225,6 +225,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />

3
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
Unescape View File

@ -554,6 +554,9 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>

1
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
Unescape View File

@ -324,6 +324,7 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />

3
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
Unescape View File

@ -683,6 +683,9 @@
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\port.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h">
<Filter>src\core\lib\iomgr</Filter>
</ClInclude>

Write Preview
Loading…
Cancel
Save