Merge branch 'master' into rq-fix

pull/13579/head
Sree Kuchibhotla 7 years ago
commit 9a434371e2
  1. 1
      .gitignore
  2. 10
      BUILD
  3. 66
      CMakeLists.txt
  4. 81
      Makefile
  5. 10
      WORKSPACE
  6. 47
      bazel/grpc_build_system.bzl
  7. 23
      build.yaml
  8. 1
      config.m4
  9. 1
      config.w32
  10. 2
      doc/service_config.md
  11. 24
      examples/cpp/helloworld/CMakeLists.txt
  12. 2
      gRPC-Core.podspec
  13. 15
      grpc.def
  14. 2
      grpc.gemspec
  15. 5
      grpc.gyp
  16. 1
      include/grpc/module.modulemap
  17. 64
      include/grpc/support/histogram.h
  18. 40
      include/grpc/support/tls_gcc.h
  19. 2
      package.xml
  20. 2
      src/core/ext/filters/client_channel/client_channel.cc
  21. 1
      src/core/ext/transport/chttp2/transport/chttp2_transport.cc
  22. 8
      src/core/ext/transport/chttp2/transport/writing.cc
  23. 2
      src/core/lib/iomgr/tcp_server_utils_posix_common.cc
  24. 13
      src/csharp/Grpc.IntegrationTesting/ClientRunners.cs
  25. 13
      src/csharp/Grpc.IntegrationTesting/ServerRunners.cs
  26. 6
      src/csharp/Grpc.IntegrationTesting/StressTestClient.cs
  27. 90
      src/csharp/Grpc.IntegrationTesting/TimeStats.cs
  28. 63
      src/csharp/Grpc.IntegrationTesting/WallClockStopwatch.cs
  29. 1
      src/python/grpcio/grpc_core_dependencies.py
  30. 30
      src/ruby/ext/grpc/rb_grpc_imports.generated.c
  31. 46
      src/ruby/ext/grpc/rb_grpc_imports.generated.h
  32. 1
      templates/CMakeLists.txt.template
  33. 18
      test/core/fling/client.cc
  34. 18
      test/core/network_benchmarks/low_level_ping_pong.cc
  35. 10
      test/core/support/BUILD
  36. 163
      test/core/support/histogram_test.cc
  37. 10
      test/core/surface/concurrent_connectivity_test.cc
  38. 16
      test/core/surface/public_headers_must_be_c89.c
  39. 31
      test/core/util/BUILD
  40. 62
      test/core/util/histogram.cc
  41. 62
      test/core/util/histogram.h
  42. 163
      test/core/util/histogram_test.cc
  43. 42
      test/core/util/port_isolated_runtime_environment.cc
  44. 19
      test/core/util/run_with_poller.sh
  45. 2
      test/core/util/test_config.h
  46. 18
      test/cpp/interop/interop_server.cc
  47. 20
      test/cpp/interop/server_helper.h
  48. 2
      test/cpp/qps/BUILD
  49. 212
      test/cpp/qps/client_sync.cc
  50. 36
      test/cpp/qps/histogram.h
  51. 10
      test/cpp/qps/qps_interarrival_test.cc
  52. 2
      test/cpp/qps/qps_worker.cc
  53. 75
      test/distrib/cpp/run_distrib_test_cmake.bat
  54. 1
      test/distrib/cpp/run_distrib_test_cmake.sh
  55. 2
      third_party/zlib.BUILD
  56. 1
      tools/doxygen/Doxyfile.c++
  57. 1
      tools/doxygen/Doxyfile.c++.internal
  58. 1
      tools/doxygen/Doxyfile.core
  59. 2
      tools/doxygen/Doxyfile.core.internal
  60. 13
      tools/gce/linux_kokoro_performance_worker_init.sh
  61. 40
      tools/internal_ci/helper_scripts/prepare_build_linux_perf_multilang_rc
  62. 55
      tools/internal_ci/linux/grpc_bazel_on_foundry.sh
  63. 25
      tools/internal_ci/linux/grpc_full_performance_master.cfg
  64. 59
      tools/internal_ci/linux/grpc_full_performance_master.sh
  65. 17
      tools/interop_matrix/client_matrix.py
  66. 17
      tools/run_tests/artifacts/distribtest_targets.py
  67. 37
      tools/run_tests/generated/sources_and_headers.json
  68. 48
      tools/run_tests/generated/tests.json
  69. 12
      tools/run_tests/run_performance_tests.py

1
.gitignore vendored

@ -56,6 +56,7 @@ Gemfile.lock
# Temporary test reports # Temporary test reports
report.xml report.xml
*/sponge_log.xml
latency_trace.txt latency_trace.txt
latency_trace.*.txt latency_trace.*.txt

10
BUILD

