move files to subdir and add generated files

8 years ago · c3c475fd14
parent fbbb0d707f
commit c3c475fd14
19 changed files with 318 additions and 77 deletions
--- a/30
+++ b/30
@ -1374,8 +1374,9 @@ cc_library(
    "src/cpp/server/secure_server_credentials.h",
    "src/cpp/client/create_channel_internal.h",
    "src/cpp/common/channel_filter.h",
-    "src/cpp/server/default_health_check_service.h",
    "src/cpp/server/dynamic_thread_pool.h",
+    "src/cpp/server/health/default_health_check_service.h",
+    "src/cpp/server/health/health.pb.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/cpp/client/insecure_credentials.cc",
@ -1402,10 +1403,11 @@ cc_library(
    "src/cpp/common/version_cc.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
-    "src/cpp/server/default_health_check_service.cc",
    "src/cpp/server/dynamic_thread_pool.cc",
-    "src/cpp/server/health_check_service.cc",
-    "src/cpp/server/health_check_service_server_builder_option.cc",
+    "src/cpp/server/health/default_health_check_service.cc",
+    "src/cpp/server/health/health.pb.c",
+    "src/cpp/server/health/health_check_service.cc",
+    "src/cpp/server/health/health_check_service_server_builder_option.cc",
    "src/cpp/server/server_builder.cc",
    "src/cpp/server/server_cc.cc",
    "src/cpp/server/server_context.cc",
@ -1528,8 +1530,9 @@ cc_library(
  srcs = [
    "src/cpp/client/create_channel_internal.h",
    "src/cpp/common/channel_filter.h",
-    "src/cpp/server/default_health_check_service.h",
    "src/cpp/server/dynamic_thread_pool.h",
+    "src/cpp/server/health/default_health_check_service.h",
+    "src/cpp/server/health/health.pb.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/core/ext/transport/chttp2/client/chttp2_connector.h",
@ -1698,10 +1701,11 @@ cc_library(
    "src/cpp/common/version_cc.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
-    "src/cpp/server/default_health_check_service.cc",
    "src/cpp/server/dynamic_thread_pool.cc",
-    "src/cpp/server/health_check_service.cc",
-    "src/cpp/server/health_check_service_server_builder_option.cc",
+    "src/cpp/server/health/default_health_check_service.cc",
+    "src/cpp/server/health/health.pb.c",
+    "src/cpp/server/health/health_check_service.cc",
+    "src/cpp/server/health/health_check_service_server_builder_option.cc",
    "src/cpp/server/server_builder.cc",
    "src/cpp/server/server_cc.cc",
    "src/cpp/server/server_context.cc",
@ -2029,8 +2033,9 @@ cc_library(
  srcs = [
    "src/cpp/client/create_channel_internal.h",
    "src/cpp/common/channel_filter.h",
-    "src/cpp/server/default_health_check_service.h",
    "src/cpp/server/dynamic_thread_pool.h",
+    "src/cpp/server/health/default_health_check_service.h",
+    "src/cpp/server/health/health.pb.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/cpp/client/insecure_credentials.cc",
@ -2052,10 +2057,11 @@ cc_library(
    "src/cpp/common/version_cc.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
-    "src/cpp/server/default_health_check_service.cc",
    "src/cpp/server/dynamic_thread_pool.cc",
-    "src/cpp/server/health_check_service.cc",
-    "src/cpp/server/health_check_service_server_builder_option.cc",
+    "src/cpp/server/health/default_health_check_service.cc",
+    "src/cpp/server/health/health.pb.c",
+    "src/cpp/server/health/health_check_service.cc",
+    "src/cpp/server/health/health_check_service_server_builder_option.cc",
    "src/cpp/server/server_builder.cc",
    "src/cpp/server/server_cc.cc",
    "src/cpp/server/server_context.cc",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1090,10 +1090,11 @@ add_library(grpc++
  src/cpp/common/version_cc.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/default_health_check_service.cc
  src/cpp/server/dynamic_thread_pool.cc
-  src/cpp/server/health_check_service.cc
-  src/cpp/server/health_check_service_server_builder_option.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health.pb.c
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
  src/cpp/server/server_builder.cc
  src/cpp/server/server_cc.cc
  src/cpp/server/server_context.cc
@ -1253,10 +1254,11 @@ add_library(grpc++_cronet
  src/cpp/common/version_cc.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/default_health_check_service.cc
  src/cpp/server/dynamic_thread_pool.cc
-  src/cpp/server/health_check_service.cc
-  src/cpp/server/health_check_service_server_builder_option.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health.pb.c
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
  src/cpp/server/server_builder.cc
  src/cpp/server/server_cc.cc
  src/cpp/server/server_context.cc
@ -1639,10 +1641,11 @@ add_library(grpc++_unsecure
  src/cpp/common/version_cc.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/default_health_check_service.cc
  src/cpp/server/dynamic_thread_pool.cc
-  src/cpp/server/health_check_service.cc
-  src/cpp/server/health_check_service_server_builder_option.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health.pb.c
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
  src/cpp/server/server_builder.cc
  src/cpp/server/server_cc.cc
  src/cpp/server/server_context.cc
--- a/34
+++ b/34
@ -3804,10 +3804,11 @@ LIBGRPC++_SRC = \
    src/cpp/common/version_cc.cc \
    src/cpp/server/async_generic_service.cc \
    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/default_health_check_service.cc \
    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health_check_service.cc \
-    src/cpp/server/health_check_service_server_builder_option.cc \
+    src/cpp/server/health/default_health_check_service.cc \
+    src/cpp/server/health/health.pb.c \
+    src/cpp/server/health/health_check_service.cc \
+    src/cpp/server/health/health_check_service_server_builder_option.cc \
    src/cpp/server/server_builder.cc \
    src/cpp/server/server_cc.cc \
    src/cpp/server/server_context.cc \
@ -3996,10 +3997,11 @@ LIBGRPC++_CRONET_SRC = \
    src/cpp/common/version_cc.cc \
    src/cpp/server/async_generic_service.cc \
    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/default_health_check_service.cc \
    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health_check_service.cc \
-    src/cpp/server/health_check_service_server_builder_option.cc \
+    src/cpp/server/health/default_health_check_service.cc \
+    src/cpp/server/health/health.pb.c \
+    src/cpp/server/health/health_check_service.cc \
+    src/cpp/server/health/health_check_service_server_builder_option.cc \
    src/cpp/server/server_builder.cc \
    src/cpp/server/server_cc.cc \
    src/cpp/server/server_context.cc \
@ -4710,10 +4712,11 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/common/version_cc.cc \
    src/cpp/server/async_generic_service.cc \
    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/default_health_check_service.cc \
    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health_check_service.cc \
-    src/cpp/server/health_check_service_server_builder_option.cc \
+    src/cpp/server/health/default_health_check_service.cc \
+    src/cpp/server/health/health.pb.c \
+    src/cpp/server/health/health_check_service.cc \
+    src/cpp/server/health/health_check_service_server_builder_option.cc \
    src/cpp/server/server_builder.cc \
    src/cpp/server/server_cc.cc \
    src/cpp/server/server_context.cc \
@ -7035,6 +7038,19 @@ endif


 LIBBENCHMARK_SRC = \
+    third_party/benchmark/src/benchmark.cc \
+    third_party/benchmark/src/benchmark_register.cc \
+    third_party/benchmark/src/colorprint.cc \
+    third_party/benchmark/src/commandlineflags.cc \
+    third_party/benchmark/src/complexity.cc \
+    third_party/benchmark/src/console_reporter.cc \
+    third_party/benchmark/src/csv_reporter.cc \
+    third_party/benchmark/src/json_reporter.cc \
+    third_party/benchmark/src/reporter.cc \
+    third_party/benchmark/src/sleep.cc \
+    third_party/benchmark/src/string_util.cc \
+    third_party/benchmark/src/sysinfo.cc \
+    third_party/benchmark/src/timers.cc \

 PUBLIC_HEADERS_CXX += \

--- a/build.yaml
+++ b/build.yaml
@ -759,8 +759,9 @@ filegroups:
  headers:
  - src/cpp/client/create_channel_internal.h
  - src/cpp/common/channel_filter.h
-  - src/cpp/server/default_health_check_service.h
  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/health/health.pb.h
  - src/cpp/server/thread_pool_interface.h
  - src/cpp/thread_manager/thread_manager.h
  src:
@ -780,10 +781,11 @@ filegroups:
  - src/cpp/common/version_cc.cc
  - src/cpp/server/async_generic_service.cc
  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/default_health_check_service.cc
  - src/cpp/server/dynamic_thread_pool.cc
-  - src/cpp/server/health_check_service.cc
-  - src/cpp/server/health_check_service_server_builder_option.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health.pb.c
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
  - src/cpp/server/server_builder.cc
  - src/cpp/server/server_cc.cc
  - src/cpp/server/server_context.cc
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@ -37,7 +37,7 @@
 #include <grpc++/impl/codegen/method_handler_impl.h>
 #include <grpc/support/log.h>

-#include "src/cpp/server/default_health_check_service.h"
+#include "src/cpp/server/health/default_health_check_service.h"
 #include "third_party/nanopb/pb_encode.h"
 #include "third_party/nanopb/pb_decode.h"

--- a/src/cpp/server/health/default_health_check_service.h
+++ b/src/cpp/server/health/default_health_check_service.h
--- a/src/cpp/server/health/health.pb.c
+++ b/src/cpp/server/health/health.pb.c
--- a/src/cpp/server/health/health.pb.h
+++ b/src/cpp/server/health/health.pb.h
--- a/src/cpp/server/health/health_check_service.cc
+++ b/src/cpp/server/health/health_check_service.cc
--- a/src/cpp/server/health/health_check_service_server_builder_option.cc
+++ b/src/cpp/server/health/health_check_service_server_builder_option.cc
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@ -51,7 +51,7 @@
 #include <grpc/support/log.h>

 #include "src/core/lib/profiling/timers.h"
-#include "src/cpp/server/default_health_check_service.h"
+#include "src/cpp/server/health/default_health_check_service.h"
 #include "src/cpp/thread_manager/thread_manager.h"

 namespace grpc {
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -855,8 +855,9 @@ src/cpp/common/secure_auth_context.h \
 src/cpp/server/secure_server_credentials.h \
 src/cpp/client/create_channel_internal.h \
 src/cpp/common/channel_filter.h \
-src/cpp/server/default_health_check_service.h \
 src/cpp/server/dynamic_thread_pool.h \
+src/cpp/server/health/default_health_check_service.h \
+src/cpp/server/health/health.pb.h \
 src/cpp/server/thread_pool_interface.h \
 src/cpp/thread_manager/thread_manager.h \
 src/cpp/client/insecure_credentials.cc \
@ -883,10 +884,11 @@ src/cpp/common/rpc_method.cc \
 src/cpp/common/version_cc.cc \
 src/cpp/server/async_generic_service.cc \
 src/cpp/server/create_default_thread_pool.cc \
-src/cpp/server/default_health_check_service.cc \
 src/cpp/server/dynamic_thread_pool.cc \
-src/cpp/server/health_check_service.cc \
-src/cpp/server/health_check_service_server_builder_option.cc \
+src/cpp/server/health/default_health_check_service.cc \
+src/cpp/server/health/health.pb.c \
+src/cpp/server/health/health_check_service.cc \
+src/cpp/server/health/health_check_service_server_builder_option.cc \
 src/cpp/server/server_builder.cc \
 src/cpp/server/server_cc.cc \
 src/cpp/server/server_context.cc \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -6227,7 +6227,28 @@
  }, 
  {
    "deps": [], 
-    "headers": [], 
+    "headers": [
+      "third_party/benchmark/include/benchmark/benchmark.h", 
+      "third_party/benchmark/include/benchmark/benchmark_api.h", 
+      "third_party/benchmark/include/benchmark/macros.h", 
+      "third_party/benchmark/include/benchmark/reporter.h", 
+      "third_party/benchmark/src/arraysize.h", 
+      "third_party/benchmark/src/benchmark_api_internal.h", 
+      "third_party/benchmark/src/check.h", 
+      "third_party/benchmark/src/colorprint.h", 
+      "third_party/benchmark/src/commandlineflags.h", 
+      "third_party/benchmark/src/complexity.h", 
+      "third_party/benchmark/src/cycleclock.h", 
+      "third_party/benchmark/src/internal_macros.h", 
+      "third_party/benchmark/src/log.h", 
+      "third_party/benchmark/src/mutex.h", 
+      "third_party/benchmark/src/re.h", 
+      "third_party/benchmark/src/sleep.h", 
+      "third_party/benchmark/src/stat.h", 
+      "third_party/benchmark/src/string_util.h", 
+      "third_party/benchmark/src/sysinfo.h", 
+      "third_party/benchmark/src/timers.h"
+    ], 
    "is_filegroup": false, 
    "language": "c++", 
    "name": "benchmark", 
@ -7658,8 +7679,9 @@
      "include/grpc++/support/time.h", 
      "src/cpp/client/create_channel_internal.h", 
      "src/cpp/common/channel_filter.h", 
-      "src/cpp/server/default_health_check_service.h", 
      "src/cpp/server/dynamic_thread_pool.h", 
+      "src/cpp/server/health/default_health_check_service.h", 
+      "src/cpp/server/health/health.pb.h", 
      "src/cpp/server/thread_pool_interface.h", 
      "src/cpp/thread_manager/thread_manager.h"
    ], 
@ -7729,12 +7751,14 @@
      "src/cpp/common/version_cc.cc", 
      "src/cpp/server/async_generic_service.cc", 
      "src/cpp/server/create_default_thread_pool.cc", 
-      "src/cpp/server/default_health_check_service.cc", 
-      "src/cpp/server/default_health_check_service.h", 
      "src/cpp/server/dynamic_thread_pool.cc", 
      "src/cpp/server/dynamic_thread_pool.h", 
-      "src/cpp/server/health_check_service.cc", 
-      "src/cpp/server/health_check_service_server_builder_option.cc", 
+      "src/cpp/server/health/default_health_check_service.cc", 
+      "src/cpp/server/health/default_health_check_service.h", 
+      "src/cpp/server/health/health.pb.c", 
+      "src/cpp/server/health/health.pb.h", 
+      "src/cpp/server/health/health_check_service.cc", 
+      "src/cpp/server/health/health_check_service_server_builder_option.cc", 
      "src/cpp/server/server_builder.cc", 
      "src/cpp/server/server_cc.cc", 
      "src/cpp/server/server_context.cc", 
--- a/vsprojects/vcxproj/benchmark/benchmark.vcxproj
+++ b/vsprojects/vcxproj/benchmark/benchmark.vcxproj
@ -147,7 +147,53 @@
  </ItemDefinitionGroup>

  <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\vsprojects\dummy.c">
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc">
    </ClCompile>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/vsprojects/vcxproj/benchmark/benchmark.vcxproj.filters
+++ b/vsprojects/vcxproj/benchmark/benchmark.vcxproj.filters
@ -1,7 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h">
+      <Filter>third_party\benchmark\include\benchmark</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h">
+      <Filter>third_party\benchmark\include\benchmark</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h">
+      <Filter>third_party\benchmark\include\benchmark</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h">
+      <Filter>third_party\benchmark\include\benchmark</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h">
+      <Filter>third_party\benchmark\src</Filter>
+    </ClInclude>
+  </ItemGroup>

  <ItemGroup>
+    <Filter Include="third_party">
+      <UniqueIdentifier>{7b593518-9fee-107e-6b64-24bdce73f939}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\benchmark">
+      <UniqueIdentifier>{f0d35de1-6b41-778d-0ba0-faad514fb0f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\benchmark\include">
+      <UniqueIdentifier>{cbc02dfa-face-8cc6-0efb-efacc0c3369c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\benchmark\include\benchmark">
+      <UniqueIdentifier>{4f2f03fc-b82d-df33-63ee-bedebeb2c0ee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\benchmark\src">
+      <UniqueIdentifier>{f42a8e0a-5a76-0e6f-d708-f0306858f673}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
 </Project>

--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@ -355,8 +355,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h" />
  </ItemGroup>
@ -409,13 +410,15 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.cc">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service_server_builder_option.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service_server_builder_option.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@ -73,17 +73,20 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
      <Filter>src\cpp\server</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.cc">
-      <Filter>src\cpp\server</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
      <Filter>src\cpp\server</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service.cc">
-      <Filter>src\cpp\server</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.cc">
+      <Filter>src\cpp\server\health</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service_server_builder_option.cc">
-      <Filter>src\cpp\server</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.c">
+      <Filter>src\cpp\server\health</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service.cc">
+      <Filter>src\cpp\server\health</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service_server_builder_option.cc">
+      <Filter>src\cpp\server\health</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
      <Filter>src\cpp\server</Filter>
@ -410,12 +413,15 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h">
      <Filter>src\cpp\common</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.h">
-      <Filter>src\cpp\server</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h">
      <Filter>src\cpp\server</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.h">
+      <Filter>src\cpp\server\health</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h">
+      <Filter>src\cpp\server\health</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h">
      <Filter>src\cpp\server</Filter>
    </ClInclude>
@ -479,6 +485,9 @@
    <Filter Include="src\cpp\server">
      <UniqueIdentifier>{321b0980-74ad-e8ca-f23b-deffa5d6bb8f}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\cpp\server\health">
+      <UniqueIdentifier>{5bc9ef4e-78c1-159e-4e4e-30ddfce3e140}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\cpp\thread_manager">
      <UniqueIdentifier>{23f9df56-8604-52a0-e6a2-f01b8e68d0e7}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@ -351,8 +351,9 @@
  <ItemGroup>
    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h" />
  </ItemGroup>
@ -395,13 +396,15 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.cc">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.cc">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service_server_builder_option.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service_server_builder_option.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@ -58,17 +58,20 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
      <Filter>src\cpp\server</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.cc">
-      <Filter>src\cpp\server</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
      <Filter>src\cpp\server</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service.cc">
-      <Filter>src\cpp\server</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.cc">
+      <Filter>src\cpp\server\health</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health_check_service_server_builder_option.cc">
-      <Filter>src\cpp\server</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.c">
+      <Filter>src\cpp\server\health</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service.cc">
+      <Filter>src\cpp\server\health</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\health\health_check_service_server_builder_option.cc">
+      <Filter>src\cpp\server\health</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
      <Filter>src\cpp\server</Filter>
@ -383,12 +386,15 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h">
      <Filter>src\cpp\common</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\default_health_check_service.h">
-      <Filter>src\cpp\server</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h">
      <Filter>src\cpp\server</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\default_health_check_service.h">
+      <Filter>src\cpp\server\health</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h">
+      <Filter>src\cpp\server\health</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h">
      <Filter>src\cpp\server</Filter>
    </ClInclude>
@ -452,6 +458,9 @@
    <Filter Include="src\cpp\server">
      <UniqueIdentifier>{8a54a279-d14b-4237-0df3-1ffe1ef5a7af}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\cpp\server\health">
+      <UniqueIdentifier>{a003cb5c-7249-106c-8ee5-de5e11a6692c}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\cpp\thread_manager">
      <UniqueIdentifier>{e5b55f25-d99f-b8e5-9981-7da7fa7ba628}</UniqueIdentifier>
    </Filter>