Remove pollset_set_posix.c

narzolliam · Feb 25, 2016 · 07eb5b0 · 07eb5b0
1 parent cf999dd
commit 07eb5b0
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 84 deletions.
diff --git a/BUILD b/BUILD
@@ -339,7 +339,6 @@ cc_library(
  "src/core/iomgr/iomgr.c",
  "src/core/iomgr/iomgr_posix.c",
  "src/core/iomgr/iomgr_windows.c",
- "src/core/iomgr/pollset_set_posix.c",
  "src/core/iomgr/pollset_set_windows.c",
  "src/core/iomgr/pollset_windows.c",
  "src/core/iomgr/resolve_address_posix.c",
@@ -654,7 +653,6 @@ cc_library(
  "src/core/iomgr/iomgr.c",
  "src/core/iomgr/iomgr_posix.c",
  "src/core/iomgr/iomgr_windows.c",
- "src/core/iomgr/pollset_set_posix.c",
  "src/core/iomgr/pollset_set_windows.c",
  "src/core/iomgr/pollset_windows.c",
  "src/core/iomgr/resolve_address_posix.c",
@@ -1315,7 +1313,6 @@ objc_library(
  "src/core/iomgr/iomgr.c",
  "src/core/iomgr/iomgr_posix.c",
  "src/core/iomgr/iomgr_windows.c",
- "src/core/iomgr/pollset_set_posix.c",
  "src/core/iomgr/pollset_set_windows.c",
  "src/core/iomgr/pollset_windows.c",
  "src/core/iomgr/resolve_address_posix.c",

diff --git a/Makefile b/Makefile
@@ -2402,7 +2402,6 @@ LIBGRPC_SRC = \
  src/core/iomgr/iomgr.c \
  src/core/iomgr/iomgr_posix.c \
  src/core/iomgr/iomgr_windows.c \
- src/core/iomgr/pollset_set_posix.c \
  src/core/iomgr/pollset_set_windows.c \
  src/core/iomgr/pollset_windows.c \
  src/core/iomgr/resolve_address_posix.c \
@@ -2712,7 +2711,6 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/iomgr/iomgr.c \
  src/core/iomgr/iomgr_posix.c \
  src/core/iomgr/iomgr_windows.c \
- src/core/iomgr/pollset_set_posix.c \
  src/core/iomgr/pollset_set_windows.c \
  src/core/iomgr/pollset_windows.c \
  src/core/iomgr/resolve_address_posix.c \

diff --git a/binding.gyp b/binding.gyp
@@ -605,7 +605,6 @@
  'src/core/iomgr/iomgr.c',
  'src/core/iomgr/iomgr_posix.c',
  'src/core/iomgr/iomgr_windows.c',
- 'src/core/iomgr/pollset_set_posix.c',
  'src/core/iomgr/pollset_set_windows.c',
  'src/core/iomgr/pollset_windows.c',
  'src/core/iomgr/resolve_address_posix.c',

diff --git a/build.yaml b/build.yaml
@@ -409,7 +409,6 @@ filegroups:
  - src/core/iomgr/iomgr.c
  - src/core/iomgr/iomgr_posix.c
  - src/core/iomgr/iomgr_windows.c
- - src/core/iomgr/pollset_set_posix.c
  - src/core/iomgr/pollset_set_windows.c
  - src/core/iomgr/pollset_windows.c
  - src/core/iomgr/resolve_address_posix.c

diff --git a/config.m4 b/config.m4
@@ -119,17 +119,14 @@ if test "$PHP_GRPC" != "no"; then
  src/core/iomgr/endpoint.c \
  src/core/iomgr/endpoint_pair_posix.c \
  src/core/iomgr/endpoint_pair_windows.c \
+ src/core/iomgr/ev_poll_and_epoll_posix.c \
+ src/core/iomgr/ev_posix.c \
  src/core/iomgr/exec_ctx.c \
  src/core/iomgr/executor.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_multipoller_with_epoll.c \
- src/core/iomgr/pollset_multipoller_with_poll_posix.c \
- src/core/iomgr/pollset_posix.c \
- src/core/iomgr/pollset_set_posix.c \
  src/core/iomgr/pollset_set_windows.c \
  src/core/iomgr/pollset_windows.c \
  src/core/iomgr/resolve_address_posix.c \

diff --git a/gRPC.podspec b/gRPC.podspec
@@ -356,7 +356,6 @@ Pod::Spec.new do |s|
  'src/core/iomgr/iomgr.c',
  'src/core/iomgr/iomgr_posix.c',
  'src/core/iomgr/iomgr_windows.c',
- 'src/core/iomgr/pollset_set_posix.c',
  'src/core/iomgr/pollset_set_windows.c',
  'src/core/iomgr/pollset_windows.c',
  'src/core/iomgr/resolve_address_posix.c',

diff --git a/grpc.gemspec b/grpc.gemspec
@@ -339,7 +339,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/iomgr/iomgr.c )
  s.files += %w( src/core/iomgr/iomgr_posix.c )
  s.files += %w( src/core/iomgr/iomgr_windows.c )
- s.files += %w( src/core/iomgr/pollset_set_posix.c )
  s.files += %w( src/core/iomgr/pollset_set_windows.c )
  s.files += %w( src/core/iomgr/pollset_windows.c )
  s.files += %w( src/core/iomgr/resolve_address_posix.c )

diff --git a/package.json b/package.json
@@ -283,7 +283,6 @@
  "src/core/iomgr/iomgr.c",
  "src/core/iomgr/iomgr_posix.c",
  "src/core/iomgr/iomgr_windows.c",
- "src/core/iomgr/pollset_set_posix.c",
  "src/core/iomgr/pollset_set_windows.c",
  "src/core/iomgr/pollset_windows.c",
  "src/core/iomgr/resolve_address_posix.c",

diff --git a/package.xml b/package.xml
@@ -197,15 +197,15 @@
  <file baseinstalldir="/" name="src/core/iomgr/closure.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/endpoint.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/endpoint_pair.h" role="src" />
+ <file baseinstalldir="/" name="src/core/iomgr/ev_poll_and_epoll_posix.h" role="src" />
+ <file baseinstalldir="/" name="src/core/iomgr/ev_posix.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/exec_ctx.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/executor.h" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/fd_posix.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iocp_windows.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr_internal.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr_posix.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset.h" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/pollset_posix.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset_set.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset_set_posix.h" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset_set_windows.h" role="src" />
@@ -335,17 +335,14 @@
  <file baseinstalldir="/" name="src/core/iomgr/endpoint.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/endpoint_pair_posix.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/endpoint_pair_windows.c" role="src" />
+ <file baseinstalldir="/" name="src/core/iomgr/ev_poll_and_epoll_posix.c" role="src" />
+ <file baseinstalldir="/" name="src/core/iomgr/ev_posix.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/exec_ctx.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/executor.c" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/fd_posix.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iocp_windows.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr_posix.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/iomgr_windows.c" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/pollset_multipoller_with_epoll.c" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/pollset_multipoller_with_poll_posix.c" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/pollset_posix.c" role="src" />
- <file baseinstalldir="/" name="src/core/iomgr/pollset_set_posix.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset_set_windows.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/pollset_windows.c" role="src" />
  <file baseinstalldir="/" name="src/core/iomgr/resolve_address_posix.c" role="src" />

diff --git a/src/core/iomgr/pollset_set_posix.c b/src/core/iomgr/pollset_set_posix.c
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
@@ -121,7 +121,6 @@
  'src/core/iomgr/iomgr.c',
  'src/core/iomgr/iomgr_posix.c',
  'src/core/iomgr/iomgr_windows.c',
- 'src/core/iomgr/pollset_set_posix.c',
  'src/core/iomgr/pollset_set_windows.c',
  'src/core/iomgr/pollset_windows.c',
  'src/core/iomgr/resolve_address_posix.c',

diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
@@ -957,7 +957,6 @@ 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_set_posix.c \
 src/core/iomgr/pollset_set_windows.c \
 src/core/iomgr/pollset_windows.c \
 src/core/iomgr/resolve_address_posix.c \

diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
@@ -4113,7 +4113,6 @@
  "src/core/iomgr/iomgr_windows.c", 
  "src/core/iomgr/pollset.h", 
  "src/core/iomgr/pollset_set.h", 
- "src/core/iomgr/pollset_set_posix.c", 
  "src/core/iomgr/pollset_set_posix.h", 
  "src/core/iomgr/pollset_set_windows.c", 
  "src/core/iomgr/pollset_set_windows.h", 
@@ -4652,7 +4651,6 @@
  "src/core/iomgr/iomgr_windows.c", 
  "src/core/iomgr/pollset.h", 
  "src/core/iomgr/pollset_set.h", 
- "src/core/iomgr/pollset_set_posix.c", 
  "src/core/iomgr/pollset_set_posix.h", 
  "src/core/iomgr/pollset_set_windows.c", 
  "src/core/iomgr/pollset_set_windows.h", 

diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -516,8 +516,6 @@
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\iomgr_windows.c">
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_posix.c">
- </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_windows.c">
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_windows.c">

diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -145,9 +145,6 @@
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\iomgr_windows.c">
  <Filter>src\core\iomgr</Filter>
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_posix.c">
- <Filter>src\core\iomgr</Filter>
- </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_windows.c">
  <Filter>src\core\iomgr</Filter>
  </ClCompile>

diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -494,8 +494,6 @@
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\iomgr_windows.c">
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_posix.c">
- </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_windows.c">
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_windows.c">

diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -148,9 +148,6 @@
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\iomgr_windows.c">
  <Filter>src\core\iomgr</Filter>
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_posix.c">
- <Filter>src\core\iomgr</Filter>
- </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\iomgr\pollset_set_windows.c">
  <Filter>src\core\iomgr</Filter>
  </ClCompile>