@ -38,6 +38,11 @@ config_setting(
values = {"define": "grpc_no_ares=true"}, values = {"define": "grpc_no_ares=true"},
) )
config_setting(
name = "remote_execution",
values = {"define": "GRPC_PORT_ISOLATED_RUNTIME=1"},
)
# This should be updated along with build.yaml # This should be updated along with build.yaml
g_stands_for = "generous" g_stands_for = "generous"
@ -54,7 +59,6 @@ GPR_PUBLIC_HDRS = [
"include/grpc/support/avl.h", "include/grpc/support/avl.h",
"include/grpc/support/cmdline.h", "include/grpc/support/cmdline.h",
"include/grpc/support/cpu.h", "include/grpc/support/cpu.h",
"include/grpc/support/histogram.h",
"include/grpc/support/host_port.h", "include/grpc/support/host_port.h",
"include/grpc/support/log.h", "include/grpc/support/log.h",
"include/grpc/support/log_windows.h", "include/grpc/support/log_windows.h",
@ -79,10 +83,11 @@ GRPC_PUBLIC_HDRS = [
"include/grpc/byte_buffer.h", "include/grpc/byte_buffer.h",
"include/grpc/byte_buffer_reader.h", "include/grpc/byte_buffer_reader.h",
"include/grpc/compression.h", "include/grpc/compression.h",
"include/grpc/load_reporting.h", "include/grpc/fork.h",
"include/grpc/grpc.h", "include/grpc/grpc.h",
"include/grpc/grpc_posix.h", "include/grpc/grpc_posix.h",
"include/grpc/grpc_security_constants.h", "include/grpc/grpc_security_constants.h",
"include/grpc/load_reporting.h",
"include/grpc/slice.h", "include/grpc/slice.h",
"include/grpc/slice_buffer.h", "include/grpc/slice_buffer.h",
"include/grpc/status.h", "include/grpc/status.h",
@ -446,7 +451,6 @@ grpc_cc_library(
"src/core/lib/support/env_posix.cc", "src/core/lib/support/env_posix.cc",
"src/core/lib/support/env_windows.cc", "src/core/lib/support/env_windows.cc",
"src/core/lib/support/fork.cc", "src/core/lib/support/fork.cc",
"src/core/lib/support/histogram.cc",
"src/core/lib/support/host_port.cc", "src/core/lib/support/host_port.cc",
"src/core/lib/support/log.cc", "src/core/lib/support/log.cc",
"src/core/lib/support/log_android.cc", "src/core/lib/support/log_android.cc",

@ -235,6 +235,7 @@ if("${gRPC_SSL_PROVIDER}" STREQUAL "module")
elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package") elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package")
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
set(_gRPC_SSL_LIBRARIES ${OPENSSL_LIBRARIES}) set(_gRPC_SSL_LIBRARIES ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n find_package(OpenSSL)\nendif()") set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n find_package(OpenSSL)\nendif()")
endif() endif()
@ -427,7 +428,6 @@ add_dependencies(buildtests_c gpr_avl_test)
add_dependencies(buildtests_c gpr_cmdline_test) add_dependencies(buildtests_c gpr_cmdline_test)
add_dependencies(buildtests_c gpr_cpu_test) add_dependencies(buildtests_c gpr_cpu_test)
add_dependencies(buildtests_c gpr_env_test) add_dependencies(buildtests_c gpr_env_test)
add_dependencies(buildtests_c gpr_histogram_test)
add_dependencies(buildtests_c gpr_host_port_test) add_dependencies(buildtests_c gpr_host_port_test)
add_dependencies(buildtests_c gpr_log_test) add_dependencies(buildtests_c gpr_log_test)
add_dependencies(buildtests_c gpr_manual_constructor_test) add_dependencies(buildtests_c gpr_manual_constructor_test)
@ -465,6 +465,7 @@ endif()
if(_gRPC_PLATFORM_LINUX) if(_gRPC_PLATFORM_LINUX)
add_dependencies(buildtests_c handshake_server_with_readahead_handshaker) add_dependencies(buildtests_c handshake_server_with_readahead_handshaker)
endif() endif()
add_dependencies(buildtests_c histogram_test)
add_dependencies(buildtests_c hpack_parser_test) add_dependencies(buildtests_c hpack_parser_test)
add_dependencies(buildtests_c hpack_table_test) add_dependencies(buildtests_c hpack_table_test)
add_dependencies(buildtests_c http_parser_test) add_dependencies(buildtests_c http_parser_test)
@ -799,7 +800,6 @@ add_library(gpr
src/core/lib/support/env_posix.cc src/core/lib/support/env_posix.cc
src/core/lib/support/env_windows.cc src/core/lib/support/env_windows.cc
src/core/lib/support/fork.cc src/core/lib/support/fork.cc
src/core/lib/support/histogram.cc
src/core/lib/support/host_port.cc src/core/lib/support/host_port.cc
src/core/lib/support/log.cc src/core/lib/support/log.cc
src/core/lib/support/log_android.cc src/core/lib/support/log_android.cc
@ -869,7 +869,6 @@ foreach(_hdr
include/grpc/support/avl.h include/grpc/support/avl.h
include/grpc/support/cmdline.h include/grpc/support/cmdline.h
include/grpc/support/cpu.h include/grpc/support/cpu.h
include/grpc/support/histogram.h
include/grpc/support/host_port.h include/grpc/support/host_port.h
include/grpc/support/log.h include/grpc/support/log.h
include/grpc/support/log_windows.h include/grpc/support/log_windows.h
@ -1617,11 +1616,13 @@ add_library(grpc_test_util
test/core/iomgr/endpoint_tests.cc test/core/iomgr/endpoint_tests.cc
test/core/util/debugger_macros.cc test/core/util/debugger_macros.cc
test/core/util/grpc_profiler.cc test/core/util/grpc_profiler.cc
test/core/util/histogram.cc
test/core/util/memory_counters.cc test/core/util/memory_counters.cc
test/core/util/mock_endpoint.cc test/core/util/mock_endpoint.cc
test/core/util/parse_hexstring.cc test/core/util/parse_hexstring.cc
test/core/util/passthru_endpoint.cc test/core/util/passthru_endpoint.cc
test/core/util/port.cc test/core/util/port.cc
test/core/util/port_isolated_runtime_environment.cc
test/core/util/port_server_client.cc test/core/util/port_server_client.cc
test/core/util/slice_splitter.cc test/core/util/slice_splitter.cc
test/core/util/tracer_util.cc test/core/util/tracer_util.cc
@ -1885,11 +1886,13 @@ add_library(grpc_test_util_unsecure
test/core/iomgr/endpoint_tests.cc test/core/iomgr/endpoint_tests.cc
test/core/util/debugger_macros.cc test/core/util/debugger_macros.cc
test/core/util/grpc_profiler.cc test/core/util/grpc_profiler.cc
test/core/util/histogram.cc
test/core/util/memory_counters.cc test/core/util/memory_counters.cc
test/core/util/mock_endpoint.cc test/core/util/mock_endpoint.cc
test/core/util/parse_hexstring.cc test/core/util/parse_hexstring.cc
test/core/util/passthru_endpoint.cc test/core/util/passthru_endpoint.cc
test/core/util/port.cc test/core/util/port.cc
test/core/util/port_isolated_runtime_environment.cc
test/core/util/port_server_client.cc test/core/util/port_server_client.cc
test/core/util/slice_splitter.cc test/core/util/slice_splitter.cc
test/core/util/tracer_util.cc test/core/util/tracer_util.cc
@ -2671,7 +2674,6 @@ foreach(_hdr
include/grpc/support/avl.h include/grpc/support/avl.h
include/grpc/support/cmdline.h include/grpc/support/cmdline.h
include/grpc/support/cpu.h include/grpc/support/cpu.h
include/grpc/support/histogram.h
include/grpc/support/host_port.h include/grpc/support/host_port.h
include/grpc/support/log.h include/grpc/support/log.h
include/grpc/support/log_windows.h include/grpc/support/log_windows.h
@ -3158,7 +3160,6 @@ foreach(_hdr
include/grpc/support/avl.h include/grpc/support/avl.h
include/grpc/support/cmdline.h include/grpc/support/cmdline.h
include/grpc/support/cpu.h include/grpc/support/cpu.h
include/grpc/support/histogram.h
include/grpc/support/host_port.h include/grpc/support/host_port.h
include/grpc/support/log.h include/grpc/support/log.h
include/grpc/support/log_windows.h include/grpc/support/log_windows.h
@ -3905,7 +3906,6 @@ foreach(_hdr
include/grpc/support/avl.h include/grpc/support/avl.h
include/grpc/support/cmdline.h include/grpc/support/cmdline.h
include/grpc/support/cpu.h include/grpc/support/cpu.h
include/grpc/support/histogram.h
include/grpc/support/host_port.h include/grpc/support/host_port.h
include/grpc/support/log.h include/grpc/support/log.h
include/grpc/support/log_windows.h include/grpc/support/log_windows.h
@ -6259,33 +6259,6 @@ target_link_libraries(gpr_env_test
endif (gRPC_BUILD_TESTS) endif (gRPC_BUILD_TESTS)
if (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS)
add_executable(gpr_histogram_test
test/core/support/histogram_test.cc
)
target_include_directories(gpr_histogram_test
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE ${BORINGSSL_ROOT_DIR}/include
PRIVATE ${PROTOBUF_ROOT_DIR}/src
PRIVATE ${BENCHMARK_ROOT_DIR}/include
PRIVATE ${ZLIB_ROOT_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib
PRIVATE ${CARES_INCLUDE_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include
)
target_link_libraries(gpr_histogram_test
${_gRPC_ALLTARGETS_LIBRARIES}
gpr_test_util
gpr
)
endif (gRPC_BUILD_TESTS)
if (gRPC_BUILD_TESTS)
add_executable(gpr_host_port_test add_executable(gpr_host_port_test
test/core/support/host_port_test.cc test/core/support/host_port_test.cc
) )
@ -7221,6 +7194,33 @@ endif()
endif (gRPC_BUILD_TESTS) endif (gRPC_BUILD_TESTS)
if (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS)
add_executable(histogram_test
test/core/util/histogram_test.cc
)
target_include_directories(histogram_test
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE ${BORINGSSL_ROOT_DIR}/include
PRIVATE ${PROTOBUF_ROOT_DIR}/src
PRIVATE ${BENCHMARK_ROOT_DIR}/include
PRIVATE ${ZLIB_ROOT_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib
PRIVATE ${CARES_INCLUDE_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include
)
target_link_libraries(histogram_test
${_gRPC_ALLTARGETS_LIBRARIES}
grpc_test_util
gpr
)
endif (gRPC_BUILD_TESTS)
if (gRPC_BUILD_TESTS)
add_executable(hpack_parser_test add_executable(hpack_parser_test
test/core/transport/chttp2/hpack_parser_test.cc test/core/transport/chttp2/hpack_parser_test.cc
) )

@ -988,7 +988,6 @@ gpr_avl_test: $(BINDIR)/$(CONFIG)/gpr_avl_test
gpr_cmdline_test: $(BINDIR)/$(CONFIG)/gpr_cmdline_test gpr_cmdline_test: $(BINDIR)/$(CONFIG)/gpr_cmdline_test
gpr_cpu_test: $(BINDIR)/$(CONFIG)/gpr_cpu_test gpr_cpu_test: $(BINDIR)/$(CONFIG)/gpr_cpu_test
gpr_env_test: $(BINDIR)/$(CONFIG)/gpr_env_test gpr_env_test: $(BINDIR)/$(CONFIG)/gpr_env_test
gpr_histogram_test: $(BINDIR)/$(CONFIG)/gpr_histogram_test
gpr_host_port_test: $(BINDIR)/$(CONFIG)/gpr_host_port_test gpr_host_port_test: $(BINDIR)/$(CONFIG)/gpr_host_port_test
gpr_log_test: $(BINDIR)/$(CONFIG)/gpr_log_test gpr_log_test: $(BINDIR)/$(CONFIG)/gpr_log_test
gpr_manual_constructor_test: $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test gpr_manual_constructor_test: $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test
@ -1021,6 +1020,7 @@ grpc_verify_jwt: $(BINDIR)/$(CONFIG)/grpc_verify_jwt
handshake_client: $(BINDIR)/$(CONFIG)/handshake_client handshake_client: $(BINDIR)/$(CONFIG)/handshake_client
handshake_server: $(BINDIR)/$(CONFIG)/handshake_server handshake_server: $(BINDIR)/$(CONFIG)/handshake_server
handshake_server_with_readahead_handshaker: $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker handshake_server_with_readahead_handshaker: $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker
histogram_test: $(BINDIR)/$(CONFIG)/histogram_test
hpack_parser_fuzzer_test: $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test hpack_parser_fuzzer_test: $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test
hpack_parser_test: $(BINDIR)/$(CONFIG)/hpack_parser_test hpack_parser_test: $(BINDIR)/$(CONFIG)/hpack_parser_test
hpack_table_test: $(BINDIR)/$(CONFIG)/hpack_table_test hpack_table_test: $(BINDIR)/$(CONFIG)/hpack_table_test
@ -1383,7 +1383,6 @@ buildtests_c: privatelibs_c \
$(BINDIR)/$(CONFIG)/gpr_cmdline_test \ $(BINDIR)/$(CONFIG)/gpr_cmdline_test \
$(BINDIR)/$(CONFIG)/gpr_cpu_test \ $(BINDIR)/$(CONFIG)/gpr_cpu_test \
$(BINDIR)/$(CONFIG)/gpr_env_test \ $(BINDIR)/$(CONFIG)/gpr_env_test \
$(BINDIR)/$(CONFIG)/gpr_histogram_test \
$(BINDIR)/$(CONFIG)/gpr_host_port_test \ $(BINDIR)/$(CONFIG)/gpr_host_port_test \
$(BINDIR)/$(CONFIG)/gpr_log_test \ $(BINDIR)/$(CONFIG)/gpr_log_test \
$(BINDIR)/$(CONFIG)/gpr_manual_constructor_test \ $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test \
@ -1413,6 +1412,7 @@ buildtests_c: privatelibs_c \
$(BINDIR)/$(CONFIG)/handshake_client \ $(BINDIR)/$(CONFIG)/handshake_client \
$(BINDIR)/$(CONFIG)/handshake_server \ $(BINDIR)/$(CONFIG)/handshake_server \
$(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker \ $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker \
$(BINDIR)/$(CONFIG)/histogram_test \
$(BINDIR)/$(CONFIG)/hpack_parser_test \ $(BINDIR)/$(CONFIG)/hpack_parser_test \
$(BINDIR)/$(CONFIG)/hpack_table_test \ $(BINDIR)/$(CONFIG)/hpack_table_test \
$(BINDIR)/$(CONFIG)/http_parser_test \ $(BINDIR)/$(CONFIG)/http_parser_test \
@ -1829,8 +1829,6 @@ test_c: buildtests_c
$(Q) $(BINDIR)/$(CONFIG)/gpr_cpu_test || ( echo test gpr_cpu_test failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/gpr_cpu_test || ( echo test gpr_cpu_test failed ; exit 1 )
$(E) "[RUN] Testing gpr_env_test" $(E) "[RUN] Testing gpr_env_test"
$(Q) $(BINDIR)/$(CONFIG)/gpr_env_test || ( echo test gpr_env_test failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/gpr_env_test || ( echo test gpr_env_test failed ; exit 1 )
$(E) "[RUN] Testing gpr_histogram_test"
$(Q) $(BINDIR)/$(CONFIG)/gpr_histogram_test || ( echo test gpr_histogram_test failed ; exit 1 )
$(E) "[RUN] Testing gpr_host_port_test" $(E) "[RUN] Testing gpr_host_port_test"
$(Q) $(BINDIR)/$(CONFIG)/gpr_host_port_test || ( echo test gpr_host_port_test failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/gpr_host_port_test || ( echo test gpr_host_port_test failed ; exit 1 )
$(E) "[RUN] Testing gpr_log_test" $(E) "[RUN] Testing gpr_log_test"
@ -1887,6 +1885,8 @@ test_c: buildtests_c
$(Q) $(BINDIR)/$(CONFIG)/handshake_server || ( echo test handshake_server failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/handshake_server || ( echo test handshake_server failed ; exit 1 )
$(E) "[RUN] Testing handshake_server_with_readahead_handshaker" $(E) "[RUN] Testing handshake_server_with_readahead_handshaker"
$(Q) $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker || ( echo test handshake_server_with_readahead_handshaker failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker || ( echo test handshake_server_with_readahead_handshaker failed ; exit 1 )
$(E) "[RUN] Testing histogram_test"
$(Q) $(BINDIR)/$(CONFIG)/histogram_test || ( echo test histogram_test failed ; exit 1 )
$(E) "[RUN] Testing hpack_parser_test" $(E) "[RUN] Testing hpack_parser_test"
$(Q) $(BINDIR)/$(CONFIG)/hpack_parser_test || ( echo test hpack_parser_test failed ; exit 1 ) $(Q) $(BINDIR)/$(CONFIG)/hpack_parser_test || ( echo test hpack_parser_test failed ; exit 1 )
$(E) "[RUN] Testing hpack_table_test" $(E) "[RUN] Testing hpack_table_test"
@ -2829,7 +2829,6 @@ LIBGPR_SRC = \
src/core/lib/support/env_posix.cc \ src/core/lib/support/env_posix.cc \
src/core/lib/support/env_windows.cc \ src/core/lib/support/env_windows.cc \
src/core/lib/support/fork.cc \ src/core/lib/support/fork.cc \
src/core/lib/support/histogram.cc \
src/core/lib/support/host_port.cc \ src/core/lib/support/host_port.cc \
src/core/lib/support/log.cc \ src/core/lib/support/log.cc \
src/core/lib/support/log_android.cc \ src/core/lib/support/log_android.cc \
@ -2869,7 +2868,6 @@ PUBLIC_HEADERS_C += \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \
@ -3623,11 +3621,13 @@ LIBGRPC_TEST_UTIL_SRC = \
test/core/iomgr/endpoint_tests.cc \ test/core/iomgr/endpoint_tests.cc \
test/core/util/debugger_macros.cc \ test/core/util/debugger_macros.cc \
test/core/util/grpc_profiler.cc \ test/core/util/grpc_profiler.cc \
test/core/util/histogram.cc \
test/core/util/memory_counters.cc \ test/core/util/memory_counters.cc \
test/core/util/mock_endpoint.cc \ test/core/util/mock_endpoint.cc \
test/core/util/parse_hexstring.cc \ test/core/util/parse_hexstring.cc \
test/core/util/passthru_endpoint.cc \ test/core/util/passthru_endpoint.cc \
test/core/util/port.cc \ test/core/util/port.cc \
test/core/util/port_isolated_runtime_environment.cc \
test/core/util/port_server_client.cc \ test/core/util/port_server_client.cc \
test/core/util/slice_splitter.cc \ test/core/util/slice_splitter.cc \
test/core/util/tracer_util.cc \ test/core/util/tracer_util.cc \
@ -3882,11 +3882,13 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
test/core/iomgr/endpoint_tests.cc \ test/core/iomgr/endpoint_tests.cc \
test/core/util/debugger_macros.cc \ test/core/util/debugger_macros.cc \
test/core/util/grpc_profiler.cc \ test/core/util/grpc_profiler.cc \
test/core/util/histogram.cc \
test/core/util/memory_counters.cc \ test/core/util/memory_counters.cc \
test/core/util/mock_endpoint.cc \ test/core/util/mock_endpoint.cc \
test/core/util/parse_hexstring.cc \ test/core/util/parse_hexstring.cc \
test/core/util/passthru_endpoint.cc \ test/core/util/passthru_endpoint.cc \
test/core/util/port.cc \ test/core/util/port.cc \
test/core/util/port_isolated_runtime_environment.cc \
test/core/util/port_server_client.cc \ test/core/util/port_server_client.cc \
test/core/util/slice_splitter.cc \ test/core/util/slice_splitter.cc \
test/core/util/tracer_util.cc \ test/core/util/tracer_util.cc \
@ -4591,7 +4593,6 @@ PUBLIC_HEADERS_CXX += \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \
@ -5079,7 +5080,6 @@ PUBLIC_HEADERS_CXX += \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \
@ -5801,7 +5801,6 @@ PUBLIC_HEADERS_CXX += \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \
@ -10095,38 +10094,6 @@ endif
endif endif
GPR_HISTOGRAM_TEST_SRC = \
test/core/support/histogram_test.cc \
GPR_HISTOGRAM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_HISTOGRAM_TEST_SRC))))
ifeq ($(NO_SECURE),true)
# You can't build secure targets if you don't have OpenSSL.
$(BINDIR)/$(CONFIG)/gpr_histogram_test: openssl_dep_error
else
$(BINDIR)/$(CONFIG)/gpr_histogram_test: $(GPR_HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(Q) $(LD) $(LDFLAGS) $(GPR_HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_histogram_test
endif
$(OBJDIR)/$(CONFIG)/test/core/support/histogram_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_gpr_histogram_test: $(GPR_HISTOGRAM_TEST_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true)
ifneq ($(NO_DEPS),true)
-include $(GPR_HISTOGRAM_TEST_OBJS:.o=.dep)
endif
endif
GPR_HOST_PORT_TEST_SRC = \ GPR_HOST_PORT_TEST_SRC = \
test/core/support/host_port_test.cc \ test/core/support/host_port_test.cc \
@ -11157,6 +11124,38 @@ endif
endif endif
HISTOGRAM_TEST_SRC = \
test/core/util/histogram_test.cc \
HISTOGRAM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HISTOGRAM_TEST_SRC))))
ifeq ($(NO_SECURE),true)
# You can't build secure targets if you don't have OpenSSL.
$(BINDIR)/$(CONFIG)/histogram_test: openssl_dep_error
else
$(BINDIR)/$(CONFIG)/histogram_test: $(HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(Q) $(LD) $(LDFLAGS) $(HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/histogram_test
endif
$(OBJDIR)/$(CONFIG)/test/core/util/histogram_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_histogram_test: $(HISTOGRAM_TEST_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true)
ifneq ($(NO_DEPS),true)
-include $(HISTOGRAM_TEST_OBJS:.o=.dep)
endif
endif
HPACK_PARSER_FUZZER_TEST_SRC = \ HPACK_PARSER_FUZZER_TEST_SRC = \
test/core/transport/chttp2/hpack_parser_fuzzer_test.cc \ test/core/transport/chttp2/hpack_parser_fuzzer_test.cc \

@ -115,3 +115,13 @@ http_archive(
strip_prefix = "abseil-cpp-cc4bed2d74f7c8717e31f9579214ab52a9c9c610", strip_prefix = "abseil-cpp-cc4bed2d74f7c8717e31f9579214ab52a9c9c610",
url = "https://github.com/abseil/abseil-cpp/archive/cc4bed2d74f7c8717e31f9579214ab52a9c9c610.tar.gz", url = "https://github.com/abseil/abseil-cpp/archive/cc4bed2d74f7c8717e31f9579214ab52a9c9c610.tar.gz",
) )
http_archive(
name = "bazel_toolchains",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/af4681c3d19f063f090222ec3d04108c4e0ca255.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/af4681c3d19f063f090222ec3d04108c4e0ca255.tar.gz",
],
strip_prefix = "bazel-toolchains-af4681c3d19f063f090222ec3d04108c4e0ca255",
sha256 = "d58bb2d6c8603f600d522b6104d6192a65339aa26cbba9f11ff5c4b36dedb928",
)

@ -23,6 +23,9 @@
# each change must be ported from one to the other. # each change must be ported from one to the other.
# #
# The set of pollers to test against if a test exercises polling
POLLERS = ['epollex', 'epollsig', 'epoll1', 'poll', 'poll-cv']
def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [], def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
external_deps = [], deps = [], standalone = False, external_deps = [], deps = [], standalone = False,
language = "C++", testonly = False, visibility = None, language = "C++", testonly = False, visibility = None,
@ -33,10 +36,10 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
native.cc_library( native.cc_library(
name = name, name = name,
srcs = srcs, srcs = srcs,
defines = select({ defines = select({"//:grpc_no_ares": ["GRPC_ARES=0"],
"//:grpc_no_ares": ["GRPC_ARES=0"], "//conditions:default": [],}) +
"//conditions:default": [], select({"//:remote_execution": ["GRPC_PORT_ISOLATED_RUNTIME=1"],
}), "//conditions:default": [],}),
hdrs = hdrs + public_hdrs, hdrs = hdrs + public_hdrs,
deps = deps + ["//external:" + dep for dep in external_deps], deps = deps + ["//external:" + dep for dep in external_deps],
copts = copts, copts = copts,
@ -70,19 +73,35 @@ def grpc_proto_library(name, srcs = [], deps = [], well_known_protos = False,
generate_mock = generate_mock, generate_mock = generate_mock,
) )
def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++"): def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++"):
copts = [] copts = []
if language.upper() == "C": if language.upper() == "C":
copts = ["-std=c99"] copts = ["-std=c99"]
native.cc_test( args = {
name = name, 'name': name,
srcs = srcs, 'srcs': srcs,
args = args, 'args': args,
data = data, 'data': data,
deps = deps + ["//external:" + dep for dep in external_deps], 'deps': deps + ["//external:" + dep for dep in external_deps],
copts = copts, 'copts': copts,
linkopts = ["-pthread"], 'linkopts': ["-pthread"],
) }
if uses_polling:
native.cc_binary(testonly=True, **args)
for poller in POLLERS:
native.sh_test(
name = name + '@poller=' + poller,
data = [name],
srcs = [
'//test/core/util:run_with_poller_sh',
],
args = [
poller,
'$(location %s)' % name
],
)
else:
native.cc_test(**args)
def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = []): def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = []):
copts = [] copts = []

@ -41,7 +41,6 @@ filegroups:
- src/core/lib/support/env_posix.cc - src/core/lib/support/env_posix.cc
- src/core/lib/support/env_windows.cc - src/core/lib/support/env_windows.cc
- src/core/lib/support/fork.cc - src/core/lib/support/fork.cc
- src/core/lib/support/histogram.cc
- src/core/lib/support/host_port.cc - src/core/lib/support/host_port.cc
- src/core/lib/support/log.cc - src/core/lib/support/log.cc
- src/core/lib/support/log_android.cc - src/core/lib/support/log_android.cc
@ -83,7 +82,6 @@ filegroups:
- include/grpc/support/avl.h - include/grpc/support/avl.h
- include/grpc/support/cmdline.h - include/grpc/support/cmdline.h
- include/grpc/support/cpu.h - include/grpc/support/cpu.h
- include/grpc/support/histogram.h
- include/grpc/support/host_port.h - include/grpc/support/host_port.h
- include/grpc/support/log.h - include/grpc/support/log.h
- include/grpc/support/log_windows.h - include/grpc/support/log_windows.h
@ -714,6 +712,7 @@ filegroups:
- test/core/iomgr/endpoint_tests.h - test/core/iomgr/endpoint_tests.h
- test/core/util/debugger_macros.h - test/core/util/debugger_macros.h
- test/core/util/grpc_profiler.h - test/core/util/grpc_profiler.h
- test/core/util/histogram.h
- test/core/util/memory_counters.h - test/core/util/memory_counters.h
- test/core/util/mock_endpoint.h - test/core/util/mock_endpoint.h
- test/core/util/parse_hexstring.h - test/core/util/parse_hexstring.h
@ -731,11 +730,13 @@ filegroups:
- test/core/iomgr/endpoint_tests.cc - test/core/iomgr/endpoint_tests.cc
- test/core/util/debugger_macros.cc - test/core/util/debugger_macros.cc
- test/core/util/grpc_profiler.cc - test/core/util/grpc_profiler.cc
- test/core/util/histogram.cc
- test/core/util/memory_counters.cc - test/core/util/memory_counters.cc
- test/core/util/mock_endpoint.cc - test/core/util/mock_endpoint.cc
- test/core/util/parse_hexstring.cc - test/core/util/parse_hexstring.cc
- test/core/util/passthru_endpoint.cc - test/core/util/passthru_endpoint.cc
- test/core/util/port.cc - test/core/util/port.cc
- test/core/util/port_isolated_runtime_environment.cc
- test/core/util/port_server_client.cc - test/core/util/port_server_client.cc
- test/core/util/slice_splitter.cc - test/core/util/slice_splitter.cc
- test/core/util/tracer_util.cc - test/core/util/tracer_util.cc
@ -2196,15 +2197,6 @@ targets:
- gpr_test_util - gpr_test_util
- gpr - gpr
uses_polling: false uses_polling: false
- name: gpr_histogram_test
build: test
language: c
src:
- test/core/support/histogram_test.cc
deps:
- gpr_test_util
- gpr
uses_polling: false
- name: gpr_host_port_test - name: gpr_host_port_test
build: test build: test
language: c language: c
@ -2553,6 +2545,15 @@ targets:
platforms: platforms:
- linux - linux
secure: true secure: true
- name: histogram_test
build: test
language: c
src:
- test/core/util/histogram_test.cc
deps:
- grpc_test_util
- gpr
uses_polling: false
- name: hpack_parser_fuzzer_test - name: hpack_parser_fuzzer_test
build: fuzzer build: fuzzer
language: c language: c

@ -54,7 +54,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/support/env_posix.cc \ src/core/lib/support/env_posix.cc \
src/core/lib/support/env_windows.cc \ src/core/lib/support/env_windows.cc \
src/core/lib/support/fork.cc \ src/core/lib/support/fork.cc \
src/core/lib/support/histogram.cc \
src/core/lib/support/host_port.cc \ src/core/lib/support/host_port.cc \
src/core/lib/support/log.cc \ src/core/lib/support/log.cc \
src/core/lib/support/log_android.cc \ src/core/lib/support/log_android.cc \

@ -31,7 +31,6 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\support\\env_posix.cc " + "src\\core\\lib\\support\\env_posix.cc " +
"src\\core\\lib\\support\\env_windows.cc " + "src\\core\\lib\\support\\env_windows.cc " +
"src\\core\\lib\\support\\fork.cc " + "src\\core\\lib\\support\\fork.cc " +
"src\\core\\lib\\support\\histogram.cc " +
"src\\core\\lib\\support\\host_port.cc " + "src\\core\\lib\\support\\host_port.cc " +
"src\\core\\lib\\support\\log.cc " + "src\\core\\lib\\support\\log.cc " +
"src\\core\\lib\\support\\log_android.cc " + "src\\core\\lib\\support\\log_android.cc " +

@ -12,7 +12,7 @@ The service config is a JSON string of the following form:
``` ```
{ {
// Load balancing policy name. // Load balancing policy name (case insensitive).
// Currently, the only selectable client-side policy provided with gRPC // Currently, the only selectable client-side policy provided with gRPC
// is 'round_robin', but third parties may add their own policies. // is 'round_robin', but third parties may add their own policies.
// This field is optional; if unset, the default behavior is to pick // This field is optional; if unset, the default behavior is to pick

@ -6,13 +6,29 @@ project(HelloWorld C CXX)
if(NOT MSVC) if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
else()
add_definitions(-D_WIN32_WINNT=0x600)
endif() endif()
# Protobuf # Protobuf
set(protobuf_MODULE_COMPATIBLE TRUE) # NOTE: we cannot use "CONFIG" mode here because protobuf-config.cmake
find_package(protobuf CONFIG REQUIRED) # is broken when used with CMAKE_INSTALL_PREFIX
find_package(Protobuf REQUIRED)
message(STATUS "Using protobuf ${protobuf_VERSION}") message(STATUS "Using protobuf ${protobuf_VERSION}")
if(Protobuf_FOUND)
# Protobuf_FOUND is set for package type "CONFIG"
set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
set(_PROTOBUF_PROTOC protobuf::protoc)
elseif(PROTOBUF_FOUND)
# PROTOBUF_FOUND is set for package type "MODULE"
set(_PROTOBUF_LIBPROTOBUF ${PROTOBUF_LIBRARIES})
set(_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE})
include_directories(${PROTOBUF_INCLUDE_DIRS})
else()
message(WARNING "Failed to locate libprotobuf and protoc!")
endif()
# gRPC # gRPC
find_package(gRPC CONFIG REQUIRED) find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}") message(STATUS "Using gRPC ${gRPC_VERSION}")
@ -31,7 +47,7 @@ set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h") set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
add_custom_command( add_custom_command(
OUTPUT "${hw_grpc_srcs}" "${hw_grpc_hdrs}" OUTPUT "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
COMMAND protobuf::protoc COMMAND ${_PROTOBUF_PROTOC}
ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}" -I "${hw_proto_path}" ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}" -I "${hw_proto_path}"
--plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}" --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}"
"${hw_proto}" "${hw_proto}"
@ -48,6 +64,6 @@ foreach(_target
${hw_proto_srcs} ${hw_proto_srcs}
${hw_grpc_srcs}) ${hw_grpc_srcs})
target_link_libraries(${_target} target_link_libraries(${_target}
protobuf::libprotobuf ${_PROTOBUF_LIBPROTOBUF}
gRPC::grpc++_unsecure) gRPC::grpc++_unsecure)
endforeach() endforeach()

@ -113,7 +113,6 @@ Pod::Spec.new do |s|
'include/grpc/support/avl.h', 'include/grpc/support/avl.h',
'include/grpc/support/cmdline.h', 'include/grpc/support/cmdline.h',
'include/grpc/support/cpu.h', 'include/grpc/support/cpu.h',
'include/grpc/support/histogram.h',
'include/grpc/support/host_port.h', 'include/grpc/support/host_port.h',
'include/grpc/support/log.h', 'include/grpc/support/log.h',
'include/grpc/support/log_windows.h', 'include/grpc/support/log_windows.h',
@ -223,7 +222,6 @@ Pod::Spec.new do |s|
'src/core/lib/support/env_posix.cc', 'src/core/lib/support/env_posix.cc',
'src/core/lib/support/env_windows.cc', 'src/core/lib/support/env_windows.cc',
'src/core/lib/support/fork.cc', 'src/core/lib/support/fork.cc',
'src/core/lib/support/histogram.cc',
'src/core/lib/support/host_port.cc', 'src/core/lib/support/host_port.cc',
'src/core/lib/support/log.cc', 'src/core/lib/support/log.cc',
'src/core/lib/support/log_android.cc', 'src/core/lib/support/log_android.cc',

@ -200,21 +200,6 @@ EXPORTS
gpr_cmdline_usage_string gpr_cmdline_usage_string
gpr_cpu_num_cores gpr_cpu_num_cores
gpr_cpu_current_cpu gpr_cpu_current_cpu
gpr_histogram_create
gpr_histogram_destroy
gpr_histogram_add
gpr_histogram_merge
gpr_histogram_percentile
gpr_histogram_mean
gpr_histogram_stddev
gpr_histogram_variance
gpr_histogram_maximum
gpr_histogram_minimum
gpr_histogram_count
gpr_histogram_sum
gpr_histogram_sum_of_squares
gpr_histogram_get_contents
gpr_histogram_merge_contents
gpr_join_host_port gpr_join_host_port
gpr_split_host_port gpr_split_host_port
gpr_log_severity_string gpr_log_severity_string

@ -52,7 +52,6 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/support/avl.h ) s.files += %w( include/grpc/support/avl.h )
s.files += %w( include/grpc/support/cmdline.h ) s.files += %w( include/grpc/support/cmdline.h )
s.files += %w( include/grpc/support/cpu.h ) s.files += %w( include/grpc/support/cpu.h )
s.files += %w( include/grpc/support/histogram.h )
s.files += %w( include/grpc/support/host_port.h ) s.files += %w( include/grpc/support/host_port.h )
s.files += %w( include/grpc/support/log.h ) s.files += %w( include/grpc/support/log.h )
s.files += %w( include/grpc/support/log_windows.h ) s.files += %w( include/grpc/support/log_windows.h )
@ -117,7 +116,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/support/env_posix.cc ) s.files += %w( src/core/lib/support/env_posix.cc )
s.files += %w( src/core/lib/support/env_windows.cc ) s.files += %w( src/core/lib/support/env_windows.cc )
s.files += %w( src/core/lib/support/fork.cc ) s.files += %w( src/core/lib/support/fork.cc )
s.files += %w( src/core/lib/support/histogram.cc )
s.files += %w( src/core/lib/support/host_port.cc ) s.files += %w( src/core/lib/support/host_port.cc )
s.files += %w( src/core/lib/support/log.cc ) s.files += %w( src/core/lib/support/log.cc )
s.files += %w( src/core/lib/support/log_android.cc ) s.files += %w( src/core/lib/support/log_android.cc )

@ -173,7 +173,6 @@
'src/core/lib/support/env_posix.cc', 'src/core/lib/support/env_posix.cc',
'src/core/lib/support/env_windows.cc', 'src/core/lib/support/env_windows.cc',
'src/core/lib/support/fork.cc', 'src/core/lib/support/fork.cc',
'src/core/lib/support/histogram.cc',
'src/core/lib/support/host_port.cc', 'src/core/lib/support/host_port.cc',
'src/core/lib/support/log.cc', 'src/core/lib/support/log.cc',
'src/core/lib/support/log_android.cc', 'src/core/lib/support/log_android.cc',
@ -506,11 +505,13 @@
'test/core/iomgr/endpoint_tests.cc', 'test/core/iomgr/endpoint_tests.cc',
'test/core/util/debugger_macros.cc', 'test/core/util/debugger_macros.cc',
'test/core/util/grpc_profiler.cc', 'test/core/util/grpc_profiler.cc',
'test/core/util/histogram.cc',
'test/core/util/memory_counters.cc', 'test/core/util/memory_counters.cc',
'test/core/util/mock_endpoint.cc', 'test/core/util/mock_endpoint.cc',
'test/core/util/parse_hexstring.cc', 'test/core/util/parse_hexstring.cc',
'test/core/util/passthru_endpoint.cc', 'test/core/util/passthru_endpoint.cc',
'test/core/util/port.cc', 'test/core/util/port.cc',
'test/core/util/port_isolated_runtime_environment.cc',
'test/core/util/port_server_client.cc', 'test/core/util/port_server_client.cc',
'test/core/util/slice_splitter.cc', 'test/core/util/slice_splitter.cc',
'test/core/util/tracer_util.cc', 'test/core/util/tracer_util.cc',
@ -716,11 +717,13 @@
'test/core/iomgr/endpoint_tests.cc', 'test/core/iomgr/endpoint_tests.cc',
'test/core/util/debugger_macros.cc', 'test/core/util/debugger_macros.cc',
'test/core/util/grpc_profiler.cc', 'test/core/util/grpc_profiler.cc',
'test/core/util/histogram.cc',
'test/core/util/memory_counters.cc', 'test/core/util/memory_counters.cc',
'test/core/util/mock_endpoint.cc', 'test/core/util/mock_endpoint.cc',
'test/core/util/parse_hexstring.cc', 'test/core/util/parse_hexstring.cc',
'test/core/util/passthru_endpoint.cc', 'test/core/util/passthru_endpoint.cc',
'test/core/util/port.cc', 'test/core/util/port.cc',
'test/core/util/port_isolated_runtime_environment.cc',
'test/core/util/port_server_client.cc', 'test/core/util/port_server_client.cc',
'test/core/util/slice_splitter.cc', 'test/core/util/slice_splitter.cc',
'test/core/util/tracer_util.cc', 'test/core/util/tracer_util.cc',

@ -7,7 +7,6 @@ framework module grpc {
header "support/avl.h" header "support/avl.h"
header "support/cmdline.h" header "support/cmdline.h"
header "support/cpu.h" header "support/cpu.h"
header "support/histogram.h"
header "support/host_port.h" header "support/host_port.h"
header "support/log.h" header "support/log.h"
header "support/log_windows.h" header "support/log_windows.h"

@ -1,64 +0,0 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#ifndef GRPC_SUPPORT_HISTOGRAM_H
#define GRPC_SUPPORT_HISTOGRAM_H
#include <grpc/support/port_platform.h>
#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct gpr_histogram gpr_histogram;
GPRAPI gpr_histogram* gpr_histogram_create(double resolution,
double max_bucket_start);
GPRAPI void gpr_histogram_destroy(gpr_histogram* h);
GPRAPI void gpr_histogram_add(gpr_histogram* h, double x);
/** The following merges the second histogram into the first. It only works
if they have the same buckets and resolution. Returns 0 on failure, 1
on success */
GPRAPI int gpr_histogram_merge(gpr_histogram* dst, const gpr_histogram* src);
GPRAPI double gpr_histogram_percentile(gpr_histogram* histogram,
double percentile);
GPRAPI double gpr_histogram_mean(gpr_histogram* histogram);
GPRAPI double gpr_histogram_stddev(gpr_histogram* histogram);
GPRAPI double gpr_histogram_variance(gpr_histogram* histogram);
GPRAPI double gpr_histogram_maximum(gpr_histogram* histogram);
GPRAPI double gpr_histogram_minimum(gpr_histogram* histogram);
GPRAPI double gpr_histogram_count(gpr_histogram* histogram);
GPRAPI double gpr_histogram_sum(gpr_histogram* histogram);
GPRAPI double gpr_histogram_sum_of_squares(gpr_histogram* histogram);
GPRAPI const uint32_t* gpr_histogram_get_contents(gpr_histogram* histogram,
size_t* count);
GPRAPI void gpr_histogram_merge_contents(gpr_histogram* histogram,
const uint32_t* data,
size_t data_count, double min_seen,
double max_seen, double sum,
double sum_of_squares, double count);
#ifdef __cplusplus
}
#endif
#endif /* GRPC_SUPPORT_HISTOGRAM_H */

@ -26,44 +26,6 @@
/** Thread local storage based on gcc compiler primitives. /** Thread local storage based on gcc compiler primitives.
#include tls.h to use this - and see that file for documentation */ #include tls.h to use this - and see that file for documentation */
#ifndef NDEBUG
struct gpr_gcc_thread_local {
intptr_t value;
bool* inited;
};
#define GPR_TLS_DECL(name) \
static bool name##_inited = false; \
static __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)}
#define gpr_tls_init(tls) \
do { \
GPR_ASSERT(*((tls)->inited) == false); \
*((tls)->inited) = true; \
} while (0)
/** It is allowed to call gpr_tls_init after gpr_tls_destroy is called. */
#define gpr_tls_destroy(tls) \
do { \
GPR_ASSERT(*((tls)->inited)); \
*((tls)->inited) = false; \
} while (0)
#define gpr_tls_set(tls, new_value) \
do { \
GPR_ASSERT(*((tls)->inited)); \
(tls)->value = (new_value); \
} while (0)
#define gpr_tls_get(tls) \
({ \
GPR_ASSERT(*((tls)->inited)); \
(tls)->value; \
})
#else /* NDEBUG */
struct gpr_gcc_thread_local { struct gpr_gcc_thread_local {
intptr_t value; intptr_t value;
}; };
@ -80,6 +42,4 @@ struct gpr_gcc_thread_local {
#define gpr_tls_set(tls, new_value) (((tls)->value) = (new_value)) #define gpr_tls_set(tls, new_value) (((tls)->value) = (new_value))
#define gpr_tls_get(tls) ((tls)->value) #define gpr_tls_get(tls) ((tls)->value)
#endif /* NDEBUG */
#endif /* GRPC_SUPPORT_TLS_GCC_H */ #endif /* GRPC_SUPPORT_TLS_GCC_H */

@ -64,7 +64,6 @@
<file baseinstalldir="/" name="include/grpc/support/avl.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/avl.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/cmdline.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/cmdline.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/cpu.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/cpu.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/histogram.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/host_port.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/host_port.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/log.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/log.h" role="src" />
<file baseinstalldir="/" name="include/grpc/support/log_windows.h" role="src" /> <file baseinstalldir="/" name="include/grpc/support/log_windows.h" role="src" />
@ -129,7 +128,6 @@
<file baseinstalldir="/" name="src/core/lib/support/env_posix.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/env_posix.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/env_windows.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/env_windows.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/fork.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/fork.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/histogram.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/host_port.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/host_port.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/log.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/log.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/log_android.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/log_android.cc" role="src" />

@ -432,7 +432,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx,
// once at any given time. // once at any given time.
lb_policy_name_changed = lb_policy_name_changed =
chand->info_lb_policy_name == nullptr || chand->info_lb_policy_name == nullptr ||
strcmp(chand->info_lb_policy_name, lb_policy_name) != 0; gpr_stricmp(chand->info_lb_policy_name, lb_policy_name) != 0;
if (chand->lb_policy != nullptr && !lb_policy_name_changed) { if (chand->lb_policy != nullptr && !lb_policy_name_changed) {
// Continue using the same LB policy. Update with new addresses. // Continue using the same LB policy. Update with new addresses.
lb_policy_updated = true; lb_policy_updated = true;

@ -549,6 +549,7 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t,
/* No pings allowed before receiving a header or data frame. */ /* No pings allowed before receiving a header or data frame. */
t->ping_state.pings_before_data_required = 0; t->ping_state.pings_before_data_required = 0;
t->ping_state.is_delayed_ping_timer_set = false; t->ping_state.is_delayed_ping_timer_set = false;
t->ping_state.last_ping_sent_time = GRPC_MILLIS_INF_PAST;
t->ping_recv_state.last_ping_recv_time = GRPC_MILLIS_INF_PAST; t->ping_recv_state.last_ping_recv_time = GRPC_MILLIS_INF_PAST;
t->ping_recv_state.ping_strikes = 0; t->ping_recv_state.ping_strikes = 0;

@ -81,8 +81,11 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx,
/* not enough elapsed time between successive pings */ /* not enough elapsed time between successive pings */
if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) { if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"%s: Ping delayed [%p]: not enough time elapsed since last ping", "%s: Ping delayed [%p]: not enough time elapsed since last ping. "
t->is_client ? "CLIENT" : "SERVER", t->peer_string); " Last ping %f: Next ping %f: Now %f",
t->is_client ? "CLIENT" : "SERVER", t->peer_string,
(double)t->ping_state.last_ping_sent_time,
(double)next_allowed_ping, (double)now);
} }
if (!t->ping_state.is_delayed_ping_timer_set) { if (!t->ping_state.is_delayed_ping_timer_set) {
t->ping_state.is_delayed_ping_timer_set = true; t->ping_state.is_delayed_ping_timer_set = true;
@ -91,6 +94,7 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx,
} }
return; return;
} }
pq->inflight_id = t->ping_ctr; pq->inflight_id = t->ping_ctr;
t->ping_ctr++; t->ping_ctr++;
GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]); GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]);

