Merge pull request #8680 from ctiller/no_more_legacy

Remove legacy poller
8 years ago · c80fa2f673
parent a1cf4dd607 e6684f415e
commit c80fa2f673
22 changed files with 1 additions and 2179 deletions
--- a/8
+++ b/8
@ -179,7 +179,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
    "src/core/lib/iomgr/ev_epoll_linux.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
@ -355,7 +354,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -615,7 +613,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
    "src/core/lib/iomgr/ev_epoll_linux.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
@ -776,7 +773,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -1006,7 +1002,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
    "src/core/lib/iomgr/ev_epoll_linux.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
@ -1159,7 +1154,6 @@ cc_library(
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -2021,7 +2015,6 @@ objc_library(
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.c",
    "src/core/lib/iomgr/ev_poll_posix.c",
    "src/core/lib/iomgr/ev_posix.c",
    "src/core/lib/iomgr/exec_ctx.c",
@ -2260,7 +2253,6 @@ objc_library(
    "src/core/lib/iomgr/endpoint_pair.h",
    "src/core/lib/iomgr/error.h",
    "src/core/lib/iomgr/ev_epoll_linux.h",
-    "src/core/lib/iomgr/ev_poll_and_epoll_posix.h",
    "src/core/lib/iomgr/ev_poll_posix.h",
    "src/core/lib/iomgr/ev_posix.h",
    "src/core/lib/iomgr/exec_ctx.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -309,7 +309,6 @@ add_library(grpc
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
-  src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  src/core/lib/iomgr/ev_poll_posix.c
  src/core/lib/iomgr/ev_posix.c
  src/core/lib/iomgr/exec_ctx.c
@ -589,7 +588,6 @@ add_library(grpc_cronet
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
-  src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  src/core/lib/iomgr/ev_poll_posix.c
  src/core/lib/iomgr/ev_posix.c
  src/core/lib/iomgr/exec_ctx.c
@ -841,7 +839,6 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
-  src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  src/core/lib/iomgr/ev_poll_posix.c
  src/core/lib/iomgr/ev_posix.c
  src/core/lib/iomgr/exec_ctx.c
--- a/4
+++ b/4
@ -2643,7 +2643,6 @@ LIBGRPC_SRC = \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
@ -2941,7 +2940,6 @@ LIBGRPC_CRONET_SRC = \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
@ -3230,7 +3228,6 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
@ -3448,7 +3445,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
--- a/binding.gyp
+++ b/binding.gyp
@ -589,7 +589,6 @@
        'src/core/lib/iomgr/endpoint_pair_windows.c',
        'src/core/lib/iomgr/error.c',
        'src/core/lib/iomgr/ev_epoll_linux.c',
-        'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
        'src/core/lib/iomgr/ev_poll_posix.c',
        'src/core/lib/iomgr/ev_posix.c',
        'src/core/lib/iomgr/exec_ctx.c',
--- a/build.yaml
+++ b/build.yaml
@ -186,7 +186,6 @@ filegroups:
  - src/core/lib/iomgr/endpoint_pair.h
  - src/core/lib/iomgr/error.h
  - src/core/lib/iomgr/ev_epoll_linux.h
-  - src/core/lib/iomgr/ev_poll_and_epoll_posix.h
  - src/core/lib/iomgr/ev_poll_posix.h
  - src/core/lib/iomgr/ev_posix.h
  - src/core/lib/iomgr/exec_ctx.h
@ -286,7 +285,6 @@ filegroups:
  - src/core/lib/iomgr/endpoint_pair_windows.c
  - src/core/lib/iomgr/error.c
  - src/core/lib/iomgr/ev_epoll_linux.c
-  - src/core/lib/iomgr/ev_poll_and_epoll_posix.c
  - src/core/lib/iomgr/ev_poll_posix.c
  - src/core/lib/iomgr/ev_posix.c
  - src/core/lib/iomgr/exec_ctx.c
--- a/config.m4
+++ b/config.m4
@ -105,7 +105,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
-    src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
    src/core/lib/iomgr/ev_poll_posix.c \
    src/core/lib/iomgr/ev_posix.c \
    src/core/lib/iomgr/exec_ctx.c \
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -268,7 +268,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/endpoint_pair.h',
                      'src/core/lib/iomgr/error.h',
                      'src/core/lib/iomgr/ev_epoll_linux.h',
-                      'src/core/lib/iomgr/ev_poll_and_epoll_posix.h',
                      'src/core/lib/iomgr/ev_poll_posix.h',
                      'src/core/lib/iomgr/ev_posix.h',
                      'src/core/lib/iomgr/exec_ctx.h',
@ -448,7 +447,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/endpoint_pair_windows.c',
                      'src/core/lib/iomgr/error.c',
                      'src/core/lib/iomgr/ev_epoll_linux.c',
-                      'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
                      'src/core/lib/iomgr/ev_poll_posix.c',
                      'src/core/lib/iomgr/ev_posix.c',
                      'src/core/lib/iomgr/exec_ctx.c',
@ -673,7 +671,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/endpoint_pair.h',
                              'src/core/lib/iomgr/error.h',
                              'src/core/lib/iomgr/ev_epoll_linux.h',
-                              'src/core/lib/iomgr/ev_poll_and_epoll_posix.h',
                              'src/core/lib/iomgr/ev_poll_posix.h',
                              'src/core/lib/iomgr/ev_posix.h',
                              'src/core/lib/iomgr/exec_ctx.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -188,7 +188,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/endpoint_pair.h )
  s.files += %w( src/core/lib/iomgr/error.h )
  s.files += %w( src/core/lib/iomgr/ev_epoll_linux.h )
-  s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.h )
  s.files += %w( src/core/lib/iomgr/ev_poll_posix.h )
  s.files += %w( src/core/lib/iomgr/ev_posix.h )
  s.files += %w( src/core/lib/iomgr/exec_ctx.h )
@ -368,7 +367,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/endpoint_pair_windows.c )
  s.files += %w( src/core/lib/iomgr/error.c )
  s.files += %w( src/core/lib/iomgr/ev_epoll_linux.c )
-  s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.c )
  s.files += %w( src/core/lib/iomgr/ev_poll_posix.c )
  s.files += %w( src/core/lib/iomgr/ev_posix.c )
  s.files += %w( src/core/lib/iomgr/exec_ctx.c )
--- a/package.xml
+++ b/package.xml
@ -195,7 +195,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_epoll_linux.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_and_epoll_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.h" role="src" />
@ -375,7 +374,6 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_epoll_linux.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_and_epoll_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_poll_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/exec_ctx.c" role="src" />
--- a/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
+++ b/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
--- a/src/core/lib/iomgr/ev_poll_and_epoll_posix.h
+++ b/src/core/lib/iomgr/ev_poll_and_epoll_posix.h
@ -1,41 +0,0 @@
-/*
- *
- * Copyright 2015, 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_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H
-#define GRPC_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H
-
-#include "src/core/lib/iomgr/ev_posix.h"
-
-const grpc_event_engine_vtable *grpc_init_poll_and_epoll_posix(void);
-
-#endif /* GRPC_CORE_LIB_IOMGR_EV_POLL_AND_EPOLL_POSIX_H */
--- a/src/core/lib/iomgr/ev_posix.c
+++ b/src/core/lib/iomgr/ev_posix.c
@ -45,7 +45,6 @@
 #include <grpc/support/useful.h>

 #include "src/core/lib/iomgr/ev_epoll_linux.h"
-#include "src/core/lib/iomgr/ev_poll_and_epoll_posix.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/support/env.h"

@ -67,7 +66,6 @@ static const event_engine_factory g_factories[] = {
    {"epoll", grpc_init_epoll_linux},
    {"poll", grpc_init_poll_posix},
    {"poll-cv", grpc_init_poll_cv_posix},
-    {"legacy", grpc_init_poll_and_epoll_posix},
 };

 static void add(const char *beg, const char *end, char ***ss, size_t *ns) {
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -99,7 +99,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/iomgr/endpoint_pair_windows.c',
  'src/core/lib/iomgr/error.c',
  'src/core/lib/iomgr/ev_epoll_linux.c',
-  'src/core/lib/iomgr/ev_poll_and_epoll_posix.c',
  'src/core/lib/iomgr/ev_poll_posix.c',
  'src/core/lib/iomgr/ev_posix.c',
  'src/core/lib/iomgr/exec_ctx.c',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -811,7 +811,6 @@ src/core/lib/iomgr/endpoint.h \
 src/core/lib/iomgr/endpoint_pair.h \
 src/core/lib/iomgr/error.h \
 src/core/lib/iomgr/ev_epoll_linux.h \
-src/core/lib/iomgr/ev_poll_and_epoll_posix.h \
 src/core/lib/iomgr/ev_poll_posix.h \
 src/core/lib/iomgr/ev_posix.h \
 src/core/lib/iomgr/exec_ctx.h \
@ -991,7 +990,6 @@ src/core/lib/iomgr/endpoint_pair_uv.c \
 src/core/lib/iomgr/endpoint_pair_windows.c \
 src/core/lib/iomgr/error.c \
 src/core/lib/iomgr/ev_epoll_linux.c \
-src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
 src/core/lib/iomgr/ev_poll_posix.c \
 src/core/lib/iomgr/ev_posix.c \
 src/core/lib/iomgr/exec_ctx.c \
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@ -69,7 +69,7 @@ _FORCE_ENVIRON_FOR_WRAPPERS = {


 _POLLING_STRATEGIES = {
-  'linux': ['epoll', 'poll', 'poll-cv', 'legacy']
+  'linux': ['epoll', 'poll', 'poll-cv']
 }


--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -6673,7 +6673,6 @@
      "src/core/lib/iomgr/endpoint_pair.h", 
      "src/core/lib/iomgr/error.h", 
      "src/core/lib/iomgr/ev_epoll_linux.h", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.h", 
      "src/core/lib/iomgr/ev_poll_posix.h", 
      "src/core/lib/iomgr/ev_posix.h", 
      "src/core/lib/iomgr/exec_ctx.h", 
@ -6809,8 +6808,6 @@
      "src/core/lib/iomgr/error.h", 
      "src/core/lib/iomgr/ev_epoll_linux.c", 
      "src/core/lib/iomgr/ev_epoll_linux.h", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.c", 
-      "src/core/lib/iomgr/ev_poll_and_epoll_posix.h", 
      "src/core/lib/iomgr/ev_poll_posix.c", 
      "src/core/lib/iomgr/ev_poll_posix.h", 
      "src/core/lib/iomgr/ev_posix.c", 
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -320,7 +320,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
@ -527,8 +526,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -76,9 +76,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
@ -800,9 +797,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
@ -213,7 +213,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
@ -378,8 +377,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
@ -133,9 +133,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
@ -596,9 +593,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -310,7 +310,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
@ -495,8 +494,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -79,9 +79,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
      <Filter>src\core\lib\iomgr</Filter>
    </ClCompile>
@ -713,9 +710,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
-      <Filter>src\core\lib\iomgr</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
      <Filter>src\core\lib\iomgr</Filter>
    </ClInclude>