Merge branch 'master' into gpr_review

narzolliam · Feb 8, 2018 · 239b7d4 · 239b7d4
2 parents 8f4fbb1 + 100e0a7
commit 239b7d4
Show file tree

Hide file tree

Showing 200 changed files with 2,025 additions and 2,307 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,5 +5,6 @@
 /bazel/** @nicolasnoble @dgquintas @a11r @vjpai
 /cmake/** @jtattermusch @nicolasnoble @matt-kwong
 /src/core/ext/filters/client_channel/** @markdroth @dgquintas @a11r
+/test/cpp/end2end/** @vjpai @yang-g @y-zeng
 /tools/dockerfile/** @jtattermusch @matt-kwong @nicolasnoble
-/tools/run_tests/performance/** @ncteisen @matt-kwong @ctiller
+/tools/run_tests/performance/** @ncteisen @matt-kwong @jtattermusch
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,10 @@
 [submodule "third_party/zlib"]
  path = third_party/zlib
  url = https://github.com/madler/zlib
+ # When using CMake to build, the zlib submodule ends up with a
+ # generated file that makes Git consider the submodule dirty. This
+ # state can be ignored for day-to-day development on gRPC.
+ ignore = dirty
 [submodule "third_party/protobuf"]
  path = third_party/protobuf
  url = https://github.com/google/protobuf.git

diff --git a/BUILD b/BUILD
@@ -68,7 +68,6 @@ GPR_PUBLIC_HDRS = [
  "include/grpc/support/atm_windows.h",
  "include/grpc/support/cmdline.h",
  "include/grpc/support/cpu.h",
- "include/grpc/support/host_port.h",
  "include/grpc/support/log.h",
  "include/grpc/support/log_windows.h",
  "include/grpc/support/port_platform.h",
@@ -91,7 +90,6 @@ GRPC_PUBLIC_HDRS = [
  "include/grpc/byte_buffer.h",
  "include/grpc/byte_buffer_reader.h",
  "include/grpc/compression.h",
- "include/grpc/compression_ruby.h",
  "include/grpc/fork.h",
  "include/grpc/grpc.h",
  "include/grpc/grpc_posix.h",
@@ -451,8 +449,6 @@ grpc_cc_library(
 grpc_cc_library(
  name = "gpr_base",
  srcs = [
- "src/core/lib/profiling/basic_timers.cc",
- "src/core/lib/profiling/stap_timers.cc",
  "src/core/lib/gpr/alloc.cc",
  "src/core/lib/gpr/arena.cc",
  "src/core/lib/gpr/atm.cc",
@@ -494,13 +490,14 @@ grpc_cc_library(
  "src/core/lib/gpr/tmpfile_posix.cc",
  "src/core/lib/gpr/tmpfile_windows.cc",
  "src/core/lib/gpr/wrap_memcpy.cc",
+ "src/core/lib/profiling/basic_timers.cc",
+ "src/core/lib/profiling/stap_timers.cc",
  ],
  hdrs = [
- "src/core/lib/profiling/timers.h",
  "src/core/lib/gpr/arena.h",
  "src/core/lib/gpr/env.h",
  "src/core/lib/gpr/fork.h",
- "src/core/lib/gpr/useful.h",
+ "src/core/lib/gpr/host_port.h",
  "src/core/lib/gpr/mpscq.h",
  "src/core/lib/gpr/murmur_hash.h",
  "src/core/lib/gpr/spinlock.h",
@@ -509,6 +506,8 @@ grpc_cc_library(
  "src/core/lib/gpr/thd_internal.h",
  "src/core/lib/gpr/time_precise.h",
  "src/core/lib/gpr/tmpfile.h",
+ "src/core/lib/gpr/useful.h",
+ "src/core/lib/profiling/timers.h",
  ],
  language = "c++",
  public_hdrs = GPR_PUBLIC_HDRS,
@@ -561,14 +560,14 @@ grpc_cc_library(
 
 grpc_cc_library(
  name = "atomic",
- language = "c++",
- public_hdrs = [
- "src/core/lib/gprpp/atomic.h",
- ],
  hdrs = [
  "src/core/lib/gprpp/atomic_with_atm.h",
  "src/core/lib/gprpp/atomic_with_std.h",
  ],
+ language = "c++",
+ public_hdrs = [
+ "src/core/lib/gprpp/atomic.h",
+ ],
  deps = [
  "gpr",
  ],
@@ -599,6 +598,7 @@ grpc_cc_library(
  "debug_location",
  "gpr++_base",
  "grpc_trace",
+ "ref_counted_ptr",
  ],
 )
 
@@ -610,6 +610,7 @@ grpc_cc_library(
  "debug_location",
  "gpr++_base",
  "grpc_trace",
+ "ref_counted_ptr",
  ],
 )
 
@@ -636,7 +637,6 @@ grpc_cc_library(
  "src/core/lib/channel/handshaker_registry.cc",
  "src/core/lib/compression/compression.cc",
  "src/core/lib/compression/compression_internal.cc",
- "src/core/lib/compression/compression_ruby.cc",
  "src/core/lib/compression/message_compress.cc",
  "src/core/lib/compression/stream_compression.cc",
  "src/core/lib/compression/stream_compression_gzip.cc",
@@ -888,8 +888,8 @@ grpc_cc_library(
  language = "c++",
  public_hdrs = GRPC_PUBLIC_HDRS,
  deps = [
- "gpr_base",
  "gpr++_base",
+ "gpr_base",
  "grpc_codegen",
  "grpc_trace",
  ],

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,10 +30,10 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
 project(${PACKAGE_NAME} C CXX)
 
-set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-set(gRPC_INSTALL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/${PACKAGE_NAME}" CACHE PATH "Installation directory for cmake config files")
+set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables")
+set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries")
+set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers")
+set(gRPC_INSTALL_CMAKEDIR "lib/cmake/${PACKAGE_NAME}" CACHE STRING "Installation directory for cmake config files")
 
 # Options
 option(gRPC_BUILD_TESTS "Build tests" OFF)
@@ -316,7 +316,6 @@ add_dependencies(buildtests_c json_rewrite_test)
 add_dependencies(buildtests_c json_stream_error_test)
 add_dependencies(buildtests_c json_test)
 add_dependencies(buildtests_c lame_client_test)
-add_dependencies(buildtests_c lb_policies_test)
 add_dependencies(buildtests_c load_file_test)
 add_dependencies(buildtests_c memory_profile_client)
 add_dependencies(buildtests_c memory_profile_server)
@@ -389,6 +388,7 @@ endif()
 add_dependencies(buildtests_c public_headers_must_be_c89)
 add_dependencies(buildtests_c badreq_bad_client_test)
 add_dependencies(buildtests_c connection_prefix_bad_client_test)
+add_dependencies(buildtests_c duplicate_header_bad_client_test)
 add_dependencies(buildtests_c head_of_line_blocking_bad_client_test)
 add_dependencies(buildtests_c headers_bad_client_test)
 add_dependencies(buildtests_c initial_settings_frame_bad_client_test)
@@ -705,7 +705,6 @@ foreach(_hdr
  include/grpc/support/atm_windows.h
  include/grpc/support/cmdline.h
  include/grpc/support/cpu.h
- include/grpc/support/host_port.h
  include/grpc/support/log.h
  include/grpc/support/log_windows.h
  include/grpc/support/port_platform.h
@@ -802,7 +801,6 @@ add_library(grpc
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -1103,7 +1101,6 @@ foreach(_hdr
  include/grpc/byte_buffer.h
  include/grpc/byte_buffer_reader.h
  include/grpc/compression.h
- include/grpc/compression_ruby.h
  include/grpc/fork.h
  include/grpc/grpc.h
  include/grpc/grpc_posix.h
@@ -1145,7 +1142,6 @@ add_library(grpc_cronet
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -1470,7 +1466,6 @@ add_library(grpc_test_util
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -1739,7 +1734,6 @@ add_library(grpc_test_util_unsecure
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -1991,7 +1985,6 @@ add_library(grpc_unsecure
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -2258,7 +2251,6 @@ foreach(_hdr
  include/grpc/byte_buffer.h
  include/grpc/byte_buffer_reader.h
  include/grpc/compression.h
- include/grpc/compression_ruby.h
  include/grpc/fork.h
  include/grpc/grpc.h
  include/grpc/grpc_posix.h
@@ -2498,7 +2490,6 @@ foreach(_hdr
  include/grpc/support/atm_windows.h
  include/grpc/support/cmdline.h
  include/grpc/support/cpu.h
- include/grpc/support/host_port.h
  include/grpc/support/log.h
  include/grpc/support/log_windows.h
  include/grpc/support/port_platform.h
@@ -2531,7 +2522,6 @@ foreach(_hdr
  include/grpc/byte_buffer.h
  include/grpc/byte_buffer_reader.h
  include/grpc/compression.h
- include/grpc/compression_ruby.h
  include/grpc/fork.h
  include/grpc/grpc.h
  include/grpc/grpc_posix.h
@@ -2724,7 +2714,6 @@ add_library(grpc++_cronet
  src/core/lib/channel/handshaker_registry.cc
  src/core/lib/compression/compression.cc
  src/core/lib/compression/compression_internal.cc
- src/core/lib/compression/compression_ruby.cc
  src/core/lib/compression/message_compress.cc
  src/core/lib/compression/stream_compression.cc
  src/core/lib/compression/stream_compression_gzip.cc
@@ -2972,7 +2961,6 @@ foreach(_hdr
  include/grpc/support/atm_windows.h
  include/grpc/support/cmdline.h
  include/grpc/support/cpu.h
- include/grpc/support/host_port.h
  include/grpc/support/log.h
  include/grpc/support/log_windows.h
  include/grpc/support/port_platform.h
@@ -3005,7 +2993,6 @@ foreach(_hdr
  include/grpc/byte_buffer.h
  include/grpc/byte_buffer_reader.h
  include/grpc/compression.h
- include/grpc/compression_ruby.h
  include/grpc/fork.h
  include/grpc/grpc.h
  include/grpc/grpc_posix.h
@@ -3701,7 +3688,6 @@ foreach(_hdr
  include/grpc/support/atm_windows.h
  include/grpc/support/cmdline.h
  include/grpc/support/cpu.h
- include/grpc/support/host_port.h
  include/grpc/support/log.h
  include/grpc/support/log_windows.h
  include/grpc/support/port_platform.h
@@ -3734,7 +3720,6 @@ foreach(_hdr
  include/grpc/byte_buffer.h
  include/grpc/byte_buffer_reader.h
  include/grpc/compression.h
- include/grpc/compression_ruby.h
  include/grpc/fork.h
  include/grpc/grpc.h
  include/grpc/grpc_posix.h
@@ -6988,33 +6973,6 @@ target_link_libraries(lame_client_test
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)
 
-add_executable(lb_policies_test
- test/core/client_channel/lb_policies_test.cc
-)
-
-
-target_include_directories(lb_policies_test
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
- PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
- PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR}
- PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR}
- PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR}
- PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
- PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
-)
-
-target_link_libraries(lb_policies_test
- ${_gRPC_ALLTARGETS_LIBRARIES}
- grpc_test_util
- grpc
- gpr_test_util
- gpr
-)
-
-endif (gRPC_BUILD_TESTS)
-if (gRPC_BUILD_TESTS)
-
 add_executable(load_file_test
  test/core/iomgr/load_file_test.cc
 )
@@ -12355,6 +12313,35 @@ target_link_libraries(connection_prefix_bad_client_test
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)
 
+add_executable(duplicate_header_bad_client_test
+ test/core/bad_client/tests/duplicate_header.cc
+)
+
+
+target_include_directories(duplicate_header_bad_client_test
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+ PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
+ PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR}
+ PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR}
+ PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR}
+ PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
+ PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
+)
+
+target_link_libraries(duplicate_header_bad_client_test
+ ${_gRPC_SSL_LIBRARIES}
+ ${_gRPC_ALLTARGETS_LIBRARIES}
+ bad_client_test
+ grpc_test_util_unsecure
+ grpc_unsecure
+ gpr_test_util
+ gpr
+)
+
+endif (gRPC_BUILD_TESTS)
+if (gRPC_BUILD_TESTS)
+
 add_executable(head_of_line_blocking_bad_client_test
  test/core/bad_client/tests/head_of_line_blocking.cc
 )