@ -55,7 +55,7 @@ static void init_max_accept_queue_size(void) {
if (fgets(buf, sizeof buf, fp)) { if (fgets(buf, sizeof buf, fp)) {
char* end; char* end;
long i = strtol(buf, &end, 10); long i = strtol(buf, &end, 10);
if (i > 0 && i <= INT_MAX && end && *end == 0) { if (i > 0 && i <= INT_MAX && end && *end == '\n') {
n = (int)i; n = (int)i;
} }
} }

@ -131,7 +131,7 @@ namespace Grpc.IntegrationTesting
readonly List<Task> runnerTasks; readonly List<Task> runnerTasks;
readonly CancellationTokenSource stoppedCts = new CancellationTokenSource(); readonly CancellationTokenSource stoppedCts = new CancellationTokenSource();
readonly WallClockStopwatch wallClockStopwatch = new WallClockStopwatch(); readonly TimeStats timeStats = new TimeStats();
readonly AtomicCounter statsResetCount = new AtomicCounter(); readonly AtomicCounter statsResetCount = new AtomicCounter();
public ClientRunnerImpl(List<Channel> channels, ClientType clientType, RpcType rpcType, int outstandingRpcsPerChannel, LoadParams loadParams, PayloadConfig payloadConfig, HistogramParams histogramParams, Func<BasicProfiler> profilerFactory) public ClientRunnerImpl(List<Channel> channels, ClientType clientType, RpcType rpcType, int outstandingRpcsPerChannel, LoadParams loadParams, PayloadConfig payloadConfig, HistogramParams histogramParams, Func<BasicProfiler> profilerFactory)
@ -165,7 +165,7 @@ namespace Grpc.IntegrationTesting
hist.GetSnapshot(histogramData, reset); hist.GetSnapshot(histogramData, reset);
} }
var secondsElapsed = wallClockStopwatch.GetElapsedSnapshot(reset).TotalSeconds; var timeSnapshot = timeStats.GetSnapshot(reset);
if (reset) if (reset)
{ {
@ -173,15 +173,14 @@ namespace Grpc.IntegrationTesting
} }
GrpcEnvironment.Logger.Info("[ClientRunnerImpl.GetStats] GC collection counts: gen0 {0}, gen1 {1}, gen2 {2}, (histogram reset count:{3}, seconds since reset: {4})", GrpcEnvironment.Logger.Info("[ClientRunnerImpl.GetStats] GC collection counts: gen0 {0}, gen1 {1}, gen2 {2}, (histogram reset count:{3}, seconds since reset: {4})",
GC.CollectionCount(0), GC.CollectionCount(1), GC.CollectionCount(2), statsResetCount.Count, secondsElapsed); GC.CollectionCount(0), GC.CollectionCount(1), GC.CollectionCount(2), statsResetCount.Count, timeSnapshot.WallClockTime.TotalSeconds);
// TODO: populate user time and system time
return new ClientStats return new ClientStats
{ {
Latencies = histogramData, Latencies = histogramData,
TimeElapsed = secondsElapsed, TimeElapsed = timeSnapshot.WallClockTime.TotalSeconds,
TimeUser = 0, TimeUser = timeSnapshot.UserProcessorTime.TotalSeconds,
TimeSystem = 0 TimeSystem = timeSnapshot.PrivilegedProcessorTime.TotalSeconds
}; };
} }

@ -117,7 +117,7 @@ namespace Grpc.IntegrationTesting
public class ServerRunnerImpl : IServerRunner public class ServerRunnerImpl : IServerRunner
{ {
readonly Server server; readonly Server server;
readonly WallClockStopwatch wallClockStopwatch = new WallClockStopwatch(); readonly TimeStats timeStats = new TimeStats();
public ServerRunnerImpl(Server server) public ServerRunnerImpl(Server server)
{ {
@ -138,17 +138,16 @@ namespace Grpc.IntegrationTesting
/// <returns>The stats.</returns> /// <returns>The stats.</returns>
public ServerStats GetStats(bool reset) public ServerStats GetStats(bool reset)
{ {
var secondsElapsed = wallClockStopwatch.GetElapsedSnapshot(reset).TotalSeconds; var timeSnapshot = timeStats.GetSnapshot(reset);
GrpcEnvironment.Logger.Info("[ServerRunner.GetStats] GC collection counts: gen0 {0}, gen1 {1}, gen2 {2}, (seconds since last reset {3})", GrpcEnvironment.Logger.Info("[ServerRunner.GetStats] GC collection counts: gen0 {0}, gen1 {1}, gen2 {2}, (seconds since last reset {3})",
GC.CollectionCount(0), GC.CollectionCount(1), GC.CollectionCount(2), secondsElapsed); GC.CollectionCount(0), GC.CollectionCount(1), GC.CollectionCount(2), timeSnapshot.WallClockTime.TotalSeconds);
// TODO: populate user time and system time
return new ServerStats return new ServerStats
{ {
TimeElapsed = secondsElapsed, TimeElapsed = timeSnapshot.WallClockTime.TotalSeconds,
TimeUser = 0, TimeUser = timeSnapshot.UserProcessorTime.TotalSeconds,
TimeSystem = 0 TimeSystem = timeSnapshot.PrivilegedProcessorTime.TotalSeconds
}; };
} }

@ -243,7 +243,7 @@ namespace Grpc.IntegrationTesting
const string GaugeName = "csharp_overall_qps"; const string GaugeName = "csharp_overall_qps";
readonly Histogram histogram; readonly Histogram histogram;
readonly WallClockStopwatch wallClockStopwatch = new WallClockStopwatch(); readonly TimeStats timeStats = new TimeStats();
public MetricsServiceImpl(Histogram histogram) public MetricsServiceImpl(Histogram histogram)
{ {
@ -280,9 +280,9 @@ namespace Grpc.IntegrationTesting
long GetQpsAndReset() long GetQpsAndReset()
{ {
var snapshot = histogram.GetSnapshot(true); var snapshot = histogram.GetSnapshot(true);
var elapsedSnapshot = wallClockStopwatch.GetElapsedSnapshot(true); var timeSnapshot = timeStats.GetSnapshot(true);
return (long) (snapshot.Count / elapsedSnapshot.TotalSeconds); return (long) (snapshot.Count / timeSnapshot.WallClockTime.TotalSeconds);
} }
} }
} }

@ -0,0 +1,90 @@
#region Copyright notice and license
// Copyright 2015 gRPC authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#endregion
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Google.Protobuf;
using Grpc.Core;
using Grpc.Core.Utils;
using NUnit.Framework;
using Grpc.Testing;
namespace Grpc.IntegrationTesting
{
/// <summary>
/// Snapshottable time statistics.
/// </summary>
public class TimeStats
{
readonly object myLock = new object();
DateTime lastWallClock;
TimeSpan lastUserTime;
TimeSpan lastPrivilegedTime;
public TimeStats()
{
lastWallClock = DateTime.UtcNow;
lastUserTime = Process.GetCurrentProcess().UserProcessorTime;
lastPrivilegedTime = Process.GetCurrentProcess().PrivilegedProcessorTime;
}
public Snapshot GetSnapshot(bool reset)
{
lock (myLock)
{
var wallClock = DateTime.UtcNow;
var userTime = Process.GetCurrentProcess().UserProcessorTime;
var privilegedTime = Process.GetCurrentProcess().PrivilegedProcessorTime;
var snapshot = new Snapshot(wallClock - lastWallClock, userTime - lastUserTime, privilegedTime - lastPrivilegedTime);
if (reset)
{
lastWallClock = wallClock;
lastUserTime = userTime;
lastPrivilegedTime = privilegedTime;
}
return snapshot;
}
}
public class Snapshot
{
public TimeSpan WallClockTime { get; }
public TimeSpan UserProcessorTime { get; }
public TimeSpan PrivilegedProcessorTime { get; }
public Snapshot(TimeSpan wallClockTime, TimeSpan userProcessorTime, TimeSpan privilegedProcessorTime)
{
this.WallClockTime = wallClockTime;
this.UserProcessorTime = userProcessorTime;
this.PrivilegedProcessorTime = privilegedProcessorTime;
}
public override string ToString()
{
return string.Format("[TimeStats.Snapshot: wallClock {0}, userProcessor {1}, privilegedProcessor {2}]", WallClockTime, UserProcessorTime, PrivilegedProcessorTime);
}
}
}
}

@ -1,63 +0,0 @@
#region Copyright notice and license
// Copyright 2015 gRPC authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#endregion
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Google.Protobuf;
using Grpc.Core;
using Grpc.Core.Utils;
using NUnit.Framework;
using Grpc.Testing;
namespace Grpc.IntegrationTesting
{
/// <summary>
/// Snapshottable wall clock stopwatch.
/// </summary>
public class WallClockStopwatch
{
long startTicks;
public WallClockStopwatch()
{
this.startTicks = DateTime.UtcNow.Ticks;
}
public TimeSpan GetElapsedSnapshot(bool reset)
{
var utcNow = DateTime.UtcNow;
long oldStartTicks;
if (reset)
{
oldStartTicks = Interlocked.Exchange(ref this.startTicks, utcNow.Ticks);
}
else
{
oldStartTicks = this.startTicks;
}
return utcNow - new DateTime(oldStartTicks, DateTimeKind.Utc);
}
}
}

@ -30,7 +30,6 @@ CORE_SOURCE_FILES = [
'src/core/lib/support/env_posix.cc', 'src/core/lib/support/env_posix.cc',
'src/core/lib/support/env_windows.cc', 'src/core/lib/support/env_windows.cc',
'src/core/lib/support/fork.cc', 'src/core/lib/support/fork.cc',
'src/core/lib/support/histogram.cc',
'src/core/lib/support/host_port.cc', 'src/core/lib/support/host_port.cc',
'src/core/lib/support/log.cc', 'src/core/lib/support/log.cc',
'src/core/lib/support/log_android.cc', 'src/core/lib/support/log_android.cc',

@ -223,21 +223,6 @@ gpr_cmdline_destroy_type gpr_cmdline_destroy_import;
gpr_cmdline_usage_string_type gpr_cmdline_usage_string_import; gpr_cmdline_usage_string_type gpr_cmdline_usage_string_import;
gpr_cpu_num_cores_type gpr_cpu_num_cores_import; gpr_cpu_num_cores_type gpr_cpu_num_cores_import;
gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import; gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import;
gpr_histogram_create_type gpr_histogram_create_import;
gpr_histogram_destroy_type gpr_histogram_destroy_import;
gpr_histogram_add_type gpr_histogram_add_import;
gpr_histogram_merge_type gpr_histogram_merge_import;
gpr_histogram_percentile_type gpr_histogram_percentile_import;
gpr_histogram_mean_type gpr_histogram_mean_import;
gpr_histogram_stddev_type gpr_histogram_stddev_import;
gpr_histogram_variance_type gpr_histogram_variance_import;
gpr_histogram_maximum_type gpr_histogram_maximum_import;
gpr_histogram_minimum_type gpr_histogram_minimum_import;
gpr_histogram_count_type gpr_histogram_count_import;
gpr_histogram_sum_type gpr_histogram_sum_import;
gpr_histogram_sum_of_squares_type gpr_histogram_sum_of_squares_import;
gpr_histogram_get_contents_type gpr_histogram_get_contents_import;
gpr_histogram_merge_contents_type gpr_histogram_merge_contents_import;
gpr_join_host_port_type gpr_join_host_port_import; gpr_join_host_port_type gpr_join_host_port_import;
gpr_split_host_port_type gpr_split_host_port_import; gpr_split_host_port_type gpr_split_host_port_import;
gpr_log_severity_string_type gpr_log_severity_string_import; gpr_log_severity_string_type gpr_log_severity_string_import;
@ -510,21 +495,6 @@ void grpc_rb_load_imports(HMODULE library) {
gpr_cmdline_usage_string_import = (gpr_cmdline_usage_string_type) GetProcAddress(library, "gpr_cmdline_usage_string"); gpr_cmdline_usage_string_import = (gpr_cmdline_usage_string_type) GetProcAddress(library, "gpr_cmdline_usage_string");
gpr_cpu_num_cores_import = (gpr_cpu_num_cores_type) GetProcAddress(library, "gpr_cpu_num_cores"); gpr_cpu_num_cores_import = (gpr_cpu_num_cores_type) GetProcAddress(library, "gpr_cpu_num_cores");
gpr_cpu_current_cpu_import = (gpr_cpu_current_cpu_type) GetProcAddress(library, "gpr_cpu_current_cpu"); gpr_cpu_current_cpu_import = (gpr_cpu_current_cpu_type) GetProcAddress(library, "gpr_cpu_current_cpu");
gpr_histogram_create_import = (gpr_histogram_create_type) GetProcAddress(library, "gpr_histogram_create");
gpr_histogram_destroy_import = (gpr_histogram_destroy_type) GetProcAddress(library, "gpr_histogram_destroy");
gpr_histogram_add_import = (gpr_histogram_add_type) GetProcAddress(library, "gpr_histogram_add");
gpr_histogram_merge_import = (gpr_histogram_merge_type) GetProcAddress(library, "gpr_histogram_merge");
gpr_histogram_percentile_import = (gpr_histogram_percentile_type) GetProcAddress(library, "gpr_histogram_percentile");
gpr_histogram_mean_import = (gpr_histogram_mean_type) GetProcAddress(library, "gpr_histogram_mean");
gpr_histogram_stddev_import = (gpr_histogram_stddev_type) GetProcAddress(library, "gpr_histogram_stddev");
gpr_histogram_variance_import = (gpr_histogram_variance_type) GetProcAddress(library, "gpr_histogram_variance");
gpr_histogram_maximum_import = (gpr_histogram_maximum_type) GetProcAddress(library, "gpr_histogram_maximum");
gpr_histogram_minimum_import = (gpr_histogram_minimum_type) GetProcAddress(library, "gpr_histogram_minimum");
gpr_histogram_count_import = (gpr_histogram_count_type) GetProcAddress(library, "gpr_histogram_count");
gpr_histogram_sum_import = (gpr_histogram_sum_type) GetProcAddress(library, "gpr_histogram_sum");
gpr_histogram_sum_of_squares_import = (gpr_histogram_sum_of_squares_type) GetProcAddress(library, "gpr_histogram_sum_of_squares");
gpr_histogram_get_contents_import = (gpr_histogram_get_contents_type) GetProcAddress(library, "gpr_histogram_get_contents");
gpr_histogram_merge_contents_import = (gpr_histogram_merge_contents_type) GetProcAddress(library, "gpr_histogram_merge_contents");
gpr_join_host_port_import = (gpr_join_host_port_type) GetProcAddress(library, "gpr_join_host_port"); gpr_join_host_port_import = (gpr_join_host_port_type) GetProcAddress(library, "gpr_join_host_port");
gpr_split_host_port_import = (gpr_split_host_port_type) GetProcAddress(library, "gpr_split_host_port"); gpr_split_host_port_import = (gpr_split_host_port_type) GetProcAddress(library, "gpr_split_host_port");
gpr_log_severity_string_import = (gpr_log_severity_string_type) GetProcAddress(library, "gpr_log_severity_string"); gpr_log_severity_string_import = (gpr_log_severity_string_type) GetProcAddress(library, "gpr_log_severity_string");

@ -36,7 +36,6 @@
#include <grpc/support/avl.h> #include <grpc/support/avl.h>
#include <grpc/support/cmdline.h> #include <grpc/support/cmdline.h>
#include <grpc/support/cpu.h> #include <grpc/support/cpu.h>
#include <grpc/support/histogram.h>
#include <grpc/support/host_port.h> #include <grpc/support/host_port.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/log_windows.h> #include <grpc/support/log_windows.h>
@ -649,51 +648,6 @@ extern gpr_cpu_num_cores_type gpr_cpu_num_cores_import;
typedef unsigned(*gpr_cpu_current_cpu_type)(void); typedef unsigned(*gpr_cpu_current_cpu_type)(void);
extern gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import; extern gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import;
#define gpr_cpu_current_cpu gpr_cpu_current_cpu_import #define gpr_cpu_current_cpu gpr_cpu_current_cpu_import
typedef gpr_histogram*(*gpr_histogram_create_type)(double resolution, double max_bucket_start);
extern gpr_histogram_create_type gpr_histogram_create_import;
#define gpr_histogram_create gpr_histogram_create_import
typedef void(*gpr_histogram_destroy_type)(gpr_histogram* h);
extern gpr_histogram_destroy_type gpr_histogram_destroy_import;
#define gpr_histogram_destroy gpr_histogram_destroy_import
typedef void(*gpr_histogram_add_type)(gpr_histogram* h, double x);
extern gpr_histogram_add_type gpr_histogram_add_import;
#define gpr_histogram_add gpr_histogram_add_import
typedef int(*gpr_histogram_merge_type)(gpr_histogram* dst, const gpr_histogram* src);
extern gpr_histogram_merge_type gpr_histogram_merge_import;
#define gpr_histogram_merge gpr_histogram_merge_import
typedef double(*gpr_histogram_percentile_type)(gpr_histogram* histogram, double percentile);
extern gpr_histogram_percentile_type gpr_histogram_percentile_import;
#define gpr_histogram_percentile gpr_histogram_percentile_import
typedef double(*gpr_histogram_mean_type)(gpr_histogram* histogram);
extern gpr_histogram_mean_type gpr_histogram_mean_import;
#define gpr_histogram_mean gpr_histogram_mean_import
typedef double(*gpr_histogram_stddev_type)(gpr_histogram* histogram);
extern gpr_histogram_stddev_type gpr_histogram_stddev_import;
#define gpr_histogram_stddev gpr_histogram_stddev_import
typedef double(*gpr_histogram_variance_type)(gpr_histogram* histogram);
extern gpr_histogram_variance_type gpr_histogram_variance_import;
#define gpr_histogram_variance gpr_histogram_variance_import
typedef double(*gpr_histogram_maximum_type)(gpr_histogram* histogram);
extern gpr_histogram_maximum_type gpr_histogram_maximum_import;
#define gpr_histogram_maximum gpr_histogram_maximum_import
typedef double(*gpr_histogram_minimum_type)(gpr_histogram* histogram);
extern gpr_histogram_minimum_type gpr_histogram_minimum_import;
#define gpr_histogram_minimum gpr_histogram_minimum_import
typedef double(*gpr_histogram_count_type)(gpr_histogram* histogram);
extern gpr_histogram_count_type gpr_histogram_count_import;
#define gpr_histogram_count gpr_histogram_count_import
typedef double(*gpr_histogram_sum_type)(gpr_histogram* histogram);
extern gpr_histogram_sum_type gpr_histogram_sum_import;
#define gpr_histogram_sum gpr_histogram_sum_import
typedef double(*gpr_histogram_sum_of_squares_type)(gpr_histogram* histogram);
extern gpr_histogram_sum_of_squares_type gpr_histogram_sum_of_squares_import;
#define gpr_histogram_sum_of_squares gpr_histogram_sum_of_squares_import
typedef const uint32_t*(*gpr_histogram_get_contents_type)(gpr_histogram* histogram, size_t* count);
extern gpr_histogram_get_contents_type gpr_histogram_get_contents_import;
#define gpr_histogram_get_contents gpr_histogram_get_contents_import
typedef void(*gpr_histogram_merge_contents_type)(gpr_histogram* histogram, const uint32_t* data, size_t data_count, double min_seen, double max_seen, double sum, double sum_of_squares, double count);
extern gpr_histogram_merge_contents_type gpr_histogram_merge_contents_import;
#define gpr_histogram_merge_contents gpr_histogram_merge_contents_import
typedef int(*gpr_join_host_port_type)(char** out, const char* host, int port); typedef int(*gpr_join_host_port_type)(char** out, const char* host, int port);
extern gpr_join_host_port_type gpr_join_host_port_import; extern gpr_join_host_port_type gpr_join_host_port_import;
#define gpr_join_host_port gpr_join_host_port_import #define gpr_join_host_port gpr_join_host_port_import

@ -280,6 +280,7 @@
elseif("<%text>${gRPC_SSL_PROVIDER}</%text>" STREQUAL "package") elseif("<%text>${gRPC_SSL_PROVIDER}</%text>" STREQUAL "package")
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
set(_gRPC_SSL_LIBRARIES <%text>${OPENSSL_LIBRARIES}</%text>) set(_gRPC_SSL_LIBRARIES <%text>${OPENSSL_LIBRARIES}</%text>)
include_directories(<%text>${OPENSSL_INCLUDE_DIR}</%text>)
set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n find_package(OpenSSL)\nendif()") set(_gRPC_FIND_SSL "if(NOT OPENSSL_FOUND)\n find_package(OpenSSL)\nendif()")
endif() endif()

@ -22,15 +22,15 @@
#include <string.h> #include <string.h>
#include <grpc/support/cmdline.h> #include <grpc/support/cmdline.h>
#include <grpc/support/histogram.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "test/core/util/grpc_profiler.h" #include "test/core/util/grpc_profiler.h"
#include "test/core/util/histogram.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
static gpr_histogram* histogram; static grpc_histogram* histogram;
static grpc_byte_buffer* the_buffer; static grpc_byte_buffer* the_buffer;
static grpc_channel* channel; static grpc_channel* channel;
static grpc_completion_queue* cq; static grpc_completion_queue* cq;
@ -195,7 +195,7 @@ int main(int argc, char** argv) {
channel = grpc_insecure_channel_create(target, nullptr, nullptr); channel = grpc_insecure_channel_create(target, nullptr, nullptr);
cq = grpc_completion_queue_create_for_next(nullptr); cq = grpc_completion_queue_create_for_next(nullptr);
the_buffer = grpc_raw_byte_buffer_create(&slice, (size_t)payload_size); the_buffer = grpc_raw_byte_buffer_create(&slice, (size_t)payload_size);
histogram = gpr_histogram_create(0.01, 60e9); histogram = grpc_histogram_create(0.01, 60e9);
sc.init(); sc.init();
@ -213,7 +213,7 @@ int main(int argc, char** argv) {
start = now(); start = now();
sc.do_one_step(); sc.do_one_step();
stop = now(); stop = now();
gpr_histogram_add(histogram, stop - start); grpc_histogram_add(histogram, stop - start);
} }
grpc_profiler_stop(); grpc_profiler_stop();
@ -232,11 +232,11 @@ int main(int argc, char** argv) {
grpc_slice_unref(slice); grpc_slice_unref(slice);
gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f",
gpr_histogram_percentile(histogram, 50), grpc_histogram_percentile(histogram, 50),
gpr_histogram_percentile(histogram, 95), grpc_histogram_percentile(histogram, 95),
gpr_histogram_percentile(histogram, 99), grpc_histogram_percentile(histogram, 99),
gpr_histogram_percentile(histogram, 99.9)); grpc_histogram_percentile(histogram, 99.9));
gpr_histogram_destroy(histogram); grpc_histogram_destroy(histogram);
grpc_shutdown(); grpc_shutdown();

@ -36,13 +36,13 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/cmdline.h> #include <grpc/support/cmdline.h>
#include <grpc/support/histogram.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/thd.h> #include <grpc/support/thd.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/socket_utils_posix.h"
#include "test/core/util/histogram.h"
typedef struct fd_pair { typedef struct fd_pair {
int read_fd; int read_fd;
@ -275,14 +275,14 @@ static void server_thread_wrap(void* arg) {
server_thread(args); server_thread(args);
} }
static void print_histogram(gpr_histogram* histogram) { static void print_histogram(grpc_histogram* histogram) {
/* TODO(klempner): Print more detailed information, such as detailed histogram /* TODO(klempner): Print more detailed information, such as detailed histogram
buckets */ buckets */
gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f", gpr_log(GPR_INFO, "latency (50/95/99/99.9): %f/%f/%f/%f",
gpr_histogram_percentile(histogram, 50), grpc_histogram_percentile(histogram, 50),
gpr_histogram_percentile(histogram, 95), grpc_histogram_percentile(histogram, 95),
gpr_histogram_percentile(histogram, 99), grpc_histogram_percentile(histogram, 99),
gpr_histogram_percentile(histogram, 99.9)); grpc_histogram_percentile(histogram, 99.9));
} }
static double now(void) { static double now(void) {
@ -293,7 +293,7 @@ static double now(void) {
static void client_thread(thread_args* args) { static void client_thread(thread_args* args) {
char* buf = static_cast<char*>(gpr_malloc(args->msg_size * sizeof(char))); char* buf = static_cast<char*>(gpr_malloc(args->msg_size * sizeof(char)));
memset(buf, 0, args->msg_size * sizeof(char)); memset(buf, 0, args->msg_size * sizeof(char));
gpr_histogram* histogram = gpr_histogram_create(0.01, 60e9); grpc_histogram* histogram = grpc_histogram_create(0.01, 60e9);
double start_time; double start_time;
double end_time; double end_time;
double interval; double interval;
@ -316,13 +316,13 @@ static void client_thread(thread_args* args) {
end_time = now(); end_time = now();
if (i > kNumIters / 2) { if (i > kNumIters / 2) {
interval = end_time - start_time; interval = end_time - start_time;
gpr_histogram_add(histogram, interval); grpc_histogram_add(histogram, interval);
} }
} }
print_histogram(histogram); print_histogram(histogram);
error: error:
gpr_free(buf); gpr_free(buf);
gpr_histogram_destroy(histogram); grpc_histogram_destroy(histogram);
} }
/* This roughly matches tcp_server's create_listening_socket */ /* This roughly matches tcp_server's create_listening_socket */

@ -68,16 +68,6 @@ grpc_cc_test(
], ],
) )
grpc_cc_test(
name = "histogram_test",
srcs = ["histogram_test.cc"],
language = "C++",
deps = [
"//:gpr",
"//test/core/util:gpr_test_util",
],
)
grpc_cc_test( grpc_cc_test(
name = "host_port_test", name = "host_port_test",
srcs = ["host_port_test.cc"], srcs = ["host_port_test.cc"],

@ -1,163 +0,0 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include <grpc/support/histogram.h>
#include <grpc/support/log.h>
#define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x);
static void test_no_op(void) {
gpr_histogram_destroy(gpr_histogram_create(0.01, 60e9));
}
static void expect_percentile(gpr_histogram* h, double percentile,
double min_expect, double max_expect) {
double got = gpr_histogram_percentile(h, percentile);
gpr_log(GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got,
max_expect);
GPR_ASSERT(min_expect <= got);
GPR_ASSERT(got <= max_expect);
}
static void test_simple(void) {
gpr_histogram* h;
LOG_TEST("test_simple");
h = gpr_histogram_create(0.01, 60e9);
gpr_histogram_add(h, 10000);
gpr_histogram_add(h, 10000);
gpr_histogram_add(h, 11000);
gpr_histogram_add(h, 11000);
expect_percentile(h, 50, 10001, 10999);
GPR_ASSERT(gpr_histogram_mean(h) == 10500);
gpr_histogram_destroy(h);
}
static void test_percentile(void) {
gpr_histogram* h;
double last;
double i;
double cur;
LOG_TEST("test_percentile");
h = gpr_histogram_create(0.05, 1e9);
gpr_histogram_add(h, 2.5);
gpr_histogram_add(h, 2.5);
gpr_histogram_add(h, 8);
gpr_histogram_add(h, 4);
GPR_ASSERT(gpr_histogram_count(h) == 4);
GPR_ASSERT(gpr_histogram_minimum(h) == 2.5);
GPR_ASSERT(gpr_histogram_maximum(h) == 8);
GPR_ASSERT(gpr_histogram_sum(h) == 17);
GPR_ASSERT(gpr_histogram_sum_of_squares(h) == 92.5);
GPR_ASSERT(gpr_histogram_mean(h) == 4.25);
GPR_ASSERT(gpr_histogram_variance(h) == 5.0625);
GPR_ASSERT(gpr_histogram_stddev(h) == 2.25);
expect_percentile(h, -10, 2.5, 2.5);
expect_percentile(h, 0, 2.5, 2.5);
expect_percentile(h, 12.5, 2.5, 2.5);
expect_percentile(h, 25, 2.5, 2.5);
expect_percentile(h, 37.5, 2.5, 2.8);
expect_percentile(h, 50, 3.0, 3.5);
expect_percentile(h, 62.5, 3.5, 4.5);
expect_percentile(h, 75, 5, 7.9);
expect_percentile(h, 100, 8, 8);
expect_percentile(h, 110, 8, 8);
/* test monotonicity */
last = 0.0;
for (i = 0; i < 100.0; i += 0.01) {
cur = gpr_histogram_percentile(h, i);
GPR_ASSERT(cur >= last);
last = cur;
}
gpr_histogram_destroy(h);
}
static void test_merge(void) {
gpr_histogram *h1, *h2;
double last;
double i;
double cur;
LOG_TEST("test_merge");
h1 = gpr_histogram_create(0.05, 1e9);
gpr_histogram_add(h1, 2.5);
gpr_histogram_add(h1, 2.5);
gpr_histogram_add(h1, 8);
gpr_histogram_add(h1, 4);
h2 = gpr_histogram_create(0.01, 1e9);
GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0);
gpr_histogram_destroy(h2);
h2 = gpr_histogram_create(0.05, 1e10);
GPR_ASSERT(gpr_histogram_merge(h1, h2) == 0);
gpr_histogram_destroy(h2);
h2 = gpr_histogram_create(0.05, 1e9);
GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1);
GPR_ASSERT(gpr_histogram_count(h1) == 4);
GPR_ASSERT(gpr_histogram_minimum(h1) == 2.5);
GPR_ASSERT(gpr_histogram_maximum(h1) == 8);
GPR_ASSERT(gpr_histogram_sum(h1) == 17);
GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 92.5);
GPR_ASSERT(gpr_histogram_mean(h1) == 4.25);
GPR_ASSERT(gpr_histogram_variance(h1) == 5.0625);
GPR_ASSERT(gpr_histogram_stddev(h1) == 2.25);
gpr_histogram_destroy(h2);
h2 = gpr_histogram_create(0.05, 1e9);
gpr_histogram_add(h2, 7.0);
gpr_histogram_add(h2, 17.0);
gpr_histogram_add(h2, 1.0);
GPR_ASSERT(gpr_histogram_merge(h1, h2) == 1);
GPR_ASSERT(gpr_histogram_count(h1) == 7);
GPR_ASSERT(gpr_histogram_minimum(h1) == 1.0);
GPR_ASSERT(gpr_histogram_maximum(h1) == 17.0);
GPR_ASSERT(gpr_histogram_sum(h1) == 42.0);
GPR_ASSERT(gpr_histogram_sum_of_squares(h1) == 431.5);
GPR_ASSERT(gpr_histogram_mean(h1) == 6.0);
/* test monotonicity */
last = 0.0;
for (i = 0; i < 100.0; i += 0.01) {
cur = gpr_histogram_percentile(h1, i);
GPR_ASSERT(cur >= last);
last = cur;
}
gpr_histogram_destroy(h1);
gpr_histogram_destroy(h2);
}
int main(void) {
test_no_op();
test_simple();
test_percentile();
test_merge();
return 0;
}

@ -49,10 +49,11 @@
#define NUM_OUTER_LOOPS_SHORT_TIMEOUTS 10 #define NUM_OUTER_LOOPS_SHORT_TIMEOUTS 10
#define NUM_INNER_LOOPS_SHORT_TIMEOUTS 100 #define NUM_INNER_LOOPS_SHORT_TIMEOUTS 100
#define DELAY_MILLIS_SHORT_TIMEOUTS 1 #define DELAY_MILLIS_SHORT_TIMEOUTS 1
// in a successful test run, POLL_MILLIS should never be reached beause all runs // in a successful test run, POLL_MILLIS should never be reached because all
// should // runs should end after the shorter delay_millis
// end after the shorter delay_millis
#define POLL_MILLIS_SHORT_TIMEOUTS 30000 #define POLL_MILLIS_SHORT_TIMEOUTS 30000
// it should never take longer that this to shutdown the server
#define SERVER_SHUTDOWN_TIMEOUT 30000
static void* tag(int n) { return (void*)(uintptr_t)n; } static void* tag(int n) { return (void*)(uintptr_t)n; }
static int detag(void* p) { return (int)(uintptr_t)p; } static int detag(void* p) { return (int)(uintptr_t)p; }
@ -95,7 +96,8 @@ struct server_thread_args {
void server_thread(void* vargs) { void server_thread(void* vargs) {
struct server_thread_args* args = (struct server_thread_args*)vargs; struct server_thread_args* args = (struct server_thread_args*)vargs;
grpc_event ev; grpc_event ev;
gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); gpr_timespec deadline =
grpc_timeout_milliseconds_to_deadline(SERVER_SHUTDOWN_TIMEOUT);
ev = grpc_completion_queue_next(args->cq, deadline, nullptr); ev = grpc_completion_queue_next(args->cq, deadline, nullptr);
GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE);
GPR_ASSERT(detag(ev.tag) == 0xd1e); GPR_ASSERT(detag(ev.tag) == 0xd1e);

@ -50,7 +50,6 @@
#include <grpc/support/avl.h> #include <grpc/support/avl.h>
#include <grpc/support/cmdline.h> #include <grpc/support/cmdline.h>
#include <grpc/support/cpu.h> #include <grpc/support/cpu.h>
#include <grpc/support/histogram.h>
#include <grpc/support/host_port.h> #include <grpc/support/host_port.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
@ -266,21 +265,6 @@ int main(int argc, char **argv) {
printf("%lx", (unsigned long) gpr_cmdline_usage_string); printf("%lx", (unsigned long) gpr_cmdline_usage_string);
printf("%lx", (unsigned long) gpr_cpu_num_cores); printf("%lx", (unsigned long) gpr_cpu_num_cores);
printf("%lx", (unsigned long) gpr_cpu_current_cpu); printf("%lx", (unsigned long) gpr_cpu_current_cpu);
printf("%lx", (unsigned long) gpr_histogram_create);
printf("%lx", (unsigned long) gpr_histogram_destroy);
printf("%lx", (unsigned long) gpr_histogram_add);
printf("%lx", (unsigned long) gpr_histogram_merge);
printf("%lx", (unsigned long) gpr_histogram_percentile);
printf("%lx", (unsigned long) gpr_histogram_mean);
printf("%lx", (unsigned long) gpr_histogram_stddev);
printf("%lx", (unsigned long) gpr_histogram_variance);
printf("%lx", (unsigned long) gpr_histogram_maximum);
printf("%lx", (unsigned long) gpr_histogram_minimum);
printf("%lx", (unsigned long) gpr_histogram_count);
printf("%lx", (unsigned long) gpr_histogram_sum);
printf("%lx", (unsigned long) gpr_histogram_sum_of_squares);
printf("%lx", (unsigned long) gpr_histogram_get_contents);
printf("%lx", (unsigned long) gpr_histogram_merge_contents);
printf("%lx", (unsigned long) gpr_join_host_port); printf("%lx", (unsigned long) gpr_join_host_port);
printf("%lx", (unsigned long) gpr_split_host_port); printf("%lx", (unsigned long) gpr_split_host_port);
printf("%lx", (unsigned long) gpr_log_severity_string); printf("%lx", (unsigned long) gpr_log_severity_string);

@ -16,7 +16,10 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_c
licenses(["notice"]) # Apache v2 licenses(["notice"]) # Apache v2
grpc_package(name = "test/core/util", visibility = "public") grpc_package(
name = "test/core/util",
visibility = "public",
)
grpc_cc_library( grpc_cc_library(
name = "gpr_test_util", name = "gpr_test_util",
@ -49,10 +52,12 @@ grpc_cc_library(
name = "grpc_test_util_base", name = "grpc_test_util_base",
srcs = [ srcs = [
"grpc_profiler.cc", "grpc_profiler.cc",
"histogram.cc",
"mock_endpoint.cc", "mock_endpoint.cc",
"parse_hexstring.cc", "parse_hexstring.cc",
"passthru_endpoint.cc", "passthru_endpoint.cc",
"port.cc", "port.cc",
"port_isolated_runtime_environment.cc",
"port_server_client.cc", "port_server_client.cc",
"reconnect_server.cc", "reconnect_server.cc",
"slice_splitter.cc", "slice_splitter.cc",
@ -62,6 +67,7 @@ grpc_cc_library(
], ],
hdrs = [ hdrs = [
"grpc_profiler.h", "grpc_profiler.h",
"histogram.h",
"mock_endpoint.h", "mock_endpoint.h",
"parse_hexstring.h", "parse_hexstring.h",
"passthru_endpoint.h", "passthru_endpoint.h",
@ -76,8 +82,8 @@ grpc_cc_library(
language = "C++", language = "C++",
deps = [ deps = [
":gpr_test_util", ":gpr_test_util",
":grpc_debugger_macros",
"//:grpc_common", "//:grpc_common",
":grpc_debugger_macros"
], ],
) )
@ -107,13 +113,23 @@ grpc_cc_library(
name = "fuzzer_corpus_test", name = "fuzzer_corpus_test",
testonly = 1, testonly = 1,
srcs = ["fuzzer_corpus_test.cc"], srcs = ["fuzzer_corpus_test.cc"],
external_deps = [
"gtest",
"gflags",
],
deps = [ deps = [
":gpr_test_util", ":gpr_test_util",
"//:grpc", "//:grpc",
], ],
external_deps = [ )
"gtest",
"gflags", grpc_cc_test(
name = "histogram_test",
srcs = ["histogram_test.cc"],
language = "C++",
deps = [
":grpc_test_util",
"//:gpr",
], ],
) )
@ -121,3 +137,8 @@ sh_library(
name = "fuzzer_one_entry_runner", name = "fuzzer_one_entry_runner",
srcs = ["fuzzer_one_entry_runner.sh"], srcs = ["fuzzer_one_entry_runner.sh"],
) )
sh_library(
name = "run_with_poller_sh",
srcs = ["run_with_poller.sh"],
)

@ -16,8 +16,6 @@
* *
*/ */
#include <grpc/support/histogram.h>
#include <math.h> #include <math.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
@ -27,12 +25,14 @@
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "test/core/util/histogram.h"
/* Histograms are stored with exponentially increasing bucket sizes. /* Histograms are stored with exponentially increasing bucket sizes.
The first bucket is [0, m) where m = 1 + resolution The first bucket is [0, m) where m = 1 + resolution
Bucket n (n>=1) contains [m**n, m**(n+1)) Bucket n (n>=1) contains [m**n, m**(n+1))
There are sufficient buckets to reach max_bucket_start */ There are sufficient buckets to reach max_bucket_start */
struct gpr_histogram { struct grpc_histogram {
/* Sum of all values seen so far */ /* Sum of all values seen so far */
double sum; double sum;
/* Sum of squares of all values seen so far */ /* Sum of squares of all values seen so far */
@ -55,25 +55,25 @@ struct gpr_histogram {
}; };
/* determine a bucket index given a value - does no bounds checking */ /* determine a bucket index given a value - does no bounds checking */
static size_t bucket_for_unchecked(gpr_histogram* h, double x) { static size_t bucket_for_unchecked(grpc_histogram* h, double x) {
return (size_t)(log(x) * h->one_on_log_multiplier); return (size_t)(log(x) * h->one_on_log_multiplier);
} }
/* bounds checked version of the above */ /* bounds checked version of the above */
static size_t bucket_for(gpr_histogram* h, double x) { static size_t bucket_for(grpc_histogram* h, double x) {
size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible)); size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible));
GPR_ASSERT(bucket < h->num_buckets); GPR_ASSERT(bucket < h->num_buckets);
return bucket; return bucket;
} }
/* at what value does a bucket start? */ /* at what value does a bucket start? */
static double bucket_start(gpr_histogram* h, double x) { static double bucket_start(grpc_histogram* h, double x) {
return pow(h->multiplier, x); return pow(h->multiplier, x);
} }
gpr_histogram* gpr_histogram_create(double resolution, grpc_histogram* grpc_histogram_create(double resolution,
double max_bucket_start) { double max_bucket_start) {
gpr_histogram* h = (gpr_histogram*)gpr_malloc(sizeof(gpr_histogram)); grpc_histogram* h = (grpc_histogram*)gpr_malloc(sizeof(grpc_histogram));
GPR_ASSERT(resolution > 0.0); GPR_ASSERT(resolution > 0.0);
GPR_ASSERT(max_bucket_start > resolution); GPR_ASSERT(max_bucket_start > resolution);
h->sum = 0.0; h->sum = 0.0;
@ -91,12 +91,12 @@ gpr_histogram* gpr_histogram_create(double resolution,
return h; return h;
} }
void gpr_histogram_destroy(gpr_histogram* h) { void grpc_histogram_destroy(grpc_histogram* h) {
gpr_free(h->buckets); gpr_free(h->buckets);
gpr_free(h); gpr_free(h);
} }
void gpr_histogram_add(gpr_histogram* h, double x) { void grpc_histogram_add(grpc_histogram* h, double x) {
h->sum += x; h->sum += x;
h->sum_of_squares += x * x; h->sum_of_squares += x * x;
h->count++; h->count++;
@ -109,22 +109,22 @@ void gpr_histogram_add(gpr_histogram* h, double x) {
h->buckets[bucket_for(h, x)]++; h->buckets[bucket_for(h, x)]++;
} }
int gpr_histogram_merge(gpr_histogram* dst, const gpr_histogram* src) { int grpc_histogram_merge(grpc_histogram* dst, const grpc_histogram* src) {
if ((dst->num_buckets != src->num_buckets) || if ((dst->num_buckets != src->num_buckets) ||
(dst->multiplier != src->multiplier)) { (dst->multiplier != src->multiplier)) {
/* Fail because these histograms don't match */ /* Fail because these histograms don't match */
return 0; return 0;
} }
gpr_histogram_merge_contents(dst, src->buckets, src->num_buckets, grpc_histogram_merge_contents(dst, src->buckets, src->num_buckets,
src->min_seen, src->max_seen, src->sum, src->min_seen, src->max_seen, src->sum,
src->sum_of_squares, src->count); src->sum_of_squares, src->count);
return 1; return 1;
} }
void gpr_histogram_merge_contents(gpr_histogram* dst, const uint32_t* data, void grpc_histogram_merge_contents(grpc_histogram* dst, const uint32_t* data,
size_t data_count, double min_seen, size_t data_count, double min_seen,
double max_seen, double sum, double max_seen, double sum,
double sum_of_squares, double count) { double sum_of_squares, double count) {
size_t i; size_t i;
GPR_ASSERT(dst->num_buckets == data_count); GPR_ASSERT(dst->num_buckets == data_count);
dst->sum += sum; dst->sum += sum;
@ -141,7 +141,7 @@ void gpr_histogram_merge_contents(gpr_histogram* dst, const uint32_t* data,
} }
} }
static double threshold_for_count_below(gpr_histogram* h, double count_below) { static double threshold_for_count_below(grpc_histogram* h, double count_below) {
double count_so_far; double count_so_far;
double lower_bound; double lower_bound;
double upper_bound; double upper_bound;
@ -190,38 +190,38 @@ static double threshold_for_count_below(gpr_histogram* h, double count_below) {
} }
} }
double gpr_histogram_percentile(gpr_histogram* h, double percentile) { double grpc_histogram_percentile(grpc_histogram* h, double percentile) {
return threshold_for_count_below(h, h->count * percentile / 100.0); return threshold_for_count_below(h, h->count * percentile / 100.0);
} }
double gpr_histogram_mean(gpr_histogram* h) { double grpc_histogram_mean(grpc_histogram* h) {
GPR_ASSERT(h->count != 0); GPR_ASSERT(h->count != 0);
return h->sum / h->count; return h->sum / h->count;
} }
double gpr_histogram_stddev(gpr_histogram* h) { double grpc_histogram_stddev(grpc_histogram* h) {
return sqrt(gpr_histogram_variance(h)); return sqrt(grpc_histogram_variance(h));
} }
double gpr_histogram_variance(gpr_histogram* h) { double grpc_histogram_variance(grpc_histogram* h) {
if (h->count == 0) return 0.0; if (h->count == 0) return 0.0;
return (h->sum_of_squares * h->count - h->sum * h->sum) / return (h->sum_of_squares * h->count - h->sum * h->sum) /
(h->count * h->count); (h->count * h->count);
} }
double gpr_histogram_maximum(gpr_histogram* h) { return h->max_seen; } double grpc_histogram_maximum(grpc_histogram* h) { return h->max_seen; }
double gpr_histogram_minimum(gpr_histogram* h) { return h->min_seen; } double grpc_histogram_minimum(grpc_histogram* h) { return h->min_seen; }
double gpr_histogram_count(gpr_histogram* h) { return h->count; } double grpc_histogram_count(grpc_histogram* h) { return h->count; }
double gpr_histogram_sum(gpr_histogram* h) { return h->sum; } double grpc_histogram_sum(grpc_histogram* h) { return h->sum; }
double gpr_histogram_sum_of_squares(gpr_histogram* h) { double grpc_histogram_sum_of_squares(grpc_histogram* h) {
return h->sum_of_squares; return h->sum_of_squares;
} }
const uint32_t* gpr_histogram_get_contents(gpr_histogram* h, size_t* size) { const uint32_t* grpc_histogram_get_contents(grpc_histogram* h, size_t* size) {
*size = h->num_buckets; *size = h->num_buckets;
return h->buckets; return h->buckets;
} }

@ -0,0 +1,62 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#ifndef GRPC_SUPPORT_HISTOGRAM_H
#define GRPC_SUPPORT_HISTOGRAM_H
#include <grpc/support/port_platform.h>
#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct grpc_histogram grpc_histogram;
grpc_histogram* grpc_histogram_create(double resolution,
double max_bucket_start);
void grpc_histogram_destroy(grpc_histogram* h);
void grpc_histogram_add(grpc_histogram* h, double x);
/** The following merges the second histogram into the first. It only works
if they have the same buckets and resolution. Returns 0 on failure, 1
on success */
int grpc_histogram_merge(grpc_histogram* dst, const grpc_histogram* src);
double grpc_histogram_percentile(grpc_histogram* histogram, double percentile);
double grpc_histogram_mean(grpc_histogram* histogram);
double grpc_histogram_stddev(grpc_histogram* histogram);
double grpc_histogram_variance(grpc_histogram* histogram);
double grpc_histogram_maximum(grpc_histogram* histogram);
double grpc_histogram_minimum(grpc_histogram* histogram);
double grpc_histogram_count(grpc_histogram* histogram);
double grpc_histogram_sum(grpc_histogram* histogram);
double grpc_histogram_sum_of_squares(grpc_histogram* histogram);
const uint32_t* grpc_histogram_get_contents(grpc_histogram* histogram,
size_t* count);
void grpc_histogram_merge_contents(grpc_histogram* histogram,
const uint32_t* data, size_t data_count,
double min_seen, double max_seen, double sum,
double sum_of_squares, double count);
#ifdef __cplusplus
}
#endif
#endif /* GRPC_SUPPORT_HISTOGRAM_H */

@ -0,0 +1,163 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include "test/core/util/histogram.h"
#include <grpc/support/log.h>
#define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x);
static void test_no_op(void) {
grpc_histogram_destroy(grpc_histogram_create(0.01, 60e9));
}
static void expect_percentile(grpc_histogram* h, double percentile,
double min_expect, double max_expect) {
double got = grpc_histogram_percentile(h, percentile);
gpr_log(GPR_INFO, "@%f%%, expect %f <= %f <= %f", percentile, min_expect, got,
max_expect);
GPR_ASSERT(min_expect <= got);
GPR_ASSERT(got <= max_expect);
}
static void test_simple(void) {
grpc_histogram* h;
LOG_TEST("test_simple");
h = grpc_histogram_create(0.01, 60e9);
grpc_histogram_add(h, 10000);
grpc_histogram_add(h, 10000);
grpc_histogram_add(h, 11000);
grpc_histogram_add(h, 11000);
expect_percentile(h, 50, 10001, 10999);
GPR_ASSERT(grpc_histogram_mean(h) == 10500);
grpc_histogram_destroy(h);
}
static void test_percentile(void) {
grpc_histogram* h;
double last;
double i;
double cur;
LOG_TEST("test_percentile");
h = grpc_histogram_create(0.05, 1e9);
grpc_histogram_add(h, 2.5);
grpc_histogram_add(h, 2.5);
grpc_histogram_add(h, 8);
grpc_histogram_add(h, 4);
GPR_ASSERT(grpc_histogram_count(h) == 4);
GPR_ASSERT(grpc_histogram_minimum(h) == 2.5);
GPR_ASSERT(grpc_histogram_maximum(h) == 8);
GPR_ASSERT(grpc_histogram_sum(h) == 17);
GPR_ASSERT(grpc_histogram_sum_of_squares(h) == 92.5);
GPR_ASSERT(grpc_histogram_mean(h) == 4.25);
GPR_ASSERT(grpc_histogram_variance(h) == 5.0625);
GPR_ASSERT(grpc_histogram_stddev(h) == 2.25);
expect_percentile(h, -10, 2.5, 2.5);
expect_percentile(h, 0, 2.5, 2.5);
expect_percentile(h, 12.5, 2.5, 2.5);
expect_percentile(h, 25, 2.5, 2.5);
expect_percentile(h, 37.5, 2.5, 2.8);
expect_percentile(h, 50, 3.0, 3.5);
expect_percentile(h, 62.5, 3.5, 4.5);
expect_percentile(h, 75, 5, 7.9);
expect_percentile(h, 100, 8, 8);
expect_percentile(h, 110, 8, 8);
/* test monotonicity */
last = 0.0;
for (i = 0; i < 100.0; i += 0.01) {
cur = grpc_histogram_percentile(h, i);
GPR_ASSERT(cur >= last);
last = cur;
}
grpc_histogram_destroy(h);
}
static void test_merge(void) {
grpc_histogram *h1, *h2;
double last;
double i;
double cur;
LOG_TEST("test_merge");
h1 = grpc_histogram_create(0.05, 1e9);
grpc_histogram_add(h1, 2.5);
grpc_histogram_add(h1, 2.5);
grpc_histogram_add(h1, 8);
grpc_histogram_add(h1, 4);
h2 = grpc_histogram_create(0.01, 1e9);
GPR_ASSERT(grpc_histogram_merge(h1, h2) == 0);
grpc_histogram_destroy(h2);
h2 = grpc_histogram_create(0.05, 1e10);
GPR_ASSERT(grpc_histogram_merge(h1, h2) == 0);
grpc_histogram_destroy(h2);
h2 = grpc_histogram_create(0.05, 1e9);
GPR_ASSERT(grpc_histogram_merge(h1, h2) == 1);
GPR_ASSERT(grpc_histogram_count(h1) == 4);
GPR_ASSERT(grpc_histogram_minimum(h1) == 2.5);
GPR_ASSERT(grpc_histogram_maximum(h1) == 8);
GPR_ASSERT(grpc_histogram_sum(h1) == 17);
GPR_ASSERT(grpc_histogram_sum_of_squares(h1) == 92.5);
GPR_ASSERT(grpc_histogram_mean(h1) == 4.25);
GPR_ASSERT(grpc_histogram_variance(h1) == 5.0625);
GPR_ASSERT(grpc_histogram_stddev(h1) == 2.25);
grpc_histogram_destroy(h2);
h2 = grpc_histogram_create(0.05, 1e9);
grpc_histogram_add(h2, 7.0);
grpc_histogram_add(h2, 17.0);
grpc_histogram_add(h2, 1.0);
GPR_ASSERT(grpc_histogram_merge(h1, h2) == 1);
GPR_ASSERT(grpc_histogram_count(h1) == 7);
GPR_ASSERT(grpc_histogram_minimum(h1) == 1.0);
GPR_ASSERT(grpc_histogram_maximum(h1) == 17.0);
GPR_ASSERT(grpc_histogram_sum(h1) == 42.0);
GPR_ASSERT(grpc_histogram_sum_of_squares(h1) == 431.5);
GPR_ASSERT(grpc_histogram_mean(h1) == 6.0);
/* test monotonicity */
last = 0.0;
for (i = 0; i < 100.0; i += 0.01) {
cur = grpc_histogram_percentile(h1, i);
GPR_ASSERT(cur >= last);
last = cur;
}
grpc_histogram_destroy(h1);
grpc_histogram_destroy(h2);
}
int main(void) {
test_no_op();
test_simple();
test_percentile();
test_merge();
return 0;
}

@ -0,0 +1,42 @@
/*
*
* Copyright 2017 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/* When running tests on remote machines, the framework takes a round-robin pick
* of a port within certain range. There is no need to recycle ports.
*/
#include "src/core/lib/iomgr/port.h"
#include "test/core/util/test_config.h"
#if defined(GRPC_PORT_ISOLATED_RUNTIME)
#include "test/core/util/port.h"
#define LOWER_PORT 49152
static int s_allocated_port = LOWER_PORT;
int grpc_pick_unused_port_or_die(void) {
int allocated_port = s_allocated_port++;
if (s_allocated_port == 65536) {
s_allocated_port = LOWER_PORT;
}
return allocated_port;
}
void grpc_recycle_unused_port(int port) { (void)port; }
#endif /* GRPC_PORT_ISOLATED_RUNTIME */

@ -0,0 +1,19 @@
#!/bin/sh
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
export GRPC_POLL_STRATEGY=$1
shift
$@

@ -33,7 +33,7 @@ gpr_timespec grpc_timeout_seconds_to_deadline(int64_t time_s);
/* Converts a given timeout (in milliseconds) to a deadline. */ /* Converts a given timeout (in milliseconds) to a deadline. */
gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms); gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms);
#ifndef GRPC_TEST_CUSTOM_PICK_PORT #if !defined(GRPC_TEST_CUSTOM_PICK_PORT) && !defined(GRPC_PORT_ISOLATED_RUNTIME)
#define GRPC_TEST_PICK_PORT #define GRPC_TEST_PICK_PORT
#endif #endif

@ -317,9 +317,15 @@ class TestServiceImpl : public TestService::Service {
void grpc::testing::interop::RunServer( void grpc::testing::interop::RunServer(
std::shared_ptr<ServerCredentials> creds) { std::shared_ptr<ServerCredentials> creds) {
GPR_ASSERT(FLAGS_port != 0); RunServer(creds, FLAGS_port, nullptr);
}
void grpc::testing::interop::RunServer(
std::shared_ptr<ServerCredentials> creds, const int port,
ServerStartedCondition* server_started_condition) {
GPR_ASSERT(port != 0);
std::ostringstream server_address; std::ostringstream server_address;
server_address << "0.0.0.0:" << FLAGS_port; server_address << "0.0.0.0:" << port;
TestServiceImpl service; TestServiceImpl service;
SimpleRequest request; SimpleRequest request;
@ -333,6 +339,14 @@ void grpc::testing::interop::RunServer(
} }
std::unique_ptr<Server> server(builder.BuildAndStart()); std::unique_ptr<Server> server(builder.BuildAndStart());
gpr_log(GPR_INFO, "Server listening on %s", server_address.str().c_str()); gpr_log(GPR_INFO, "Server listening on %s", server_address.str().c_str());
// Signal that the server has started.
if (server_started_condition) {
std::unique_lock<std::mutex> lock(server_started_condition->mutex);
server_started_condition->server_started = true;
server_started_condition->condition.notify_all();
}
while (!gpr_atm_no_barrier_load(&g_got_sigint)) { while (!gpr_atm_no_barrier_load(&g_got_sigint)) {
gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
gpr_time_from_seconds(5, GPR_TIMESPAN))); gpr_time_from_seconds(5, GPR_TIMESPAN)));

@ -19,6 +19,7 @@
#ifndef GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H #ifndef GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
#define GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H #define GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
#include <condition_variable>
#include <memory> #include <memory>
#include <grpc/compression.h> #include <grpc/compression.h>
@ -50,8 +51,27 @@ class InteropServerContextInspector {
namespace interop { namespace interop {
extern gpr_atm g_got_sigint; extern gpr_atm g_got_sigint;
struct ServerStartedCondition {
std::mutex mutex;
std::condition_variable condition;
bool server_started = false;
};
/// Run gRPC interop server using port FLAGS_port.
///
/// \param creds The credentials associated with the server.
void RunServer(std::shared_ptr<ServerCredentials> creds); void RunServer(std::shared_ptr<ServerCredentials> creds);
/// Run gRPC interop server.
///
/// \param creds The credentials associated with the server.
/// \param port Port to use for the server.
/// \param server_started_condition (optional) Struct holding mutex, condition
/// variable, and condition used to notify when the server has started.
void RunServer(std::shared_ptr<ServerCredentials> creds, int port,
ServerStartedCondition* server_started_condition);
} // namespace interop } // namespace interop
} // namespace testing } // namespace testing
} // namespace grpc } // namespace grpc

@ -106,7 +106,7 @@ grpc_cc_library(
"histogram.h", "histogram.h",
"stats.h", "stats.h",
], ],
deps = ["//:gpr"], deps = ["//test/core/util:grpc_test_util"],
) )
grpc_cc_test( grpc_cc_test(

@ -60,21 +60,20 @@ class SynchronousClient
SetupLoadTest(config, num_threads_); SetupLoadTest(config, num_threads_);
} }
virtual ~SynchronousClient(){}; virtual ~SynchronousClient() {}
virtual void InitThreadFuncImpl(size_t thread_idx) = 0; virtual bool InitThreadFuncImpl(size_t thread_idx) = 0;
virtual bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) = 0; virtual bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) = 0;
void ThreadFunc(size_t thread_idx, Thread* t) override { void ThreadFunc(size_t thread_idx, Thread* t) override {
InitThreadFuncImpl(thread_idx); if (!InitThreadFuncImpl(thread_idx)) {
return;
}
for (;;) { for (;;) {
// run the loop body // run the loop body
HistogramEntry entry; HistogramEntry entry;
const bool thread_still_ok = ThreadFuncImpl(&entry, thread_idx); const bool thread_still_ok = ThreadFuncImpl(&entry, thread_idx);
t->UpdateHistogram(&entry); t->UpdateHistogram(&entry);
if (!thread_still_ok) {
gpr_log(GPR_ERROR, "Finishing client thread due to RPC error");
}
if (!thread_still_ok || ThreadCompleted()) { if (!thread_still_ok || ThreadCompleted()) {
return; return;
} }
@ -109,9 +108,6 @@ class SynchronousClient
size_t num_threads_; size_t num_threads_;
std::vector<SimpleResponse> responses_; std::vector<SimpleResponse> responses_;
private:
void DestroyMultithreading() override final { EndThreads(); }
}; };
class SynchronousUnaryClient final : public SynchronousClient { class SynchronousUnaryClient final : public SynchronousClient {
@ -122,7 +118,7 @@ class SynchronousUnaryClient final : public SynchronousClient {
} }
~SynchronousUnaryClient() {} ~SynchronousUnaryClient() {}
void InitThreadFuncImpl(size_t thread_idx) override {} bool InitThreadFuncImpl(size_t thread_idx) override { return true; }
bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override { bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override {
if (!WaitToIssue(thread_idx)) { if (!WaitToIssue(thread_idx)) {
@ -140,6 +136,9 @@ class SynchronousUnaryClient final : public SynchronousClient {
entry->set_status(s.error_code()); entry->set_status(s.error_code());
return true; return true;
} }
private:
void DestroyMultithreading() override final { EndThreads(); }
}; };
template <class StreamType> template <class StreamType>
@ -149,31 +148,30 @@ class SynchronousStreamingClient : public SynchronousClient {
: SynchronousClient(config), : SynchronousClient(config),
context_(num_threads_), context_(num_threads_),
stream_(num_threads_), stream_(num_threads_),
stream_mu_(num_threads_),
shutdown_(num_threads_),
messages_per_stream_(config.messages_per_stream()), messages_per_stream_(config.messages_per_stream()),
messages_issued_(num_threads_) { messages_issued_(num_threads_) {
StartThreads(num_threads_); StartThreads(num_threads_);
} }
virtual ~SynchronousStreamingClient() { virtual ~SynchronousStreamingClient() {
std::vector<std::thread> cleanup_threads; CleanupAllStreams([this](size_t thread_idx) {
for (size_t i = 0; i < num_threads_; i++) { // Don't log any kind of error since we may have canceled this
cleanup_threads.emplace_back([this, i]() { stream_[thread_idx]->Finish().IgnoreError();
auto stream = &stream_[i]; });
if (*stream) {
// forcibly cancel the streams, then finish
context_[i].TryCancel();
(*stream)->Finish().IgnoreError();
// don't log any error message on !ok since this was canceled
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
} }
protected: protected:
std::vector<grpc::ClientContext> context_; std::vector<grpc::ClientContext> context_;
std::vector<std::unique_ptr<StreamType>> stream_; std::vector<std::unique_ptr<StreamType>> stream_;
// stream_mu_ is only needed when changing an element of stream_ or context_
std::vector<std::mutex> stream_mu_;
// use struct Bool rather than bool because vector<bool> is not concurrent
struct Bool {
bool val;
Bool() : val(false) {}
};
std::vector<Bool> shutdown_;
const int messages_per_stream_; const int messages_per_stream_;
std::vector<int> messages_issued_; std::vector<int> messages_issued_;
@ -182,27 +180,26 @@ class SynchronousStreamingClient : public SynchronousClient {
// don't set the value since the stream is failed and shouldn't be timed // don't set the value since the stream is failed and shouldn't be timed
entry->set_status(s.error_code()); entry->set_status(s.error_code());
if (!s.ok()) { if (!s.ok()) {
gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s", thread_idx, std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
s.error_message().c_str()); if (!shutdown_[thread_idx].val) {
gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s",
thread_idx, s.error_message().c_str());
}
} }
// Lock the stream_mu_ now because the client context could change
std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
context_[thread_idx].~ClientContext(); context_[thread_idx].~ClientContext();
new (&context_[thread_idx]) ClientContext(); new (&context_[thread_idx]) ClientContext();
} }
};
class SynchronousStreamingPingPongClient final void CleanupAllStreams(std::function<void(size_t)> cleaner) {
: public SynchronousStreamingClient<
grpc::ClientReaderWriter<SimpleRequest, SimpleResponse>> {
public:
SynchronousStreamingPingPongClient(const ClientConfig& config)
: SynchronousStreamingClient(config) {}
~SynchronousStreamingPingPongClient() {
std::vector<std::thread> cleanup_threads; std::vector<std::thread> cleanup_threads;
for (size_t i = 0; i < num_threads_; i++) { for (size_t i = 0; i < num_threads_; i++) {
cleanup_threads.emplace_back([this, i]() { cleanup_threads.emplace_back([this, i, cleaner] {
auto stream = &stream_[i]; std::lock_guard<std::mutex> l(stream_mu_[i]);
if (*stream) { shutdown_[i].val = true;
(*stream)->WritesDone(); if (stream_[i]) {
cleaner(i);
} }
}); });
} }
@ -211,10 +208,36 @@ class SynchronousStreamingPingPongClient final
} }
} }
void InitThreadFuncImpl(size_t thread_idx) override { private:
void DestroyMultithreading() override final {
CleanupAllStreams(
[this](size_t thread_idx) { context_[thread_idx].TryCancel(); });
EndThreads();
}
};
class SynchronousStreamingPingPongClient final
: public SynchronousStreamingClient<
grpc::ClientReaderWriter<SimpleRequest, SimpleResponse>> {
public:
SynchronousStreamingPingPongClient(const ClientConfig& config)
: SynchronousStreamingClient(config) {}
~SynchronousStreamingPingPongClient() {
CleanupAllStreams(
[this](size_t thread_idx) { stream_[thread_idx]->WritesDone(); });
}
private:
bool InitThreadFuncImpl(size_t thread_idx) override {
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]); std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
if (!shutdown_[thread_idx].val) {
stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]);
} else {
return false;
}
messages_issued_[thread_idx] = 0; messages_issued_[thread_idx] = 0;
return true;
} }
bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override { bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override {
@ -239,7 +262,13 @@ class SynchronousStreamingPingPongClient final
stream_[thread_idx]->WritesDone(); stream_[thread_idx]->WritesDone();
FinishStream(entry, thread_idx); FinishStream(entry, thread_idx);
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]); std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
if (!shutdown_[thread_idx].val) {
stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]);
} else {
stream_[thread_idx].reset();
return false;
}
messages_issued_[thread_idx] = 0; messages_issued_[thread_idx] = 0;
return true; return true;
} }
@ -251,25 +280,24 @@ class SynchronousStreamingFromClientClient final
SynchronousStreamingFromClientClient(const ClientConfig& config) SynchronousStreamingFromClientClient(const ClientConfig& config)
: SynchronousStreamingClient(config), last_issue_(num_threads_) {} : SynchronousStreamingClient(config), last_issue_(num_threads_) {}
~SynchronousStreamingFromClientClient() { ~SynchronousStreamingFromClientClient() {
std::vector<std::thread> cleanup_threads; CleanupAllStreams(
for (size_t i = 0; i < num_threads_; i++) { [this](size_t thread_idx) { stream_[thread_idx]->WritesDone(); });
cleanup_threads.emplace_back([this, i]() {
auto stream = &stream_[i];
if (*stream) {
(*stream)->WritesDone();
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
} }
void InitThreadFuncImpl(size_t thread_idx) override { private:
std::vector<double> last_issue_;
bool InitThreadFuncImpl(size_t thread_idx) override {
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx], std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
&responses_[thread_idx]); if (!shutdown_[thread_idx].val) {
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx],
&responses_[thread_idx]);
} else {
return false;
}
last_issue_[thread_idx] = UsageTimer::Now(); last_issue_[thread_idx] = UsageTimer::Now();
return true;
} }
bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override { bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override {
@ -287,13 +315,16 @@ class SynchronousStreamingFromClientClient final
stream_[thread_idx]->WritesDone(); stream_[thread_idx]->WritesDone();
FinishStream(entry, thread_idx); FinishStream(entry, thread_idx);
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx], std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
&responses_[thread_idx]); if (!shutdown_[thread_idx].val) {
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx],
&responses_[thread_idx]);
} else {
stream_[thread_idx].reset();
return false;
}
return true; return true;
} }
private:
std::vector<double> last_issue_;
}; };
class SynchronousStreamingFromServerClient final class SynchronousStreamingFromServerClient final
@ -301,12 +332,24 @@ class SynchronousStreamingFromServerClient final
public: public:
SynchronousStreamingFromServerClient(const ClientConfig& config) SynchronousStreamingFromServerClient(const ClientConfig& config)
: SynchronousStreamingClient(config), last_recv_(num_threads_) {} : SynchronousStreamingClient(config), last_recv_(num_threads_) {}
void InitThreadFuncImpl(size_t thread_idx) override { ~SynchronousStreamingFromServerClient() {}
private:
std::vector<double> last_recv_;
bool InitThreadFuncImpl(size_t thread_idx) override {
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
stub->StreamingFromServer(&context_[thread_idx], request_); if (!shutdown_[thread_idx].val) {
stream_[thread_idx] =
stub->StreamingFromServer(&context_[thread_idx], request_);
} else {
return false;
}
last_recv_[thread_idx] = UsageTimer::Now(); last_recv_[thread_idx] = UsageTimer::Now();
return true;
} }
bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override { bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override {
GPR_TIMER_SCOPE("SynchronousStreamingFromServerClient::ThreadFunc", 0); GPR_TIMER_SCOPE("SynchronousStreamingFromServerClient::ThreadFunc", 0);
if (stream_[thread_idx]->Read(&responses_[thread_idx])) { if (stream_[thread_idx]->Read(&responses_[thread_idx])) {
@ -317,13 +360,16 @@ class SynchronousStreamingFromServerClient final
} }
FinishStream(entry, thread_idx); FinishStream(entry, thread_idx);
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
stub->StreamingFromServer(&context_[thread_idx], request_); if (!shutdown_[thread_idx].val) {
stream_[thread_idx] =
stub->StreamingFromServer(&context_[thread_idx], request_);
} else {
stream_[thread_idx].reset();
return false;
}
return true; return true;
} }
private:
std::vector<double> last_recv_;
}; };
class SynchronousStreamingBothWaysClient final class SynchronousStreamingBothWaysClient final
@ -333,24 +379,22 @@ class SynchronousStreamingBothWaysClient final
SynchronousStreamingBothWaysClient(const ClientConfig& config) SynchronousStreamingBothWaysClient(const ClientConfig& config)
: SynchronousStreamingClient(config) {} : SynchronousStreamingClient(config) {}
~SynchronousStreamingBothWaysClient() { ~SynchronousStreamingBothWaysClient() {
std::vector<std::thread> cleanup_threads; CleanupAllStreams(
for (size_t i = 0; i < num_threads_; i++) { [this](size_t thread_idx) { stream_[thread_idx]->WritesDone(); });
cleanup_threads.emplace_back([this, i]() {
auto stream = &stream_[i];
if (*stream) {
(*stream)->WritesDone();
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
} }
void InitThreadFuncImpl(size_t thread_idx) override { private:
bool InitThreadFuncImpl(size_t thread_idx) override {
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingBothWays(&context_[thread_idx]); std::lock_guard<std::mutex> l(stream_mu_[thread_idx]);
if (!shutdown_[thread_idx].val) {
stream_[thread_idx] = stub->StreamingBothWays(&context_[thread_idx]);
} else {
return false;
}
return true;
} }
bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override { bool ThreadFuncImpl(HistogramEntry* entry, size_t thread_idx) override {
// TODO (vjpai): Do this // TODO (vjpai): Do this
return true; return true;

@ -19,8 +19,8 @@
#ifndef TEST_QPS_HISTOGRAM_H #ifndef TEST_QPS_HISTOGRAM_H
#define TEST_QPS_HISTOGRAM_H #define TEST_QPS_HISTOGRAM_H
#include <grpc/support/histogram.h>
#include "src/proto/grpc/testing/stats.pb.h" #include "src/proto/grpc/testing/stats.pb.h"
#include "test/core/util/histogram.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {
@ -29,36 +29,36 @@ class Histogram {
public: public:
// TODO: look into making histogram params not hardcoded for C++ // TODO: look into making histogram params not hardcoded for C++
Histogram() Histogram()
: impl_(gpr_histogram_create(default_resolution(), : impl_(grpc_histogram_create(default_resolution(),
default_max_possible())) {} default_max_possible())) {}
~Histogram() { ~Histogram() {
if (impl_) gpr_histogram_destroy(impl_); if (impl_) grpc_histogram_destroy(impl_);
} }
Histogram(Histogram&& other) : impl_(other.impl_) { other.impl_ = nullptr; } Histogram(Histogram&& other) : impl_(other.impl_) { other.impl_ = nullptr; }
void Merge(const Histogram& h) { gpr_histogram_merge(impl_, h.impl_); } void Merge(const Histogram& h) { grpc_histogram_merge(impl_, h.impl_); }
void Add(double value) { gpr_histogram_add(impl_, value); } void Add(double value) { grpc_histogram_add(impl_, value); }
double Percentile(double pctile) const { double Percentile(double pctile) const {
return gpr_histogram_percentile(impl_, pctile); return grpc_histogram_percentile(impl_, pctile);
} }
double Count() const { return gpr_histogram_count(impl_); } double Count() const { return grpc_histogram_count(impl_); }
void Swap(Histogram* other) { std::swap(impl_, other->impl_); } void Swap(Histogram* other) { std::swap(impl_, other->impl_); }
void FillProto(HistogramData* p) { void FillProto(HistogramData* p) {
size_t n; size_t n;
const auto* data = gpr_histogram_get_contents(impl_, &n); const auto* data = grpc_histogram_get_contents(impl_, &n);
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
p->add_bucket(data[i]); p->add_bucket(data[i]);
} }
p->set_min_seen(gpr_histogram_minimum(impl_)); p->set_min_seen(grpc_histogram_minimum(impl_));
p->set_max_seen(gpr_histogram_maximum(impl_)); p->set_max_seen(grpc_histogram_maximum(impl_));
p->set_sum(gpr_histogram_sum(impl_)); p->set_sum(grpc_histogram_sum(impl_));
p->set_sum_of_squares(gpr_histogram_sum_of_squares(impl_)); p->set_sum_of_squares(grpc_histogram_sum_of_squares(impl_));
p->set_count(gpr_histogram_count(impl_)); p->set_count(grpc_histogram_count(impl_));
} }
void MergeProto(const HistogramData& p) { void MergeProto(const HistogramData& p) {
gpr_histogram_merge_contents(impl_, &*p.bucket().begin(), p.bucket_size(), grpc_histogram_merge_contents(impl_, &*p.bucket().begin(), p.bucket_size(),
p.min_seen(), p.max_seen(), p.sum(), p.min_seen(), p.max_seen(), p.sum(),
p.sum_of_squares(), p.count()); p.sum_of_squares(), p.count());
} }
static double default_resolution() { return 0.01; } static double default_resolution() { return 0.01; }
@ -68,7 +68,7 @@ class Histogram {
Histogram(const Histogram&); Histogram(const Histogram&);
Histogram& operator=(const Histogram&); Histogram& operator=(const Histogram&);
gpr_histogram* impl_; grpc_histogram* impl_;
}; };
} // namespace testing } // namespace testing
} // namespace grpc } // namespace grpc

@ -20,7 +20,7 @@
#include <iostream> #include <iostream>
// Use the C histogram rather than C++ to avoid depending on proto // Use the C histogram rather than C++ to avoid depending on proto
#include <grpc/support/histogram.h> #include "test/core/util/histogram.h"
#include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/interarrival.h"
#include "test/cpp/util/test_config.h" #include "test/cpp/util/test_config.h"
@ -31,21 +31,21 @@ using grpc::testing::RandomDistInterface;
static void RunTest(RandomDistInterface&& r, int threads, std::string title) { static void RunTest(RandomDistInterface&& r, int threads, std::string title) {
InterarrivalTimer timer; InterarrivalTimer timer;
timer.init(r, threads); timer.init(r, threads);
gpr_histogram* h(gpr_histogram_create(0.01, 60e9)); grpc_histogram* h(grpc_histogram_create(0.01, 60e9));
for (int i = 0; i < 10000000; i++) { for (int i = 0; i < 10000000; i++) {
for (int j = 0; j < threads; j++) { for (int j = 0; j < threads; j++) {
gpr_histogram_add(h, timer.next(j)); grpc_histogram_add(h, timer.next(j));
} }
} }
std::cout << title << " Distribution" << std::endl; std::cout << title << " Distribution" << std::endl;
std::cout << "Value, Percentile" << std::endl; std::cout << "Value, Percentile" << std::endl;
for (double pct = 0.0; pct < 100.0; pct += 1.0) { for (double pct = 0.0; pct < 100.0; pct += 1.0) {
std::cout << gpr_histogram_percentile(h, pct) << "," << pct << std::endl; std::cout << grpc_histogram_percentile(h, pct) << "," << pct << std::endl;
} }
gpr_histogram_destroy(h); grpc_histogram_destroy(h);
} }
using grpc::testing::ExpDist; using grpc::testing::ExpDist;

@ -32,12 +32,12 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/cpu.h> #include <grpc/support/cpu.h>
#include <grpc/support/histogram.h>
#include <grpc/support/host_port.h> #include <grpc/support/host_port.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/proto/grpc/testing/services.pb.h" #include "src/proto/grpc/testing/services.pb.h"
#include "test/core/util/grpc_profiler.h" #include "test/core/util/grpc_profiler.h"
#include "test/core/util/histogram.h"
#include "test/cpp/qps/client.h" #include "test/cpp/qps/client.h"
#include "test/cpp/qps/server.h" #include "test/cpp/qps/server.h"
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"

@ -0,0 +1,75 @@
@rem Copyright 2016 gRPC authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem enter this directory
cd /d %~dp0\..\..\..
@rem TODO(jtattermusch): Kokoro has pre-installed protoc.exe in C:\Program Files\ProtoC and that directory
@rem is on PATH. To avoid picking up the older version protoc.exe, we change the path to something non-existent.
set PATH=%PATH:ProtoC=DontPickupProtoC%
@rem Install into ./testinstall, but use absolute path and foward slashes
set INSTALL_DIR=%cd:\=/%/testinstall
@rem Download OpenSSL-Win32 originally installed from https://slproweb.com/products/Win32OpenSSL.html
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://storage.googleapis.com/grpc-testing.appspot.com/OpenSSL-Win32-1_1_0g.zip', 'OpenSSL-Win32.zip')"
powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::ExtractToDirectory('OpenSSL-Win32.zip', '.');"
@rem set absolute path to OpenSSL with forward slashes
set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32
cd third_party/zlib
mkdir cmake
cd cmake
cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
cmake --build . --config Release --target install || goto :error
cd ../../..
cd third_party/protobuf/cmake
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -Dprotobuf_MSVC_STATIC_RUNTIME=OFF -Dprotobuf_BUILD_TESTS=OFF ..
cmake --build . --config Release --target install || goto :error
cd ../../../..
cd third_party/cares/cares
mkdir cmake
cd cmake
cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..
cmake --build . --config Release --target install || goto :error
cd ../../../..
@rem OpenSSL-Win32 and OpenSSL-Win64 can be downloaded from https://slproweb.com/products/Win32OpenSSL.html
cd cmake
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%/include -DZLIB_LIBRARY=%INSTALL_DIR%/lib/zlibstatic.lib -DZLIB_INCLUDE_DIR=%INSTALL_DIR%/include -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release ../.. || goto :error
cmake --build . --config Release --target install || goto :error
cd ../..
# Build helloworld example using cmake
cd examples/cpp/helloworld
mkdir cmake
cd cmake
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ../.. || goto :error
cmake --build . --config Release || goto :error
cd ../../../../..
goto :EOF
:error
echo Failed!
exit /b %errorlevel%

@ -19,7 +19,6 @@ cd $(dirname $0)/../../..
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
apt-get update apt-get update
#apt-get install -t jessie-backports -y libc-ares-dev # we need specifically version 1.12
apt-get install -t jessie-backports -y libssl-dev apt-get install -t jessie-backports -y libssl-dev
# Install c-ares # Install c-ares

@ -27,7 +27,7 @@ cc_library(
"zutil.h", "zutil.h",
], ],
includes = [ includes = [
"include", ".",
], ],
linkstatic = 1, linkstatic = 1,
visibility = [ visibility = [

@ -913,7 +913,6 @@ include/grpc/support/atm_windows.h \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \

@ -914,7 +914,6 @@ include/grpc/support/atm_windows.h \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \

@ -853,7 +853,6 @@ include/grpc/support/atm_windows.h \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \

@ -853,7 +853,6 @@ include/grpc/support/atm_windows.h \
include/grpc/support/avl.h \ include/grpc/support/avl.h \
include/grpc/support/cmdline.h \ include/grpc/support/cmdline.h \
include/grpc/support/cpu.h \ include/grpc/support/cpu.h \
include/grpc/support/histogram.h \
include/grpc/support/host_port.h \ include/grpc/support/host_port.h \
include/grpc/support/log.h \ include/grpc/support/log.h \
include/grpc/support/log_windows.h \ include/grpc/support/log_windows.h \
@ -1294,7 +1293,6 @@ src/core/lib/support/env_posix.cc \
src/core/lib/support/env_windows.cc \ src/core/lib/support/env_windows.cc \
src/core/lib/support/fork.cc \ src/core/lib/support/fork.cc \
src/core/lib/support/fork.h \ src/core/lib/support/fork.h \
src/core/lib/support/histogram.cc \
src/core/lib/support/host_port.cc \ src/core/lib/support/host_port.cc \
src/core/lib/support/log.cc \ src/core/lib/support/log.cc \
src/core/lib/support/log_android.cc \ src/core/lib/support/log_android.cc \

@ -114,6 +114,19 @@ sudo apt-get update
sudo apt-get install -y dotnet-dev-1.0.0-preview2.1-003155 sudo apt-get install -y dotnet-dev-1.0.0-preview2.1-003155
sudo apt-get install -y dotnet-dev-1.0.1 sudo apt-get install -y dotnet-dev-1.0.1
# C# 1.0.4 SDK
curl -O https://download.microsoft.com/download/2/4/A/24A06858-E8AC-469B-8AE6-D0CEC9BA982A/dotnet-ubuntu.16.04-x64.1.0.5.tar.gz
sudo mkdir -p /opt/dotnet
sudo tar zxf dotnet-ubuntu.16.04-x64.1.0.5.tar.gz -C /opt/dotnet
sudo ln -s /opt/dotnet/dotnet /usr/local/bin
# C# .NET dependencies
wget http://security.ubuntu.com/ubuntu/pool/main/i/icu/libicu52_52.1-8ubuntu0.2_amd64.deb
sudo dpkg -i libicu52_52.1-8ubuntu0.2_amd64.deb
wget http://security.ubuntu.com/ubuntu/pool/main/i/icu/libicu55_55.1-7ubuntu0.3_amd64.deb
sudo dpkg -i libicu55_55.1-7ubuntu0.3_amd64.deb
sudo apt-get update && sudo apt-get install -y libicu55
# Ruby dependencies # Ruby dependencies
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable --ruby curl -sSL https://get.rvm.io | bash -s stable --ruby

@ -0,0 +1,40 @@
#!/bin/bash
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Source this rc script to prepare the environment for linux perf builds
# Need to increase open files limit and size for perf test
ulimit -n 32768
ulimit -c unlimited
# Download non-core gRPC repos
git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go
git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java
git clone --recursive https://github.com/grpc/grpc-node ./../grpc-node
sudo pip install tabulate
# Set up Ruby
export PATH="$HOME/.rbenv/bin:$PATH"
eval "$(rbenv init -)"
gem list bundler
gem install bundler --no-ri --no-rdoc
# Allow SSH to Kokoro performance workers without explicit key verification
gsutil cp gs://grpc-testing-secrets/grpc_kokoro_performance_ssh_keys/id_rsa ~/.ssh
echo -e 'Host grpc-kokoro-performance*\n\tStrictHostKeyChecking no' >> ~/.ssh/config
chmod 600 ~/.ssh/id_rsa ~/.ssh/config
git submodule update --init

@ -0,0 +1,55 @@
#!/usr/bin/env bash
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
# A temporary solution to give Kokoro credentials.
# The file name 4321_grpc-testing-service needs to match auth_credential in
# the build config.
mkdir -p ${KOKORO_KEYSTORE_DIR}
cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service
mkdir -p /tmpfs/tmp/bazel-canary
ln -f "${KOKORO_GFILE_DIR}/bazel-canary" /tmpfs/tmp/bazel-canary/bazel
chmod 755 "${KOKORO_GFILE_DIR}/bazel-canary"
export PATH="/tmpfs/tmp/bazel-canary:${PATH}"
# This should show /tmpfs/tmp/bazel-canary/bazel
which bazel
chmod +x "${KOKORO_GFILE_DIR}/bazel_wrapper.py"
# change to grpc repo root
cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
"${KOKORO_GFILE_DIR}/bazel_wrapper.py" \
--host_jvm_args=-Dbazel.DigestFunction=SHA1 \
test --jobs="50" \
--test_timeout="300,450,1200,3600" \
--test_output=errors \
--verbose_failures=true \
--keep_going \
--remote_accept_cached=true \
--spawn_strategy=remote \
--remote_local_fallback=false \
--remote_timeout=3600 \
--strategy=Javac=remote \
--strategy=Closure=remote \
--genrule_strategy=remote \
--experimental_strict_action_env=true \
--experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a" }' \
--crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \
--define GRPC_PORT_ISOLATED_RUNTIME=1 \
-- //test/...

@ -0,0 +1,25 @@
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Config file for the internal CI (in protobuf text format)
# Location of the continuous shell script in repository.
build_file: "grpc/tools/internal_ci/linux/grpc_full_performance_master.sh"
timeout_mins: 600
action {
define_artifacts {
regex: "**/*sponge_log.xml"
regex: "**/perf_reports/**"
}
}

@ -0,0 +1,59 @@
#!/usr/bin/env bash
# Copyright 2017 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
# Enter the gRPC repo root
cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_perf_multilang_rc
# run 8core client vs 8core server
tools/run_tests/run_performance_tests.py \
-l c++ csharp ruby java python go php7 php7_protobuf_c \
--netperf \
--category scalable \
--remote_worker_host grpc-kokoro-performance-server-8core grpc-kokoro-performance-client-8core grpc-kokoro-performance-client2-8core \
-u kbuilder \
--bq_result_table performance_test.kokoro_performance_experiment \
--xml_report reports/8core/sponge_log.xml \
|| EXIT_CODE=1
# prevent pushing leftover build files to remote hosts in the next step.
git clean -fdxq -e reports
# scalability with 32cores (and upload to a different BQ table)
tools/run_tests/run_performance_tests.py \
-l c++ java csharp go \
--netperf \
--category scalable \
--remote_worker_host grpc-kokoro-performance-server-32core grpc-kokoro-performance-client-32core grpc-kokoro-performance-client2-32core \
-u kbuilder \
--bq_result_table performance_test.kokoro_performance_experiment_32core \
--xml_report reports/32core/sponge_log.xml \
|| EXIT_CODE=1
# prevent pushing leftover build files to remote hosts in the next step.
git clean -fdxq -e reports
# selected scenarios on Windows
tools/run_tests/run_performance_tests.py \
-l csharp \
--category scalable \
--remote_worker_host grpc-kokoro-performance-windows1 grpc-kokoro-performance-windows2 \
--bq_result_table performance_test.kokoro_performance_experiment_windows \
--xml_report reports/windows/sponge_log.xml \
|| EXIT_CODE=1
exit $EXIT_CODE

@ -71,23 +71,6 @@ LANG_RELEASE_MATRIX = {
'v1.7.0', 'v1.7.0',
'v1.8.0', 'v1.8.0',
], ],
'python': [
'v1.0.x',
'v1.1.4',
'v1.2.5',
'v1.3.9',
'v1.4.2',
'v1.6.6',
],
'python': [
'v1.0.x',
'v1.1.4',
'v1.2.5',
'v1.3.9',
'v1.4.2',
'v1.6.6',
'v1.7.2',
],
'python': [ 'python': [
'v1.0.x', 'v1.0.x',
'v1.1.4', 'v1.1.4',

@ -49,7 +49,8 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={},
def create_jobspec(name, cmdline, environ=None, shell=False, def create_jobspec(name, cmdline, environ=None, shell=False,
flake_retries=0, timeout_retries=0, flake_retries=0, timeout_retries=0,
use_workspace=False): use_workspace=False,
timeout_seconds=10*60):
"""Creates jobspec.""" """Creates jobspec."""
environ = environ.copy() environ = environ.copy()
if use_workspace: if use_workspace:
@ -60,7 +61,7 @@ def create_jobspec(name, cmdline, environ=None, shell=False,
cmdline=cmdline, cmdline=cmdline,
environ=environ, environ=environ,
shortname='distribtest.%s' % (name), shortname='distribtest.%s' % (name),
timeout_seconds=10*60, timeout_seconds=timeout_seconds,
flake_retries=flake_retries, flake_retries=flake_retries,
timeout_retries=timeout_retries, timeout_retries=timeout_retries,
shell=shell) shell=shell)
@ -214,7 +215,10 @@ class CppDistribTest(object):
"""Tests Cpp make intall by building examples.""" """Tests Cpp make intall by building examples."""
def __init__(self, platform, arch, docker_suffix=None, testcase=None): def __init__(self, platform, arch, docker_suffix=None, testcase=None):
self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, testcase) if platform == 'linux':
self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, testcase)
else:
self.name = 'cpp_%s_%s_%s' % (platform, arch, testcase)
self.platform = platform self.platform = platform
self.arch = arch self.arch = arch
self.docker_suffix = docker_suffix self.docker_suffix = docker_suffix
@ -231,6 +235,12 @@ class CppDistribTest(object):
self.docker_suffix, self.docker_suffix,
self.arch), self.arch),
'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase) 'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase)
elif self.platform == 'windows':
return create_jobspec(self.name,
['test\\distrib\\cpp\\run_distrib_test_%s.bat' % self.testcase],
environ={},
timeout_seconds=30*60,
use_workspace=True)
else: else:
raise Exception("Not supported yet.") raise Exception("Not supported yet.")
@ -242,6 +252,7 @@ def targets():
"""Gets list of supported targets""" """Gets list of supported targets"""
return [CppDistribTest('linux', 'x64', 'jessie', 'routeguide'), return [CppDistribTest('linux', 'x64', 'jessie', 'routeguide'),
CppDistribTest('linux', 'x64', 'jessie', 'cmake'), CppDistribTest('linux', 'x64', 'jessie', 'cmake'),
CppDistribTest('windows', 'x86', testcase='cmake'),
CSharpDistribTest('linux', 'x64', 'wheezy'), CSharpDistribTest('linux', 'x64', 'wheezy'),
CSharpDistribTest('linux', 'x64', 'jessie'), CSharpDistribTest('linux', 'x64', 'jessie'),
CSharpDistribTest('linux', 'x86', 'jessie'), CSharpDistribTest('linux', 'x86', 'jessie'),

@ -703,21 +703,6 @@
"third_party": false, "third_party": false,
"type": "target" "type": "target"
}, },
{
"deps": [
"gpr",
"gpr_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c",
"name": "gpr_histogram_test",
"src": [
"test/core/support/histogram_test.cc"
],
"third_party": false,
"type": "target"
},
{ {
"deps": [ "deps": [
"gpr", "gpr",
@ -1242,6 +1227,21 @@
"third_party": false, "third_party": false,
"type": "target" "type": "target"
}, },
{
"deps": [
"gpr",
"grpc_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c",
"name": "histogram_test",
"src": [
"test/core/util/histogram_test.cc"
],
"third_party": false,
"type": "target"
},
{ {
"deps": [ "deps": [
"gpr", "gpr",
@ -7766,7 +7766,6 @@
"src/core/lib/support/env_posix.cc", "src/core/lib/support/env_posix.cc",
"src/core/lib/support/env_windows.cc", "src/core/lib/support/env_windows.cc",
"src/core/lib/support/fork.cc", "src/core/lib/support/fork.cc",
"src/core/lib/support/histogram.cc",
"src/core/lib/support/host_port.cc", "src/core/lib/support/host_port.cc",
"src/core/lib/support/log.cc", "src/core/lib/support/log.cc",
"src/core/lib/support/log_android.cc", "src/core/lib/support/log_android.cc",
@ -7813,7 +7812,6 @@
"include/grpc/support/avl.h", "include/grpc/support/avl.h",
"include/grpc/support/cmdline.h", "include/grpc/support/cmdline.h",
"include/grpc/support/cpu.h", "include/grpc/support/cpu.h",
"include/grpc/support/histogram.h",
"include/grpc/support/host_port.h", "include/grpc/support/host_port.h",
"include/grpc/support/log.h", "include/grpc/support/log.h",
"include/grpc/support/log_windows.h", "include/grpc/support/log_windows.h",
@ -7863,7 +7861,6 @@
"include/grpc/support/avl.h", "include/grpc/support/avl.h",
"include/grpc/support/cmdline.h", "include/grpc/support/cmdline.h",
"include/grpc/support/cpu.h", "include/grpc/support/cpu.h",
"include/grpc/support/histogram.h",
"include/grpc/support/host_port.h", "include/grpc/support/host_port.h",
"include/grpc/support/log.h", "include/grpc/support/log.h",
"include/grpc/support/log_windows.h", "include/grpc/support/log_windows.h",
@ -8928,6 +8925,7 @@
"test/core/iomgr/endpoint_tests.h", "test/core/iomgr/endpoint_tests.h",
"test/core/util/debugger_macros.h", "test/core/util/debugger_macros.h",
"test/core/util/grpc_profiler.h", "test/core/util/grpc_profiler.h",
"test/core/util/histogram.h",
"test/core/util/memory_counters.h", "test/core/util/memory_counters.h",
"test/core/util/mock_endpoint.h", "test/core/util/mock_endpoint.h",
"test/core/util/parse_hexstring.h", "test/core/util/parse_hexstring.h",
@ -8956,6 +8954,8 @@
"test/core/util/debugger_macros.h", "test/core/util/debugger_macros.h",
"test/core/util/grpc_profiler.cc", "test/core/util/grpc_profiler.cc",
"test/core/util/grpc_profiler.h", "test/core/util/grpc_profiler.h",
"test/core/util/histogram.cc",
"test/core/util/histogram.h",
"test/core/util/memory_counters.cc", "test/core/util/memory_counters.cc",
"test/core/util/memory_counters.h", "test/core/util/memory_counters.h",
"test/core/util/mock_endpoint.cc", "test/core/util/mock_endpoint.cc",
@ -8966,6 +8966,7 @@
"test/core/util/passthru_endpoint.h", "test/core/util/passthru_endpoint.h",
"test/core/util/port.cc", "test/core/util/port.cc",
"test/core/util/port.h", "test/core/util/port.h",
"test/core/util/port_isolated_runtime_environment.cc",
"test/core/util/port_server_client.cc", "test/core/util/port_server_client.cc",
"test/core/util/port_server_client.h", "test/core/util/port_server_client.h",
"test/core/util/slice_splitter.cc", "test/core/util/slice_splitter.cc",

@ -839,30 +839,6 @@
], ],
"uses_polling": false "uses_polling": false
}, },
{
"args": [],
"benchmark": false,
"ci_platforms": [
"linux",
"mac",
"posix",
"windows"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"gtest": false,
"language": "c",
"name": "gpr_histogram_test",
"platforms": [
"linux",
"mac",
"posix",
"windows"
],
"uses_polling": false
},
{ {
"args": [], "args": [],
"benchmark": false, "benchmark": false,
@ -1523,6 +1499,30 @@
], ],
"uses_polling": true "uses_polling": true
}, },
{
"args": [],
"benchmark": false,
"ci_platforms": [
"linux",
"mac",
"posix",
"windows"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"gtest": false,
"language": "c",
"name": "histogram_test",
"platforms": [
"linux",
"mac",
"posix",
"windows"
],
"uses_polling": false
},
{ {
"args": [], "args": [],
"benchmark": false, "benchmark": false,

@ -196,7 +196,7 @@ def archive_repo(languages):
def prepare_remote_hosts(hosts, prepare_local=False): def prepare_remote_hosts(hosts, prepare_local=False):
"""Prepares remote hosts (and maybe prepare localhost as well).""" """Prepares remote hosts (and maybe prepare localhost as well)."""
prepare_timeout = 5*60 prepare_timeout = 10*60
prepare_jobs = [] prepare_jobs = []
for host in hosts: for host in hosts:
user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host)
@ -229,6 +229,8 @@ def prepare_remote_hosts(hosts, prepare_local=False):
def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), build_local=False): def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), build_local=False):
"""Builds performance worker on remote hosts (and maybe also locally).""" """Builds performance worker on remote hosts (and maybe also locally)."""
build_timeout = 15*60 build_timeout = 15*60
# Kokoro VMs (which are local only) do not have caching, so they need more time to build
local_build_timeout = 30*60
build_jobs = [] build_jobs = []
for host in hosts: for host in hosts:
user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host)
@ -245,7 +247,7 @@ def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), bui
cmdline=['tools/run_tests/performance/build_performance.sh'] + languages, cmdline=['tools/run_tests/performance/build_performance.sh'] + languages,
shortname='local_build', shortname='local_build',
environ = {'CONFIG': 'opt'}, environ = {'CONFIG': 'opt'},
timeout_seconds=build_timeout)) timeout_seconds=local_build_timeout))
jobset.message('START', 'Building.', do_newline=True) jobset.message('START', 'Building.', do_newline=True)
num_failures, _ = jobset.run( num_failures, _ = jobset.run(
build_jobs, newline_on_success=True, maxjobs=10) build_jobs, newline_on_success=True, maxjobs=10)
@ -483,9 +485,15 @@ def main():
'generating flamegraphs (e.g., "--perf_args=stat ...")')) 'generating flamegraphs (e.g., "--perf_args=stat ...")'))
argp.add_argument('-f', '--flame_graph_reports', default='perf_reports', type=str, argp.add_argument('-f', '--flame_graph_reports', default='perf_reports', type=str,
help='Name of directory to output flame graph profiles to, if any are created.') help='Name of directory to output flame graph profiles to, if any are created.')
argp.add_argument('-u', '--remote_host_username', default='', type=str,
help='Use a username that isn\'t "Jenkins" to SSH into remote workers.')
args = argp.parse_args() args = argp.parse_args()
global _REMOTE_HOST_USERNAME
if args.remote_host_username:
_REMOTE_HOST_USERNAME = args.remote_host_username
languages = set(scenario_config.LANGUAGES[l] languages = set(scenario_config.LANGUAGES[l]
for l in itertools.chain.from_iterable( for l in itertools.chain.from_iterable(
six.iterkeys(scenario_config.LANGUAGES) if x == 'all' six.iterkeys(scenario_config.LANGUAGES) if x == 'all'

Loading…
Cancel
Save