Merge branch 'master' into poll_stat

pull/11000/head
Yuxuan Li 8 years ago
commit a7f7fcf94a
  1. 31
      .github/ISSUE_TEMPLATE.md
  2. 4
      Makefile
  3. 2
      Rakefile
  4. 38
      binding.gyp
  5. 10
      build.yaml
  6. 3
      include/grpc/impl/codegen/grpc_types.h
  7. 2
      include/grpc/impl/codegen/port_platform.h
  8. 3
      package.json
  9. 6
      setup.py
  10. 6
      src/compiler/cpp_generator.cc
  11. 114
      src/core/ext/filters/client_channel/client_channel.c
  12. 2
      src/core/ext/filters/client_channel/lb_policy.h
  13. 20
      src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c
  14. 47
      src/core/ext/transport/chttp2/transport/chttp2_transport.c
  15. 11
      src/core/ext/transport/chttp2/transport/internal.h
  16. 7
      src/core/ext/transport/chttp2/transport/parsing.c
  17. 36
      src/core/ext/transport/chttp2/transport/writing.c
  18. 4
      src/core/ext/transport/cronet/transport/cronet_transport.c
  19. 2
      src/core/lib/http/httpcli.c
  20. 1
      src/core/lib/iomgr/port.h
  21. 8
      src/core/lib/support/cpu_linux.c
  22. 4
      src/core/lib/support/wrap_memcpy.c
  23. 19
      src/core/lib/transport/bdp_estimator.c
  24. 3
      src/core/lib/transport/bdp_estimator.h
  25. 1
      src/node/ext/call.cc
  26. 1
      src/node/ext/channel.cc
  27. 4
      src/node/ext/completion_queue.cc
  28. 86
      src/node/ext/completion_queue_async_worker.h
  29. 180
      src/node/ext/completion_queue_threadpool.cc
  30. 5
      src/node/ext/node_grpc.cc
  31. 59
      src/node/ext/server.cc
  32. 75
      src/node/ext/server_generic.cc
  33. 120
      src/node/ext/server_uv.cc
  34. 3
      src/proto/grpc/testing/control.proto
  35. 17
      src/proto/grpc/testing/services.proto
  36. 406
      src/python/grpcio/grpc/__init__.py
  37. 11
      src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi
  38. 22
      src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
  39. 2
      src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi
  40. 37
      templates/binding.gyp.template
  41. 3
      templates/package.json.template
  42. 45
      test/core/end2end/cq_verifier.c
  43. 15
      test/core/transport/bdp_estimator_test.c
  44. 27
      test/core/util/trickle_endpoint.c
  45. 2
      test/core/util/trickle_endpoint.h
  46. 4
      test/cpp/client/credentials_test.cc
  47. 6
      test/cpp/codegen/compiler_test_golden
  48. 2
      test/cpp/end2end/grpclb_end2end_test.cc
  49. 2
      test/cpp/microbenchmarks/BUILD
  50. 156
      test/cpp/microbenchmarks/bm_fullstack_trickle.cc
  51. 7
      test/cpp/qps/client.h
  52. 296
      test/cpp/qps/client_async.cc
  53. 220
      test/cpp/qps/client_sync.cc
  54. 12
      test/cpp/qps/qps_worker.cc
  55. 190
      test/cpp/qps/server_async.cc
  56. 111
      test/cpp/qps/server_sync.cc
  57. 2
      test/cpp/util/cli_call.cc
  58. 10
      third_party/cares/ares_build.h
  59. 39
      tools/internal_ci/linux/grpc_fuzzer_api.cfg
  60. 41
      tools/internal_ci/linux/grpc_fuzzer_api.sh
  61. 39
      tools/internal_ci/linux/grpc_fuzzer_client.cfg
  62. 41
      tools/internal_ci/linux/grpc_fuzzer_client.sh
  63. 39
      tools/internal_ci/linux/grpc_fuzzer_hpack_parser.cfg
  64. 41
      tools/internal_ci/linux/grpc_fuzzer_hpack_parser.sh
  65. 39
      tools/internal_ci/linux/grpc_fuzzer_http_request.cfg
  66. 41
      tools/internal_ci/linux/grpc_fuzzer_http_request.sh
  67. 39
      tools/internal_ci/linux/grpc_fuzzer_json.cfg
  68. 41
      tools/internal_ci/linux/grpc_fuzzer_json.sh
  69. 39
      tools/internal_ci/linux/grpc_fuzzer_nanopb_response.cfg
  70. 40
      tools/internal_ci/linux/grpc_fuzzer_nanopb_response.sh
  71. 39
      tools/internal_ci/linux/grpc_fuzzer_server.cfg
  72. 41
      tools/internal_ci/linux/grpc_fuzzer_server.sh
  73. 39
      tools/internal_ci/linux/grpc_fuzzer_uri.cfg
  74. 40
      tools/internal_ci/linux/grpc_fuzzer_uri.sh
  75. 4
      tools/internal_ci/linux/grpc_master.sh
  76. 2
      tools/internal_ci/linux/grpc_portability.sh
  77. 2
      tools/internal_ci/linux/sanitizer/grpc_c_asan.sh
  78. 2
      tools/internal_ci/linux/sanitizer/grpc_c_msan.sh
  79. 2
      tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh
  80. 2
      tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh
  81. 2
      tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh
  82. 4
      tools/profiling/microbenchmarks/bm_diff.py
  83. 2
      tools/run_tests/README.md
  84. 2
      tools/run_tests/artifacts/build_artifact_node.sh
  85. 1282
      tools/run_tests/generated/tests.json
  86. 4
      tools/run_tests/helper_scripts/build_node.sh
  87. 3
      tools/run_tests/performance/build_performance.sh
  88. 2
      tools/run_tests/performance/scenario_config.py
  89. 66
      tools/run_tests/python_utils/port_server.py
  90. 13
      tools/run_tests/python_utils/report_utils.py
  91. 25
      tools/run_tests/python_utils/start_port_server.py
  92. 8
      tools/run_tests/run_tests.py
  93. 11
      tools/run_tests/run_tests_matrix.py
  94. 6
      tools/run_tests/start_port_server.py

@ -0,0 +1,31 @@
Please answer these questions before submitting your issue.
### Should this be an issue in the gRPC issue tracker?
Create new issues for bugs and feature requests. An issue needs to be actionable. General gRPC discussions and usage questions belong to:
- [grpc.io mailing list](https://groups.google.com/forum/#!forum/grpc-io)
- [StackOverflow, with `grpc` tag](http://stackoverflow.com/questions/tagged/grpc)
*Please don't double post your questions in more locations, we are monitoring both channels and the time spent de-duplicating questions can is better spent answering more user questions.*
### What version of gRPC and what language are you using?
### What operating system (Linux, Windows, …) and version?
### What runtime / compiler are you using (e.g. python version or version of gcc)
### What did you do?
If possible, provide a recipe for reproducing the error. Try being specific and include code snippets if helpful.
### What did you expect to see?
### What did you see instead?
Make sure you include information that can help us debug (full error message, exception listing, stack trace, logs).
### Anything else we should know about your project / environment?

@ -8279,8 +8279,8 @@ PUBLIC_HEADERS_C += \
LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC)))) LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC))))
$(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) -fvisibility=hidden -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H $(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) -fvisibility=hidden -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion -Wno-invalid-source-encoding $(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
$(LIBDIR)/$(CONFIG)/libares.a: $(ZLIB_DEP) $(LIBARES_OBJS) $(LIBDIR)/$(CONFIG)/libares.a: $(ZLIB_DEP) $(LIBARES_OBJS)
$(E) "[AR] Creating $@" $(E) "[AR] Creating $@"

@ -80,7 +80,7 @@ task 'dlls' do
grpc_config = ENV['GRPC_CONFIG'] || 'opt' grpc_config = ENV['GRPC_CONFIG'] || 'opt'
verbose = ENV['V'] || '0' verbose = ENV['V'] || '0'
env = 'CPPFLAGS="-D_WIN32_WINNT=0x600 -DUNICODE -D_UNICODE -Wno-unused-variable -Wno-unused-result" ' env = 'CPPFLAGS="-D_WIN32_WINNT=0x600 -DUNICODE -D_UNICODE -Wno-unused-variable -Wno-unused-result -DCARES_STATICLIB" '
env += 'LDFLAGS=-static ' env += 'LDFLAGS=-static '
env += 'SYSTEM=MINGW32 ' env += 'SYSTEM=MINGW32 '
env += 'EMBED_ZLIB=true ' env += 'EMBED_ZLIB=true '

@ -39,15 +39,16 @@
{ {
'variables': { 'variables': {
'runtime%': 'node', 'runtime%': 'node',
# UV integration in C core is enabled by default. It can be disabled
# by setting this argument to anything else.
'grpc_uv%': 'true',
# Some Node installations use the system installation of OpenSSL, and on # Some Node installations use the system installation of OpenSSL, and on
# some systems, the system OpenSSL still does not have ALPN support. This # some systems, the system OpenSSL still does not have ALPN support. This
# will let users recompile gRPC to work without ALPN. # will let users recompile gRPC to work without ALPN.
'grpc_alpn%': 'true', 'grpc_alpn%': 'true',
# Indicates that the library should be built with gcov. # Indicates that the library should be built with gcov.
'grpc_gcov%': 'false' 'grpc_gcov%': 'false',
# Indicates that the library should be built with compatibility for musl
# libc, so that it can run on Alpine Linux. This is only necessary if not
# building on Alpine Linux
'grpc_alpine%': 'false'
}, },
'target_defaults': { 'target_defaults': {
'configurations': { 'configurations': {
@ -86,17 +87,11 @@
'include' 'include'
], ],
'defines': [ 'defines': [
'GPR_BACKWARDS_COMPATIBILITY_MODE' 'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0',
'GRPC_UV'
], ],
'conditions': [ 'conditions': [
['grpc_uv=="true"', {
'defines': [
'GRPC_ARES=0',
# Disabling this while bugs are ironed out. Uncomment this to
# re-enable libuv integration in C core.
'GRPC_UV'
]
}],
['grpc_gcov=="true"', { ['grpc_gcov=="true"', {
'cflags': [ 'cflags': [
'-O0', '-O0',
@ -115,6 +110,11 @@
'-rdynamic', '-rdynamic',
], ],
}], }],
['grpc_alpine=="true"', {
'defines': [
'GPR_MUSL_LIBC_COMPAT'
]
}],
['OS!="win" and runtime=="electron"', { ['OS!="win" and runtime=="electron"', {
"defines": [ "defines": [
'OPENSSL_NO_THREADS' 'OPENSSL_NO_THREADS'
@ -535,6 +535,10 @@
} }
] ]
}, },
]
}],
['OS == "win"', {
'targets': [
# Only want to compile zlib under Windows # Only want to compile zlib under Windows
{ {
'cflags': [ 'cflags': [
@ -569,7 +573,6 @@
}] }]
], ],
'targets': [ 'targets': [
{ {
'cflags': [ 'cflags': [
'-std=c99', '-std=c99',
@ -648,7 +651,6 @@
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'gpr', 'gpr',
'node_modules/cares/deps/cares/cares.gyp:cares',
], ],
'sources': [ 'sources': [
'src/core/lib/surface/init.c', 'src/core/lib/surface/init.c',
@ -942,20 +944,16 @@
"src/node/ext/call_credentials.cc", "src/node/ext/call_credentials.cc",
"src/node/ext/channel.cc", "src/node/ext/channel.cc",
"src/node/ext/channel_credentials.cc", "src/node/ext/channel_credentials.cc",
"src/node/ext/completion_queue_threadpool.cc", "src/node/ext/completion_queue.cc",
"src/node/ext/completion_queue_uv.cc",
"src/node/ext/node_grpc.cc", "src/node/ext/node_grpc.cc",
"src/node/ext/server.cc", "src/node/ext/server.cc",
"src/node/ext/server_credentials.cc", "src/node/ext/server_credentials.cc",
"src/node/ext/server_generic.cc",
"src/node/ext/server_uv.cc",
"src/node/ext/slice.cc", "src/node/ext/slice.cc",
"src/node/ext/timeval.cc", "src/node/ext/timeval.cc",
], ],
"dependencies": [ "dependencies": [
"grpc", "grpc",
"gpr", "gpr",
"node_modules/cares/deps/cares/cares.gyp:cares",
] ]
}, },
{ {

@ -4512,10 +4512,11 @@ configs:
UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=tools/ubsan_suppressions.txt UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=tools/ubsan_suppressions.txt
defaults: defaults:
ares: ares:
CFLAGS: -Wno-sign-conversion -Wno-invalid-source-encoding CFLAGS: -Wno-sign-conversion $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
CPPFLAGS: -Ithird_party/cares -Ithird_party/cares/cares $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) CPPFLAGS: -Ithird_party/cares -Ithird_party/cares/cares $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux)
$(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) -fvisibility=hidden $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) -fvisibility=hidden
-D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst
MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
benchmark: benchmark:
CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
boringssl: boringssl:
@ -4561,13 +4562,10 @@ node_modules:
- src/node/ext/call_credentials.cc - src/node/ext/call_credentials.cc
- src/node/ext/channel.cc - src/node/ext/channel.cc
- src/node/ext/channel_credentials.cc - src/node/ext/channel_credentials.cc
- src/node/ext/completion_queue_threadpool.cc - src/node/ext/completion_queue.cc
- src/node/ext/completion_queue_uv.cc
- src/node/ext/node_grpc.cc - src/node/ext/node_grpc.cc
- src/node/ext/server.cc - src/node/ext/server.cc
- src/node/ext/server_credentials.cc - src/node/ext/server_credentials.cc
- src/node/ext/server_generic.cc
- src/node/ext/server_uv.cc
- src/node/ext/slice.cc - src/node/ext/slice.cc
- src/node/ext/timeval.cc - src/node/ext/timeval.cc
openssl_fallback: openssl_fallback:

@ -293,6 +293,9 @@ each time recvmsg (or equivalent) is called */
"grpc.experimental.tcp_min_read_chunk_size" "grpc.experimental.tcp_min_read_chunk_size"
#define GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE \ #define GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE \
"grpc.experimental.tcp_max_read_chunk_size" "grpc.experimental.tcp_max_read_chunk_size"
/* Timeout in milliseconds to use for calls to the grpclb load balancer.
If 0 or unset, the balancer calls will have no deadline. */
#define GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS "grpc.grpclb_timeout_ms"
/** \} */ /** \} */
/** Result of a grpc call. If the caller satisfies the prerequisites of a /** Result of a grpc call. If the caller satisfies the prerequisites of a

@ -189,7 +189,7 @@
#ifdef __GLIBC__ #ifdef __GLIBC__
#define GPR_POSIX_CRASH_HANDLER 1 #define GPR_POSIX_CRASH_HANDLER 1
#else /* musl libc */ #else /* musl libc */
#define GRPC_MSG_IOVLEN_TYPE int #define GPR_MUSL_LIBC_COMPAT 1
#endif #endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <Availability.h> #include <Availability.h>

@ -34,8 +34,7 @@
"lodash": "^4.15.0", "lodash": "^4.15.0",
"nan": "^2.0.0", "nan": "^2.0.0",
"node-pre-gyp": "^0.6.0", "node-pre-gyp": "^0.6.0",
"protobufjs": "^6.7.0", "protobufjs": "^6.7.0"
"cares": "^1.1.5"
}, },
"devDependencies": { "devDependencies": {
"async": "^2.0.1", "async": "^2.0.1",

@ -144,6 +144,8 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._cython.cygrpc',)
CYTHON_HELPER_C_FILES = () CYTHON_HELPER_C_FILES = ()
CORE_C_FILES = tuple(grpc_core_dependencies.CORE_SOURCE_FILES) CORE_C_FILES = tuple(grpc_core_dependencies.CORE_SOURCE_FILES)
if "win32" in sys.platform and "64bit" in platform.architecture()[0]:
CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
EXTENSION_INCLUDE_DIRECTORIES = ( EXTENSION_INCLUDE_DIRECTORIES = (
(PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE + (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE +
@ -163,7 +165,9 @@ DEFINE_MACROS = (
if "win32" in sys.platform: if "win32" in sys.platform:
DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1), ('CARES_STATICLIB', 1),) DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1), ('CARES_STATICLIB', 1),)
if '64bit' in platform.architecture()[0]: if '64bit' in platform.architecture()[0]:
DEFINE_MACROS += (('MS_WIN64', 1),) # TODO(zyc): Re-enble c-ares on x64 windows after fixing the
# ares_library_init compilation issue
DEFINE_MACROS += (('MS_WIN64', 1), ('GRPC_ARES', 0),)
elif sys.version_info >= (3, 5): elif sys.version_info >= (3, 5):
# For some reason, this is needed to get access to inet_pton/inet_ntop # For some reason, this is needed to get access to inet_pton/inet_ntop
# on msvc, but only for 32 bits # on msvc, but only for 32 bits

@ -804,6 +804,12 @@ void PrintHeaderService(grpc_generator::Printer *printer,
" public:\n"); " public:\n");
printer->Indent(); printer->Indent();
// Service metadata
printer->Print(*vars,
"static constexpr char const* service_full_name() {\n"
" return \"$Package$$Service$\";\n"
"}\n");
// Client side // Client side
printer->Print( printer->Print(
"class StubInterface {\n" "class StubInterface {\n"

@ -760,12 +760,6 @@ static void cc_destroy_channel_elem(grpc_exec_ctx *exec_ctx,
#define CANCELLED_CALL ((grpc_subchannel_call *)1) #define CANCELLED_CALL ((grpc_subchannel_call *)1)
typedef enum {
/* zero so that it can be default-initialized */
GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING = 0,
GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL
} subchannel_creation_phase;
/** Call data. Holds a pointer to grpc_subchannel_call and the /** Call data. Holds a pointer to grpc_subchannel_call and the
associated machinery to create such a pointer. associated machinery to create such a pointer.
Handles queueing of stream ops until a call object is ready, waiting Handles queueing of stream ops until a call object is ready, waiting
@ -793,7 +787,7 @@ typedef struct client_channel_call_data {
gpr_atm subchannel_call; gpr_atm subchannel_call;
gpr_arena *arena; gpr_arena *arena;
subchannel_creation_phase creation_phase; bool pick_pending;
grpc_connected_subchannel *connected_subchannel; grpc_connected_subchannel *connected_subchannel;
grpc_call_context_element subchannel_call_context[GRPC_CONTEXT_COUNT]; grpc_call_context_element subchannel_call_context[GRPC_CONTEXT_COUNT];
grpc_polling_entity *pollent; grpc_polling_entity *pollent;
@ -915,11 +909,10 @@ static void subchannel_ready_locked(grpc_exec_ctx *exec_ctx, void *arg,
grpc_call_element *elem = arg; grpc_call_element *elem = arg;
call_data *calld = elem->call_data; call_data *calld = elem->call_data;
channel_data *chand = elem->channel_data; channel_data *chand = elem->channel_data;
GPR_ASSERT(calld->creation_phase == GPR_ASSERT(calld->pick_pending);
GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL); calld->pick_pending = false;
grpc_polling_entity_del_from_pollset_set(exec_ctx, calld->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, calld->pollent,
chand->interested_parties); chand->interested_parties);
calld->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING;
if (calld->connected_subchannel == NULL) { if (calld->connected_subchannel == NULL) {
gpr_atm_no_barrier_store(&calld->subchannel_call, 1); gpr_atm_no_barrier_store(&calld->subchannel_call, 1);
fail_locked(exec_ctx, calld, fail_locked(exec_ctx, calld,
@ -988,8 +981,7 @@ static bool pick_subchannel_locked(
grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
grpc_metadata_batch *initial_metadata, uint32_t initial_metadata_flags, grpc_metadata_batch *initial_metadata, uint32_t initial_metadata_flags,
grpc_connected_subchannel **connected_subchannel, grpc_connected_subchannel **connected_subchannel,
grpc_call_context_element *subchannel_call_context, grpc_closure *on_ready, grpc_call_context_element *subchannel_call_context, grpc_closure *on_ready);
grpc_error *error);
static void continue_picking_locked(grpc_exec_ctx *exec_ctx, void *arg, static void continue_picking_locked(grpc_exec_ctx *exec_ctx, void *arg,
grpc_error *error) { grpc_error *error) {
@ -999,52 +991,51 @@ static void continue_picking_locked(grpc_exec_ctx *exec_ctx, void *arg,
} else if (error != GRPC_ERROR_NONE) { } else if (error != GRPC_ERROR_NONE) {
grpc_closure_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_REF(error)); grpc_closure_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_REF(error));
} else { } else {
if (pick_subchannel_locked( if (pick_subchannel_locked(exec_ctx, cpa->elem, cpa->initial_metadata,
exec_ctx, cpa->elem, cpa->initial_metadata, cpa->initial_metadata_flags,
cpa->initial_metadata_flags, cpa->connected_subchannel, cpa->connected_subchannel,
cpa->subchannel_call_context, cpa->on_ready, GRPC_ERROR_NONE)) { cpa->subchannel_call_context, cpa->on_ready)) {
grpc_closure_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_NONE); grpc_closure_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_NONE);
} }
} }
gpr_free(cpa); gpr_free(cpa);
} }
static void cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
grpc_error *error) {
channel_data *chand = elem->channel_data;
call_data *calld = elem->call_data;
if (chand->lb_policy != NULL) {
grpc_lb_policy_cancel_pick_locked(exec_ctx, chand->lb_policy,
&calld->connected_subchannel,
GRPC_ERROR_REF(error));
}
for (grpc_closure *closure = chand->waiting_for_config_closures.head;
closure != NULL; closure = closure->next_data.next) {
continue_picking_args *cpa = closure->cb_arg;
if (cpa->connected_subchannel == &calld->connected_subchannel) {
cpa->connected_subchannel = NULL;
grpc_closure_sched(exec_ctx, cpa->on_ready,
GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
"Pick cancelled", &error, 1));
}
}
GRPC_ERROR_UNREF(error);
}
static bool pick_subchannel_locked( static bool pick_subchannel_locked(
grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
grpc_metadata_batch *initial_metadata, uint32_t initial_metadata_flags, grpc_metadata_batch *initial_metadata, uint32_t initial_metadata_flags,
grpc_connected_subchannel **connected_subchannel, grpc_connected_subchannel **connected_subchannel,
grpc_call_context_element *subchannel_call_context, grpc_closure *on_ready, grpc_call_context_element *subchannel_call_context,
grpc_error *error) { grpc_closure *on_ready) {
GPR_TIMER_BEGIN("pick_subchannel", 0); GPR_TIMER_BEGIN("pick_subchannel", 0);
channel_data *chand = elem->channel_data; channel_data *chand = elem->channel_data;
call_data *calld = elem->call_data; call_data *calld = elem->call_data;
continue_picking_args *cpa;
grpc_closure *closure;
GPR_ASSERT(connected_subchannel); GPR_ASSERT(connected_subchannel);
if (initial_metadata == NULL) {
if (chand->lb_policy != NULL) {
grpc_lb_policy_cancel_pick_locked(exec_ctx, chand->lb_policy,
connected_subchannel,
GRPC_ERROR_REF(error));
}
for (closure = chand->waiting_for_config_closures.head; closure != NULL;
closure = closure->next_data.next) {
cpa = closure->cb_arg;
if (cpa->connected_subchannel == connected_subchannel) {
cpa->connected_subchannel = NULL;
grpc_closure_sched(exec_ctx, cpa->on_ready,
GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(
"Pick cancelled", &error, 1));
}
}
GPR_TIMER_END("pick_subchannel", 0);
GRPC_ERROR_UNREF(error);
return true;
}
GPR_ASSERT(error == GRPC_ERROR_NONE);
if (chand->lb_policy != NULL) { if (chand->lb_policy != NULL) {
apply_final_configuration_locked(exec_ctx, elem); apply_final_configuration_locked(exec_ctx, elem);
grpc_lb_policy *lb_policy = chand->lb_policy; grpc_lb_policy *lb_policy = chand->lb_policy;
@ -1067,8 +1058,7 @@ static bool pick_subchannel_locked(
} }
} }
const grpc_lb_policy_pick_args inputs = { const grpc_lb_policy_pick_args inputs = {
initial_metadata, initial_metadata_flags, &calld->lb_token_mdelem, initial_metadata, initial_metadata_flags, &calld->lb_token_mdelem};
gpr_inf_future(GPR_CLOCK_MONOTONIC)};
// Wrap the user-provided callback in order to hold a strong reference to // Wrap the user-provided callback in order to hold a strong reference to
// the LB policy for the duration of the pick. // the LB policy for the duration of the pick.
@ -1101,7 +1091,7 @@ static bool pick_subchannel_locked(
&chand->on_resolver_result_changed); &chand->on_resolver_result_changed);
} }
if (chand->resolver != NULL) { if (chand->resolver != NULL) {
cpa = gpr_malloc(sizeof(*cpa)); continue_picking_args *cpa = gpr_malloc(sizeof(*cpa));
cpa->initial_metadata = initial_metadata; cpa->initial_metadata = initial_metadata;
cpa->initial_metadata_flags = initial_metadata_flags; cpa->initial_metadata_flags = initial_metadata_flags;
cpa->connected_subchannel = connected_subchannel; cpa->connected_subchannel = connected_subchannel;
@ -1157,16 +1147,13 @@ static void start_transport_stream_op_batch_locked_inner(
error to the caller when the first op does get passed down. */ error to the caller when the first op does get passed down. */
calld->cancel_error = calld->cancel_error =
GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error); GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error);
switch (calld->creation_phase) { if (calld->pick_pending) {
case GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING: cancel_pick_locked(
fail_locked(exec_ctx, calld, exec_ctx, elem,
GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error)); GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error));
break; } else {
case GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL: fail_locked(exec_ctx, calld,
pick_subchannel_locked( GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error));
exec_ctx, elem, NULL, 0, &calld->connected_subchannel, NULL, NULL,
GRPC_ERROR_REF(op->payload->cancel_stream.cancel_error));
break;
} }
grpc_transport_stream_op_batch_finish_with_failure( grpc_transport_stream_op_batch_finish_with_failure(
exec_ctx, op, exec_ctx, op,
@ -1176,9 +1163,9 @@ static void start_transport_stream_op_batch_locked_inner(
} }
} }
/* if we don't have a subchannel, try to get one */ /* if we don't have a subchannel, try to get one */
if (calld->creation_phase == GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING && if (!calld->pick_pending && calld->connected_subchannel == NULL &&
calld->connected_subchannel == NULL && op->send_initial_metadata) { op->send_initial_metadata) {
calld->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL; calld->pick_pending = true;
grpc_closure_init(&calld->next_step, subchannel_ready_locked, elem, grpc_closure_init(&calld->next_step, subchannel_ready_locked, elem,
grpc_combiner_scheduler(chand->combiner, true)); grpc_combiner_scheduler(chand->combiner, true));
GRPC_CALL_STACK_REF(calld->owning_call, "pick_subchannel"); GRPC_CALL_STACK_REF(calld->owning_call, "pick_subchannel");
@ -1190,8 +1177,8 @@ static void start_transport_stream_op_batch_locked_inner(
op->payload->send_initial_metadata.send_initial_metadata, op->payload->send_initial_metadata.send_initial_metadata,
op->payload->send_initial_metadata.send_initial_metadata_flags, op->payload->send_initial_metadata.send_initial_metadata_flags,
&calld->connected_subchannel, calld->subchannel_call_context, &calld->connected_subchannel, calld->subchannel_call_context,
&calld->next_step, GRPC_ERROR_NONE)) { &calld->next_step)) {
calld->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING; calld->pick_pending = false;
GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_subchannel"); GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_subchannel");
} else { } else {
grpc_polling_entity_add_to_pollset_set(exec_ctx, calld->pollent, grpc_polling_entity_add_to_pollset_set(exec_ctx, calld->pollent,
@ -1199,8 +1186,7 @@ static void start_transport_stream_op_batch_locked_inner(
} }
} }
/* if we've got a subchannel, then let's ask it to create a call */ /* if we've got a subchannel, then let's ask it to create a call */
if (calld->creation_phase == GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING && if (!calld->pick_pending && calld->connected_subchannel != NULL) {
calld->connected_subchannel != NULL) {
grpc_subchannel_call *subchannel_call = NULL; grpc_subchannel_call *subchannel_call = NULL;
const grpc_connected_subchannel_call_args call_args = { const grpc_connected_subchannel_call_args call_args = {
.pollent = calld->pollent, .pollent = calld->pollent,
@ -1357,7 +1343,7 @@ static void cc_destroy_call_elem(grpc_exec_ctx *exec_ctx,
then_schedule_closure = NULL; then_schedule_closure = NULL;
GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, call, "client_channel_destroy_call"); GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, call, "client_channel_destroy_call");
} }
GPR_ASSERT(calld->creation_phase == GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING); GPR_ASSERT(!calld->pick_pending);
GPR_ASSERT(calld->waiting_ops_count == 0); GPR_ASSERT(calld->waiting_ops_count == 0);
if (calld->connected_subchannel != NULL) { if (calld->connected_subchannel != NULL) {
GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel, GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel,
@ -1464,12 +1450,12 @@ static void watch_connectivity_state_locked(grpc_exec_ctx *exec_ctx, void *arg,
void grpc_client_channel_watch_connectivity_state( void grpc_client_channel_watch_connectivity_state(
grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, grpc_pollset *pollset, grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, grpc_pollset *pollset,
grpc_connectivity_state *state, grpc_closure *on_complete) { grpc_connectivity_state *state, grpc_closure *closure) {
channel_data *chand = elem->channel_data; channel_data *chand = elem->channel_data;
external_connectivity_watcher *w = gpr_malloc(sizeof(*w)); external_connectivity_watcher *w = gpr_malloc(sizeof(*w));
w->chand = chand; w->chand = chand;
w->pollset = pollset; w->pollset = pollset;
w->on_complete = on_complete; w->on_complete = closure;
w->state = state; w->state = state;
grpc_pollset_set_add_pollset(exec_ctx, chand->interested_parties, pollset); grpc_pollset_set_add_pollset(exec_ctx, chand->interested_parties, pollset);
GRPC_CHANNEL_STACK_REF(w->chand->owning_stack, GRPC_CHANNEL_STACK_REF(w->chand->owning_stack,

@ -62,8 +62,6 @@ typedef struct grpc_lb_policy_pick_args {
uint32_t initial_metadata_flags; uint32_t initial_metadata_flags;
/** Storage for LB token in \a initial_metadata, or NULL if not used */ /** Storage for LB token in \a initial_metadata, or NULL if not used */
grpc_linked_mdelem *lb_token_mdelem_storage; grpc_linked_mdelem *lb_token_mdelem_storage;
/** Deadline for the call to the LB server */
gpr_timespec deadline;
} grpc_lb_policy_pick_args; } grpc_lb_policy_pick_args;
struct grpc_lb_policy_vtable { struct grpc_lb_policy_vtable {

@ -95,8 +95,7 @@
headers. Therefore, sockaddr.h must always be included first */ headers. Therefore, sockaddr.h must always be included first */
#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr.h"
#include <errno.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <grpc/byte_buffer_reader.h> #include <grpc/byte_buffer_reader.h>
@ -310,8 +309,8 @@ typedef struct glb_lb_policy {
grpc_client_channel_factory *cc_factory; grpc_client_channel_factory *cc_factory;
grpc_channel_args *args; grpc_channel_args *args;
/** deadline for the LB's call */ /** timeout in milliseconds for the LB call. 0 means no deadline. */
gpr_timespec deadline; int lb_call_timeout_ms;
/** for communicating with the LB server */ /** for communicating with the LB server */
grpc_channel *lb_channel; grpc_channel *lb_channel;
@ -917,6 +916,10 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
glb_policy->cc_factory = args->client_channel_factory; glb_policy->cc_factory = args->client_channel_factory;
GPR_ASSERT(glb_policy->cc_factory != NULL); GPR_ASSERT(glb_policy->cc_factory != NULL);
arg = grpc_channel_args_find(args->args, GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS);
glb_policy->lb_call_timeout_ms =
grpc_channel_arg_get_integer(arg, (grpc_integer_options){0, 0, INT_MAX});
// Make sure that GRPC_ARG_LB_POLICY_NAME is set in channel args, // Make sure that GRPC_ARG_LB_POLICY_NAME is set in channel args,
// since we use this to trigger the client_load_reporting filter. // since we use this to trigger the client_load_reporting filter.
grpc_arg new_arg; grpc_arg new_arg;
@ -1089,7 +1092,6 @@ static int glb_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
} }
glb_lb_policy *glb_policy = (glb_lb_policy *)pol; glb_lb_policy *glb_policy = (glb_lb_policy *)pol;
glb_policy->deadline = pick_args->deadline;
bool pick_done; bool pick_done;
if (glb_policy->rr_policy != NULL) { if (glb_policy->rr_policy != NULL) {
@ -1275,11 +1277,17 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx,
* glb_policy->base.interested_parties, which is comprised of the polling * glb_policy->base.interested_parties, which is comprised of the polling
* entities from \a client_channel. */ * entities from \a client_channel. */
grpc_slice host = grpc_slice_from_copied_string(glb_policy->server_name); grpc_slice host = grpc_slice_from_copied_string(glb_policy->server_name);
gpr_timespec deadline =
glb_policy->lb_call_timeout_ms == 0
? gpr_inf_future(GPR_CLOCK_MONOTONIC)
: gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
gpr_time_from_millis(glb_policy->lb_call_timeout_ms,
GPR_TIMESPAN));
glb_policy->lb_call = grpc_channel_create_pollset_set_call( glb_policy->lb_call = grpc_channel_create_pollset_set_call(
exec_ctx, glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, exec_ctx, glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS,
glb_policy->base.interested_parties, glb_policy->base.interested_parties,
GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD, GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD,
&host, glb_policy->deadline, NULL); &host, deadline, NULL);
grpc_slice_unref_internal(exec_ctx, host); grpc_slice_unref_internal(exec_ctx, host);
if (glb_policy->client_stats != NULL) { if (glb_policy->client_stats != NULL) {

@ -884,14 +884,23 @@ static void write_action_begin_locked(grpc_exec_ctx *exec_ctx, void *gt,
GPR_TIMER_BEGIN("write_action_begin_locked", 0); GPR_TIMER_BEGIN("write_action_begin_locked", 0);
grpc_chttp2_transport *t = gt; grpc_chttp2_transport *t = gt;
GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE);
if (!t->closed && grpc_chttp2_begin_write(exec_ctx, t)) { switch (t->closed ? GRPC_CHTTP2_NOTHING_TO_WRITE
set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, : grpc_chttp2_begin_write(exec_ctx, t)) {
"begin writing"); case GRPC_CHTTP2_NOTHING_TO_WRITE:
grpc_closure_sched(exec_ctx, &t->write_action, GRPC_ERROR_NONE); set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE,
} else { "begin writing nothing");
set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing");
"begin writing nothing"); break;
GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); case GRPC_CHTTP2_PARTIAL_WRITE:
set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE,
"begin writing partial");
grpc_closure_sched(exec_ctx, &t->write_action, GRPC_ERROR_NONE);
break;
case GRPC_CHTTP2_FULL_WRITE:
set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING,
"begin writing");
grpc_closure_sched(exec_ctx, &t->write_action, GRPC_ERROR_NONE);
break;
} }
GPR_TIMER_END("write_action_begin_locked", 0); GPR_TIMER_END("write_action_begin_locked", 0);
} }
@ -2130,27 +2139,29 @@ static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
double bdp_dbl) { double bdp_dbl) {
uint32_t bdp; int32_t bdp;
if (bdp_dbl <= 0) { const int32_t kMinBDP = 128;
bdp = 0; if (bdp_dbl <= kMinBDP) {
} else if (bdp_dbl > UINT32_MAX) { bdp = kMinBDP;
bdp = UINT32_MAX; } else if (bdp_dbl > INT32_MAX) {
bdp = INT32_MAX;
} else { } else {
bdp = (uint32_t)(bdp_dbl); bdp = (int32_t)(bdp_dbl);
} }
int64_t delta = int64_t delta =
(int64_t)bdp - (int64_t)bdp -
(int64_t)t->settings[GRPC_LOCAL_SETTINGS] (int64_t)t->settings[GRPC_LOCAL_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]; [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE];
if (delta == 0 || (bdp != 0 && delta > -1024 && delta < 1024)) { if (delta == 0 || (delta > -bdp / 10 && delta < bdp / 10)) {
return; return;
} }
if (grpc_bdp_estimator_trace) { if (grpc_bdp_estimator_trace) {
gpr_log(GPR_DEBUG, "%s: update initial window size to %d", t->peer_string, gpr_log(GPR_DEBUG, "%s: update initial window size to %d", t->peer_string,
(int)bdp); (int)bdp);
} }
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, bdp); push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, bdp); (uint32_t)bdp);
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, (uint32_t)bdp);
} }
static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx, static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx,
@ -2543,7 +2554,7 @@ static void incoming_byte_stream_update_flow_control(grpc_exec_ctx *exec_ctx,
add_max_recv_bytes); add_max_recv_bytes);
if ((int64_t)s->incoming_window_delta + (int64_t)initial_window_size - if ((int64_t)s->incoming_window_delta + (int64_t)initial_window_size -
(int64_t)s->announce_window > (int64_t)s->announce_window >
(int64_t)initial_window_size / 2) { 2 * (int64_t)initial_window_size) {
write_type = GRPC_CHTTP2_STREAM_WRITE_PIGGYBACK; write_type = GRPC_CHTTP2_STREAM_WRITE_PIGGYBACK;
} }
grpc_chttp2_become_writable(exec_ctx, t, s, write_type, grpc_chttp2_become_writable(exec_ctx, t, s, write_type,

@ -552,9 +552,14 @@ void grpc_chttp2_initiate_write(grpc_exec_ctx *exec_ctx,
grpc_chttp2_transport *t, grpc_chttp2_transport *t,
bool covered_by_poller, const char *reason); bool covered_by_poller, const char *reason);
/** Someone is unlocking the transport mutex: check to see if writes typedef enum {
are required, and frame them if so */ GRPC_CHTTP2_NOTHING_TO_WRITE,
bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t); GRPC_CHTTP2_PARTIAL_WRITE,
GRPC_CHTTP2_FULL_WRITE,
} grpc_chttp2_begin_write_result;
grpc_chttp2_begin_write_result grpc_chttp2_begin_write(
grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t);
void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
grpc_error *error); grpc_error *error);

@ -418,12 +418,7 @@ static grpc_error *update_incoming_window(grpc_exec_ctx *exec_ctx,
GRPC_CHTTP2_FLOW_DEBIT_STREAM_INCOMING_WINDOW_DELTA("parse", t, s, GRPC_CHTTP2_FLOW_DEBIT_STREAM_INCOMING_WINDOW_DELTA("parse", t, s,
incoming_frame_size); incoming_frame_size);
if ((int64_t)t->settings[GRPC_SENT_SETTINGS] if ((int64_t)s->incoming_window_delta - (int64_t)s->announce_window <= 0) {
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE] +
(int64_t)s->incoming_window_delta - (int64_t)s->announce_window <=
(int64_t)t->settings[GRPC_SENT_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE] /
2) {
grpc_chttp2_become_writable(exec_ctx, t, s, grpc_chttp2_become_writable(exec_ctx, t, s,
GRPC_CHTTP2_STREAM_WRITE_INITIATE_UNCOVERED, GRPC_CHTTP2_STREAM_WRITE_INITIATE_UNCOVERED,
"window-update-required"); "window-update-required");

@ -160,19 +160,22 @@ static bool stream_ref_if_not_destroyed(gpr_refcount *r) {
return true; return true;
} }
/* How many bytes of incoming flow control would we like to advertise */
uint32_t grpc_chttp2_target_incoming_window(grpc_chttp2_transport *t) { uint32_t grpc_chttp2_target_incoming_window(grpc_chttp2_transport *t) {
return (uint32_t)GPR_MAX( return (uint32_t)GPR_MIN(
(int64_t)((1u << 31) - 1), (int64_t)((1u << 31) - 1),
t->stream_total_over_incoming_window + t->stream_total_over_incoming_window +
(int64_t)GPR_MAX( t->settings[GRPC_SENT_SETTINGS]
t->settings[GRPC_SENT_SETTINGS] [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE]);
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE] -
t->stream_total_under_incoming_window,
0));
} }
bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx, /* How many bytes would we like to put on the wire during a single syscall */
grpc_chttp2_transport *t) { static uint32_t target_write_size(grpc_chttp2_transport *t) {
return 1024 * 1024;
}
grpc_chttp2_begin_write_result grpc_chttp2_begin_write(
grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) {
grpc_chttp2_stream *s; grpc_chttp2_stream *s;
GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0); GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0);
@ -206,9 +209,20 @@ bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx,
} }
} }
bool partial_write = false;
/* for each grpc_chttp2_stream that's become writable, frame it's data /* for each grpc_chttp2_stream that's become writable, frame it's data
(according to available window sizes) and add to the output buffer */ (according to available window sizes) and add to the output buffer */
while (grpc_chttp2_list_pop_writable_stream(t, &s)) { while (true) {
if (t->outbuf.length > target_write_size(t)) {
partial_write = true;
break;
}
if (!grpc_chttp2_list_pop_writable_stream(t, &s)) {
break;
}
bool sent_initial_metadata = s->sent_initial_metadata; bool sent_initial_metadata = s->sent_initial_metadata;
bool now_writing = false; bool now_writing = false;
@ -395,7 +409,9 @@ bool grpc_chttp2_begin_write(grpc_exec_ctx *exec_ctx,
GPR_TIMER_END("grpc_chttp2_begin_write", 0); GPR_TIMER_END("grpc_chttp2_begin_write", 0);
return t->outbuf.count > 0; return t->outbuf.count > 0 ? (partial_write ? GRPC_CHTTP2_PARTIAL_WRITE
: GRPC_CHTTP2_FULL_WRITE)
: GRPC_CHTTP2_NOTHING_TO_WRITE;
} }
void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,

@ -886,6 +886,10 @@ static bool op_can_be_run(grpc_transport_stream_op_batch *curr_op,
!stream_state->state_op_done[OP_RECV_MESSAGE]) { !stream_state->state_op_done[OP_RECV_MESSAGE]) {
CRONET_LOG(GPR_DEBUG, "Because"); CRONET_LOG(GPR_DEBUG, "Because");
result = false; result = false;
} else if (curr_op->cancel_stream &&
!stream_state->state_callback_received[OP_CANCELED]) {
CRONET_LOG(GPR_DEBUG, "Because");
result = false;
} else if (curr_op->recv_trailing_metadata) { } else if (curr_op->recv_trailing_metadata) {
/* We aren't done with trailing metadata yet */ /* We aren't done with trailing metadata yet */
if (!stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { if (!stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) {

@ -105,7 +105,7 @@ static void finish(grpc_exec_ctx *exec_ctx, internal_request *req,
grpc_error *error) { grpc_error *error) {
grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent,
req->context->pollset_set); req->context->pollset_set);
grpc_closure_sched(exec_ctx, req->on_done, error); grpc_closure_sched(exec_ctx, req->on_done, GRPC_ERROR_REF(error));
grpc_http_parser_destroy(&req->parser); grpc_http_parser_destroy(&req->parser);
if (req->addresses != NULL) { if (req->addresses != NULL) {
grpc_resolved_addresses_destroy(req->addresses); grpc_resolved_addresses_destroy(req->addresses);

@ -88,6 +88,7 @@
#ifndef __GLIBC__ #ifndef __GLIBC__
#define GRPC_LINUX_EPOLL 1 #define GRPC_LINUX_EPOLL 1
#define GRPC_LINUX_EVENTFD 1 #define GRPC_LINUX_EVENTFD 1
#define GRPC_MSG_IOVLEN_TYPE int
#endif #endif
#ifndef GRPC_LINUX_EVENTFD #ifndef GRPC_LINUX_EVENTFD
#define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1

@ -67,16 +67,16 @@ unsigned gpr_cpu_num_cores(void) {
} }
unsigned gpr_cpu_current_cpu(void) { unsigned gpr_cpu_current_cpu(void) {
#ifdef __GLIBC__ #ifdef GPR_MUSL_LIBC_COMPAT
// sched_getcpu() is undefined on musl
return 0;
#else
int cpu = sched_getcpu(); int cpu = sched_getcpu();
if (cpu < 0) { if (cpu < 0) {
gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno));
return 0; return 0;
} }
return (unsigned)cpu; return (unsigned)cpu;
#else
// sched_getcpu() is undefined on musl
return 0;
#endif #endif
} }

@ -31,6 +31,8 @@
* *
*/ */
#include <grpc/support/port_platform.h>
#include <string.h> #include <string.h>
/* Provide a wrapped memcpy for targets that need to be backwards /* Provide a wrapped memcpy for targets that need to be backwards
@ -40,7 +42,7 @@
*/ */
#ifdef __linux__ #ifdef __linux__
#if defined(__x86_64__) && defined(__GNU_LIBRARY__) #if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT)
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); __asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
void *__wrap_memcpy(void *destination, const void *source, size_t num) { void *__wrap_memcpy(void *destination, const void *source, size_t num) {
return memcpy(destination, source, num); return memcpy(destination, source, num);

@ -44,6 +44,7 @@ void grpc_bdp_estimator_init(grpc_bdp_estimator *estimator, const char *name) {
estimator->estimate = 65536; estimator->estimate = 65536;
estimator->ping_state = GRPC_BDP_PING_UNSCHEDULED; estimator->ping_state = GRPC_BDP_PING_UNSCHEDULED;
estimator->name = name; estimator->name = name;
estimator->bw_est = 0;
} }
bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator, bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator,
@ -84,16 +85,26 @@ void grpc_bdp_estimator_start_ping(grpc_bdp_estimator *estimator) {
GPR_ASSERT(estimator->ping_state == GRPC_BDP_PING_SCHEDULED); GPR_ASSERT(estimator->ping_state == GRPC_BDP_PING_SCHEDULED);
estimator->ping_state = GRPC_BDP_PING_STARTED; estimator->ping_state = GRPC_BDP_PING_STARTED;
estimator->accumulator = 0; estimator->accumulator = 0;
estimator->ping_start_time = gpr_now(GPR_CLOCK_MONOTONIC);
} }
void grpc_bdp_estimator_complete_ping(grpc_bdp_estimator *estimator) { void grpc_bdp_estimator_complete_ping(grpc_bdp_estimator *estimator) {
gpr_timespec dt_ts =
gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), estimator->ping_start_time);
double dt = (double)dt_ts.tv_sec + 1e-9 * (double)dt_ts.tv_nsec;
double bw = dt > 0 ? ((double)estimator->accumulator / dt) : 0;
if (grpc_bdp_estimator_trace) { if (grpc_bdp_estimator_trace) {
gpr_log(GPR_DEBUG, "bdp[%s]:complete acc=%" PRId64 " est=%" PRId64, gpr_log(GPR_DEBUG, "bdp[%s]:complete acc=%" PRId64 " est=%" PRId64
estimator->name, estimator->accumulator, estimator->estimate); " dt=%lf bw=%lfMbs bw_est=%lfMbs",
estimator->name, estimator->accumulator, estimator->estimate, dt,
bw / 125000.0, estimator->bw_est / 125000.0);
} }
GPR_ASSERT(estimator->ping_state == GRPC_BDP_PING_STARTED); GPR_ASSERT(estimator->ping_state == GRPC_BDP_PING_STARTED);
if (estimator->accumulator > 2 * estimator->estimate / 3) { if (estimator->accumulator > 2 * estimator->estimate / 3 &&
estimator->estimate *= 2; bw > estimator->bw_est) {
estimator->estimate =
GPR_MAX(estimator->accumulator, estimator->estimate * 2);
estimator->bw_est = bw;
if (grpc_bdp_estimator_trace) { if (grpc_bdp_estimator_trace) {
gpr_log(GPR_DEBUG, "bdp[%s]: estimate increased to %" PRId64, gpr_log(GPR_DEBUG, "bdp[%s]: estimate increased to %" PRId64,
estimator->name, estimator->estimate); estimator->name, estimator->estimate);

@ -34,6 +34,7 @@
#ifndef GRPC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H #ifndef GRPC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
#define GRPC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H #define GRPC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
#include <grpc/support/time.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
@ -52,6 +53,8 @@ typedef struct grpc_bdp_estimator {
grpc_bdp_estimator_ping_state ping_state; grpc_bdp_estimator_ping_state ping_state;
int64_t accumulator; int64_t accumulator;
int64_t estimate; int64_t estimate;
gpr_timespec ping_start_time;
double bw_est;
const char *name; const char *name;
} grpc_bdp_estimator; } grpc_bdp_estimator;

@ -42,7 +42,6 @@
#include "call_credentials.h" #include "call_credentials.h"
#include "channel.h" #include "channel.h"
#include "completion_queue.h" #include "completion_queue.h"
#include "completion_queue_async_worker.h"
#include "grpc/grpc.h" #include "grpc/grpc.h"
#include "grpc/grpc_security.h" #include "grpc/grpc_security.h"
#include "grpc/support/alloc.h" #include "grpc/support/alloc.h"

@ -41,7 +41,6 @@
#include "channel.h" #include "channel.h"
#include "channel_credentials.h" #include "channel_credentials.h"
#include "completion_queue.h" #include "completion_queue.h"
#include "completion_queue_async_worker.h"
#include "grpc/grpc.h" #include "grpc/grpc.h"
#include "grpc/grpc_security.h" #include "grpc/grpc_security.h"
#include "timeval.h" #include "timeval.h"

@ -31,8 +31,6 @@
* *
*/ */
#ifdef GRPC_UV
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <node.h> #include <node.h>
#include <uv.h> #include <uv.h>
@ -95,5 +93,3 @@ void CompletionQueueInit(Local<Object> exports) {
} // namespace node } // namespace node
} // namespace grpc } // namespace grpc
#endif /* GRPC_UV */

@ -1,86 +0,0 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef NET_GRPC_NODE_COMPLETION_QUEUE_ASYNC_WORKER_H_
#define NET_GRPC_NODE_COMPLETION_QUEUE_ASYNC_WORKER_H_
#include <nan.h>
#include "grpc/grpc.h"
namespace grpc {
namespace node {
/* A worker that asynchronously calls completion_queue_next, and queues onto the
node event loop a call to the function stored in the event's tag. */
class CompletionQueueAsyncWorker : public Nan::AsyncWorker {
public:
CompletionQueueAsyncWorker();
~CompletionQueueAsyncWorker();
/* Calls completion_queue_next with the provided deadline, and stores the
event if there was one or sets an error message if there was not */
void Execute();
/* Returns the completion queue attached to this class */
static grpc_completion_queue *GetQueue();
/* Convenience function to create a worker with the given arguments and queue
it to run asynchronously */
static void Next();
/* Initialize the CompletionQueueAsyncWorker class */
static void Init(v8::Local<v8::Object> exports);
protected:
/* Called when Execute has succeeded (completed without setting an error
message). Calls the saved callback with the event that came from
completion_queue_next */
void HandleOKCallback();
void HandleErrorCallback();
private:
grpc_event result;
static grpc_completion_queue *queue;
// Number of grpc_completion_queue_next calls in the thread pool
static int current_threads;
// Number of grpc_completion_queue_next calls waiting to enter the thread pool
static int waiting_next_calls;
};
} // namespace node
} // namespace grpc
#endif // NET_GRPC_NODE_COMPLETION_QUEUE_ASYNC_WORKER_H_

@ -1,180 +0,0 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/* I don't like using #ifndef, but I don't see a better way to do this */
#ifndef GRPC_UV
#include <nan.h>
#include <node.h>
#include "call.h"
#include "completion_queue.h"
#include "grpc/grpc.h"
#include "grpc/support/log.h"
#include "grpc/support/time.h"
namespace grpc {
namespace node {
namespace {
/* A worker that asynchronously calls completion_queue_next, and queues onto the
node event loop a call to the function stored in the event's tag. */
class CompletionQueueAsyncWorker : public Nan::AsyncWorker {
public:
CompletionQueueAsyncWorker();
~CompletionQueueAsyncWorker();
/* Calls completion_queue_next with the provided deadline, and stores the
event if there was one or sets an error message if there was not */
void Execute();
/* Returns the completion queue attached to this class */
static grpc_completion_queue *GetQueue();
/* Convenience function to create a worker with the given arguments and queue
it to run asynchronously */
static void Next();
/* Initialize the CompletionQueueAsyncWorker class */
static void Init(v8::Local<v8::Object> exports);
protected:
/* Called when Execute has succeeded (completed without setting an error
message). Calls the saved callback with the event that came from
completion_queue_next */
void HandleOKCallback();
void HandleErrorCallback();
private:
static void TryAddWorker();
grpc_event result;
static grpc_completion_queue *queue;
// Number of grpc_completion_queue_next calls in the thread pool
static int current_threads;
// Number of grpc_completion_queue_next calls waiting to enter the thread pool
static int waiting_next_calls;
};
const int max_queue_threads = 2;
using v8::Function;
using v8::Local;
using v8::Object;
using v8::Value;
grpc_completion_queue *CompletionQueueAsyncWorker::queue;
// Invariants: current_threads <= max_queue_threads
// (current_threads == max_queue_threads) || (waiting_next_calls == 0)
int CompletionQueueAsyncWorker::current_threads;
int CompletionQueueAsyncWorker::waiting_next_calls;
CompletionQueueAsyncWorker::CompletionQueueAsyncWorker()
: Nan::AsyncWorker(NULL) {}
CompletionQueueAsyncWorker::~CompletionQueueAsyncWorker() {}
void CompletionQueueAsyncWorker::Execute() {
result = grpc_completion_queue_next(queue, gpr_inf_future(GPR_CLOCK_REALTIME),
NULL);
if (!result.success) {
SetErrorMessage("The async function encountered an error");
}
}
grpc_completion_queue *CompletionQueueAsyncWorker::GetQueue() { return queue; }
void CompletionQueueAsyncWorker::TryAddWorker() {
if (current_threads < max_queue_threads && waiting_next_calls > 0) {
current_threads += 1;
waiting_next_calls -= 1;
CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
Nan::AsyncQueueWorker(worker);
}
GPR_ASSERT(current_threads <= max_queue_threads);
GPR_ASSERT((current_threads == max_queue_threads) ||
(waiting_next_calls == 0));
}
void CompletionQueueAsyncWorker::Next() {
waiting_next_calls += 1;
TryAddWorker();
}
void CompletionQueueAsyncWorker::Init(Local<Object> exports) {
Nan::HandleScope scope;
current_threads = 0;
waiting_next_calls = 0;
queue = grpc_completion_queue_create_for_next(NULL);
}
void CompletionQueueAsyncWorker::HandleOKCallback() {
Nan::HandleScope scope;
current_threads -= 1;
TryAddWorker();
CompleteTag(result.tag, NULL);
DestroyTag(result.tag);
}
void CompletionQueueAsyncWorker::HandleErrorCallback() {
Nan::HandleScope scope;
current_threads -= 1;
TryAddWorker();
CompleteTag(result.tag, ErrorMessage());
DestroyTag(result.tag);
}
} // namespace
grpc_completion_queue *GetCompletionQueue() {
return CompletionQueueAsyncWorker::GetQueue();
}
void CompletionQueueNext() { CompletionQueueAsyncWorker::Next(); }
void CompletionQueueInit(Local<Object> exports) {
CompletionQueueAsyncWorker::Init(exports);
}
} // namespace node
} // namespace grpc
#endif /* GRPC_UV */

@ -43,18 +43,15 @@
#include "grpc/support/time.h" #include "grpc/support/time.h"
// TODO(murgatroid99): Remove this when the endpoint API becomes public // TODO(murgatroid99): Remove this when the endpoint API becomes public
#ifdef GRPC_UV
extern "C" { extern "C" {
#include "src/core/lib/iomgr/pollset_uv.h" #include "src/core/lib/iomgr/pollset_uv.h"
} }
#endif
#include "call.h" #include "call.h"
#include "call_credentials.h" #include "call_credentials.h"
#include "channel.h" #include "channel.h"
#include "channel_credentials.h" #include "channel_credentials.h"
#include "completion_queue.h" #include "completion_queue.h"
#include "completion_queue_async_worker.h"
#include "server.h" #include "server.h"
#include "server_credentials.h" #include "server_credentials.h"
#include "slice.h" #include "slice.h"
@ -432,9 +429,7 @@ void init(Local<Object> exports) {
InitWriteFlags(exports); InitWriteFlags(exports);
InitLogConstants(exports); InitLogConstants(exports);
#ifdef GRPC_UV
grpc_pollset_work_run_loop = 0; grpc_pollset_work_run_loop = 0;
#endif
grpc::node::Call::Init(exports); grpc::node::Call::Init(exports);
grpc::node::CallCredentials::Init(exports); grpc::node::CallCredentials::Init(exports);

@ -41,7 +41,6 @@
#include <vector> #include <vector>
#include "call.h" #include "call.h"
#include "completion_queue.h" #include "completion_queue.h"
#include "completion_queue_async_worker.h"
#include "grpc/grpc.h" #include "grpc/grpc.h"
#include "grpc/grpc_security.h" #include "grpc/grpc_security.h"
#include "grpc/support/log.h" #include "grpc/support/log.h"
@ -78,6 +77,30 @@ using v8::Value;
Nan::Callback *Server::constructor; Nan::Callback *Server::constructor;
Persistent<FunctionTemplate> Server::fun_tpl; Persistent<FunctionTemplate> Server::fun_tpl;
static Callback *shutdown_callback = NULL;
class ServerShutdownOp : public Op {
public:
ServerShutdownOp(grpc_server *server) : server(server) {}
~ServerShutdownOp() {}
Local<Value> GetNodeValue() const { return Nan::Null(); }
bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
bool IsFinalOp() { return false; }
void OnComplete(bool success) {
/* Because cancel_all_calls was called, we assume that shutdown_and_notify
completes successfully */
grpc_server_destroy(server);
}
grpc_server *server;
protected:
std::string GetTypeString() const { return "shutdown"; }
};
class NewCallOp : public Op { class NewCallOp : public Op {
public: public:
NewCallOp() { NewCallOp() {
@ -149,6 +172,10 @@ class TryShutdownOp : public Op {
server_persist; server_persist;
}; };
Server::Server(grpc_server *server) : wrapped_server(server) {}
Server::~Server() { this->ShutdownServer(); }
void Server::Init(Local<Object> exports) { void Server::Init(Local<Object> exports) {
HandleScope scope; HandleScope scope;
Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New); Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
@ -177,6 +204,36 @@ void Server::DestroyWrappedServer() {
} }
} }
NAN_METHOD(ServerShutdownCallback) {
if (!info[0]->IsNull()) {
return Nan::ThrowError("forceShutdown failed somehow");
}
}
void Server::ShutdownServer() {
Nan::HandleScope scope;
if (this->wrapped_server != NULL) {
if (shutdown_callback == NULL) {
Local<FunctionTemplate> callback_tpl =
Nan::New<FunctionTemplate>(ServerShutdownCallback);
shutdown_callback =
new Callback(Nan::GetFunction(callback_tpl).ToLocalChecked());
}
ServerShutdownOp *op = new ServerShutdownOp(this->wrapped_server);
unique_ptr<OpVec> ops(new OpVec());
ops->push_back(unique_ptr<Op>(op));
grpc_server_shutdown_and_notify(
this->wrapped_server, GetCompletionQueue(),
new struct tag(new Callback(**shutdown_callback), ops.release(), NULL,
Nan::Null()));
grpc_server_cancel_all_calls(this->wrapped_server);
CompletionQueueNext();
this->wrapped_server = NULL;
}
}
NAN_METHOD(Server::New) { NAN_METHOD(Server::New) {
/* If this is not a constructor call, make a constructor call and return /* If this is not a constructor call, make a constructor call and return
the result */ the result */

@ -1,75 +0,0 @@
/*
*
* Copyright 2017, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef GRPC_UV
#include "server.h"
#include <nan.h>
#include <node.h>
#include "grpc/grpc.h"
#include "grpc/support/time.h"
namespace grpc {
namespace node {
Server::Server(grpc_server *server) : wrapped_server(server) {
grpc_completion_queue_attributes attrs = {
GRPC_CQ_CURRENT_VERSION, GRPC_CQ_PLUCK, GRPC_CQ_NON_LISTENING};
shutdown_queue = grpc_completion_queue_create(
grpc_completion_queue_factory_lookup(&attrs), &attrs, NULL);
grpc_server_register_completion_queue(server, shutdown_queue, NULL);
}
Server::~Server() {
this->ShutdownServer();
grpc_completion_queue_shutdown(this->shutdown_queue);
grpc_completion_queue_destroy(this->shutdown_queue);
}
void Server::ShutdownServer() {
if (this->wrapped_server != NULL) {
grpc_server_shutdown_and_notify(this->wrapped_server, this->shutdown_queue,
NULL);
grpc_server_cancel_all_calls(this->wrapped_server);
grpc_completion_queue_pluck(this->shutdown_queue, NULL,
gpr_inf_future(GPR_CLOCK_REALTIME), NULL);
grpc_server_destroy(this->wrapped_server);
this->wrapped_server = NULL;
}
}
} // namespace grpc
} // namespace node
#endif /* GRPC_UV */

@ -1,120 +0,0 @@
/*
*
* Copyright 2017, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifdef GRPC_UV
#include "server.h"
#include <nan.h>
#include <node.h>
#include "grpc/grpc.h"
#include "grpc/support/time.h"
#include "call.h"
#include "completion_queue.h"
namespace grpc {
namespace node {
using Nan::Callback;
using Nan::MaybeLocal;
using v8::External;
using v8::Function;
using v8::FunctionTemplate;
using v8::Local;
using v8::Object;
using v8::Value;
static Callback *shutdown_callback = NULL;
class ServerShutdownOp : public Op {
public:
ServerShutdownOp(grpc_server *server) : server(server) {}
~ServerShutdownOp() {}
Local<Value> GetNodeValue() const { return Nan::Null(); }
bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
bool IsFinalOp() { return false; }
void OnComplete(bool success) {
/* Because cancel_all_calls was called, we assume that shutdown_and_notify
completes successfully */
grpc_server_destroy(server);
}
grpc_server *server;
protected:
std::string GetTypeString() const { return "shutdown"; }
};
Server::Server(grpc_server *server) : wrapped_server(server) {}
Server::~Server() { this->ShutdownServer(); }
NAN_METHOD(ServerShutdownCallback) {
if (!info[0]->IsNull()) {
return Nan::ThrowError("forceShutdown failed somehow");
}
}
void Server::ShutdownServer() {
Nan::HandleScope scope;
if (this->wrapped_server != NULL) {
if (shutdown_callback == NULL) {
Local<FunctionTemplate> callback_tpl =
Nan::New<FunctionTemplate>(ServerShutdownCallback);
shutdown_callback =
new Callback(Nan::GetFunction(callback_tpl).ToLocalChecked());
}
ServerShutdownOp *op = new ServerShutdownOp(this->wrapped_server);
unique_ptr<OpVec> ops(new OpVec());
ops->push_back(unique_ptr<Op>(op));
grpc_server_shutdown_and_notify(
this->wrapped_server, GetCompletionQueue(),
new struct tag(new Callback(**shutdown_callback), ops.release(), NULL,
Nan::Null()));
grpc_server_cancel_all_calls(this->wrapped_server);
CompletionQueueNext();
this->wrapped_server = NULL;
}
}
} // namespace grpc
} // namespace node
#endif /* GRPC_UV */

@ -52,6 +52,9 @@ enum ServerType {
enum RpcType { enum RpcType {
UNARY = 0; UNARY = 0;
STREAMING = 1; STREAMING = 1;
STREAMING_FROM_CLIENT = 2;
STREAMING_FROM_SERVER = 3;
STREAMING_BOTH_WAYS = 4;
} }
// Parameters of poisson process distribution, which is a good representation // Parameters of poisson process distribution, which is a good representation

@ -42,9 +42,22 @@ service BenchmarkService {
// The server returns the client payload as-is. // The server returns the client payload as-is.
rpc UnaryCall(SimpleRequest) returns (SimpleResponse); rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
// One request followed by one response. // Repeated sequence of one request followed by one response.
// The server returns the client payload as-is. // Should be called streaming ping-pong
// The server returns the client payload as-is on each response
rpc StreamingCall(stream SimpleRequest) returns (stream SimpleResponse); rpc StreamingCall(stream SimpleRequest) returns (stream SimpleResponse);
// Single-sided unbounded streaming from client to server
// The server returns the client payload as-is once the client does WritesDone
rpc StreamingFromClient(stream SimpleRequest) returns (SimpleResponse);
// Single-sided unbounded streaming from server to client
// The server repeatedly returns the client payload as-is
rpc StreamingFromServer(SimpleRequest) returns (stream SimpleResponse);
// Two-sided unbounded streaming between server to client
// Both sides send the content of their own choice to the other
rpc StreamingBothWays(stream SimpleRequest) returns (stream SimpleResponse);
} }
service WorkerService { service WorkerService {

@ -61,13 +61,12 @@ class Future(six.with_metaclass(abc.ABCMeta)):
This method does not block. This method does not block.
Returns: Returns:
True if the computation has not yet begun, will not be allowed to take bool:
place, and determination of both was possible without blocking. False Returns True if the computation was canceled.
under all other circumstances including but not limited to the Returns False under all other circumstances, for example:
computation's already having begun, the computation's already having 1. computation has begun and could not be canceled.
finished, and the computation's having been scheduled for execution on a 2. computation has finished
remote system for which a determination of whether or not it commenced 3. computation is scheduled for execution and it is impossible to determine its state without blocking.
before being cancelled cannot be made without blocking.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -78,10 +77,12 @@ class Future(six.with_metaclass(abc.ABCMeta)):
This method does not block. This method does not block.
Returns: Returns:
True if the computation was cancelled any time before its result became bool:
immediately available. False under all other circumstances including but Returns True if the computation was cancelled before its result became
not limited to this object's cancel method not having been called and available.
the computation's result having become immediately available. False under all other circumstances, for example:
1. computation was not cancelled.
2. computation's result is available.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -92,9 +93,10 @@ class Future(six.with_metaclass(abc.ABCMeta)):
This method does not block. This method does not block.
Returns: Returns:
True if the computation is scheduled to take place in the future or is bool:
taking place now, or False if the computation took place in the past or Returns True if the computation is scheduled for execution or currently
was cancelled. executing.
Returns False if the computation already executed or was cancelled.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -105,22 +107,24 @@ class Future(six.with_metaclass(abc.ABCMeta)):
This method does not block. This method does not block.
Returns: Returns:
True if the computation is known to have either completed or have been bool:
unscheduled or interrupted. False if the computation may possibly be Returns True if the computation already executed or was cancelled.
executing or scheduled to execute later. Returns False if the computation is scheduled for execution or currently
executing.
This is exactly opposite of the running() method's result.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def result(self, timeout=None): def result(self, timeout=None):
"""Accesses the outcome of the computation or raises its exception. """Returns the result of the computation or raises its exception.
This method may return immediately or may block. This method may return immediately or may block.
Args: Args:
timeout: The length of time in seconds to wait for the computation to timeout: The length of time in seconds to wait for the computation to
finish or be cancelled, or None if this method should block until the finish or be cancelled. If None, the call will block until the computations's
computation has finished or is cancelled no matter how long that takes. termination.
Returns: Returns:
The return value of the computation. The return value of the computation.
@ -142,12 +146,11 @@ class Future(six.with_metaclass(abc.ABCMeta)):
Args: Args:
timeout: The length of time in seconds to wait for the computation to timeout: The length of time in seconds to wait for the computation to
terminate or be cancelled, or None if this method should block until terminate or be cancelled. If None, the call will block until the computations's
the computation is terminated or is cancelled no matter how long that termination.
takes.
Returns: Returns:
The exception raised by the computation, or None if the computation did The exception raised by the computation, or None if the computation did
not raise an exception. not raise an exception.
Raises: Raises:
@ -165,12 +168,11 @@ class Future(six.with_metaclass(abc.ABCMeta)):
Args: Args:
timeout: The length of time in seconds to wait for the computation to timeout: The length of time in seconds to wait for the computation to
terminate or be cancelled, or None if this method should block until terminate or be cancelled. If None, the call will block until the
the computation is terminated or is cancelled no matter how long that computations's termination.
takes.
Returns: Returns:
The traceback of the exception raised by the computation, or None if the The traceback of the exception raised by the computation, or None if the
computation did not raise an exception. computation did not raise an exception.
Raises: Raises:
@ -260,7 +262,12 @@ class RpcContext(six.with_metaclass(abc.ABCMeta)):
@abc.abstractmethod @abc.abstractmethod
def is_active(self): def is_active(self):
"""Describes whether the RPC is active or has terminated.""" """Describes whether the RPC is active or has terminated.
Returns:
bool:
True if RPC is active, False otherwise.
"""
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
@ -290,8 +297,9 @@ class RpcContext(six.with_metaclass(abc.ABCMeta)):
callback: A no-parameter callable to be called on RPC termination. callback: A no-parameter callable to be called on RPC termination.
Returns: Returns:
True if the callback was added and will be called later; False if the bool:
callback was not added and will not later be called (because the RPC True if the callback was added and will be called later; False if the
callback was not added and will not be called (because the RPC
already terminated or some other reason). already terminated or some other reason).
""" """
raise NotImplementedError() raise NotImplementedError()
@ -305,7 +313,7 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def initial_metadata(self): def initial_metadata(self):
"""Accesses the initial metadata from the service-side of the RPC. """Accesses the initial metadata sent by the server.
This method blocks until the value is available. This method blocks until the value is available.
@ -316,7 +324,7 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def trailing_metadata(self): def trailing_metadata(self):
"""Accesses the trailing metadata from the service-side of the RPC. """Accesses the trailing metadata sent by the server.
This method blocks until the value is available. This method blocks until the value is available.
@ -327,7 +335,7 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def code(self): def code(self):
"""Accesses the status code emitted by the service-side of the RPC. """Accesses the status code sent by the server.
This method blocks until the value is available. This method blocks until the value is available.
@ -338,7 +346,7 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def details(self): def details(self):
"""Accesses the details value emitted by the service-side of the RPC. """Accesses the details sent by the server.
This method blocks until the value is available. This method blocks until the value is available.
@ -352,10 +360,12 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)):
class ChannelCredentials(object): class ChannelCredentials(object):
"""A value encapsulating the data required to create a secure Channel. """An encapsulation of the data required to create a secure Channel.
This class has no supported interface - it exists to define the type of its This class has no supported interface - it exists to define the type of its
instances and its instances exist to be passed to other functions. instances and its instances exist to be passed to other functions. For example,
ssl_channel_credentials returns an instance, and secure_channel consumes an
instance of this class.
""" """
def __init__(self, credentials): def __init__(self, credentials):
@ -363,7 +373,7 @@ class ChannelCredentials(object):
class CallCredentials(object): class CallCredentials(object):
"""A value encapsulating data asserting an identity over a channel. """An encapsulation of the data required to assert an identity over a channel.
A CallCredentials may be composed with ChannelCredentials to always assert A CallCredentials may be composed with ChannelCredentials to always assert
identity for every call over that Channel. identity for every call over that Channel.
@ -416,7 +426,7 @@ class AuthMetadataPlugin(six.with_metaclass(abc.ABCMeta)):
class ServerCredentials(object): class ServerCredentials(object):
"""A value encapsulating the data required to open a secure port on a Server. """An encapsulation of the data required to open a secure port on a Server.
This class has no supported interface - it exists to define the type of its This class has no supported interface - it exists to define the type of its
instances and its instances exist to be passed to other functions. instances and its instances exist to be passed to other functions.
@ -430,7 +440,7 @@ class ServerCredentials(object):
class UnaryUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)): class UnaryUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
"""Affords invoking a unary-unary RPC.""" """Affords invoking a unary-unary RPC from client-side."""
@abc.abstractmethod @abc.abstractmethod
def __call__(self, request, timeout=None, metadata=None, credentials=None): def __call__(self, request, timeout=None, metadata=None, credentials=None):
@ -486,7 +496,7 @@ class UnaryUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
Returns: Returns:
An object that is both a Call for the RPC and a Future. In the event of An object that is both a Call for the RPC and a Future. In the event of
RPC completion, the return Call-Future's result value will be the RPC completion, the return Call-Future's result value will be the
response message of the RPC. Should the event terminate with non-OK response message of the RPC. Should the event terminate with non-OK
status, the returned Call-Future's exception value will be an RpcError. status, the returned Call-Future's exception value will be an RpcError.
@ -495,7 +505,7 @@ class UnaryUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
class UnaryStreamMultiCallable(six.with_metaclass(abc.ABCMeta)): class UnaryStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
"""Affords invoking a unary-stream RPC.""" """Affords invoking a unary-stream RPC from client-side."""
@abc.abstractmethod @abc.abstractmethod
def __call__(self, request, timeout=None, metadata=None, credentials=None): def __call__(self, request, timeout=None, metadata=None, credentials=None):
@ -504,12 +514,13 @@ class UnaryStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
Args: Args:
request: The request value for the RPC. request: The request value for the RPC.
timeout: An optional duration of time in seconds to allow for the RPC. timeout: An optional duration of time in seconds to allow for the RPC.
If None, the timeout is considered infinite.
metadata: An optional :term:`metadata` to be transmitted to the metadata: An optional :term:`metadata` to be transmitted to the
service-side of the RPC. service-side of the RPC.
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
Returns: Returns:
An object that is both a Call for the RPC and an iterator of response An object that is both a Call for the RPC and an iterator of response
values. Drawing response values from the returned Call-iterator may values. Drawing response values from the returned Call-iterator may
raise RpcError indicating termination of the RPC with non-OK status. raise RpcError indicating termination of the RPC with non-OK status.
""" """
@ -517,7 +528,7 @@ class UnaryStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)): class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
"""Affords invoking a stream-unary RPC in any call style.""" """Affords invoking a stream-unary RPC from client-side."""
@abc.abstractmethod @abc.abstractmethod
def __call__(self, def __call__(self,
@ -530,6 +541,7 @@ class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
Args: Args:
request_iterator: An iterator that yields request values for the RPC. request_iterator: An iterator that yields request values for the RPC.
timeout: An optional duration of time in seconds to allow for the RPC. timeout: An optional duration of time in seconds to allow for the RPC.
If None, the timeout is considered infinite.
metadata: Optional :term:`metadata` to be transmitted to the metadata: Optional :term:`metadata` to be transmitted to the
service-side of the RPC. service-side of the RPC.
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
@ -539,8 +551,8 @@ class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
Raises: Raises:
RpcError: Indicating that the RPC terminated with non-OK status. The RpcError: Indicating that the RPC terminated with non-OK status. The
raised RpcError will also be a Call for the RPC affording the RPC's raised RpcError will also implement grpc.Call, affording methods
metadata, status code, and details. such as metadata, code, and details.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -550,17 +562,18 @@ class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
timeout=None, timeout=None,
metadata=None, metadata=None,
credentials=None): credentials=None):
"""Synchronously invokes the underlying RPC. """Synchronously invokes the underlying RPC on the client.
Args: Args:
request_iterator: An iterator that yields request values for the RPC. request_iterator: An iterator that yields request values for the RPC.
timeout: An optional duration of time in seconds to allow for the RPC. timeout: An optional duration of time in seconds to allow for the RPC.
If None, the timeout is considered infinite.
metadata: Optional :term:`metadata` to be transmitted to the metadata: Optional :term:`metadata` to be transmitted to the
service-side of the RPC. service-side of the RPC.
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
Returns: Returns:
The response value for the RPC and a Call for the RPC. The response value for the RPC and a Call object for the RPC.
Raises: Raises:
RpcError: Indicating that the RPC terminated with non-OK status. The RpcError: Indicating that the RPC terminated with non-OK status. The
@ -575,17 +588,18 @@ class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
timeout=None, timeout=None,
metadata=None, metadata=None,
credentials=None): credentials=None):
"""Asynchronously invokes the underlying RPC. """Asynchronously invokes the underlying RPC on the client.
Args: Args:
request_iterator: An iterator that yields request values for the RPC. request_iterator: An iterator that yields request values for the RPC.
timeout: An optional duration of time in seconds to allow for the RPC. timeout: An optional duration of time in seconds to allow for the RPC.
If None, the timeout is considered infinite.
metadata: Optional :term:`metadata` to be transmitted to the metadata: Optional :term:`metadata` to be transmitted to the
service-side of the RPC. service-side of the RPC.
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
Returns: Returns:
An object that is both a Call for the RPC and a Future. In the event of An object that is both a Call for the RPC and a Future. In the event of
RPC completion, the return Call-Future's result value will be the RPC completion, the return Call-Future's result value will be the
response message of the RPC. Should the event terminate with non-OK response message of the RPC. Should the event terminate with non-OK
status, the returned Call-Future's exception value will be an RpcError. status, the returned Call-Future's exception value will be an RpcError.
@ -594,7 +608,7 @@ class StreamUnaryMultiCallable(six.with_metaclass(abc.ABCMeta)):
class StreamStreamMultiCallable(six.with_metaclass(abc.ABCMeta)): class StreamStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
"""Affords invoking a stream-stream RPC in any call style.""" """Affords invoking a stream-stream RPC on client-side."""
@abc.abstractmethod @abc.abstractmethod
def __call__(self, def __call__(self,
@ -602,17 +616,18 @@ class StreamStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
timeout=None, timeout=None,
metadata=None, metadata=None,
credentials=None): credentials=None):
"""Invokes the underlying RPC. """Invokes the underlying RPC on the client.
Args: Args:
request_iterator: An iterator that yields request values for the RPC. request_iterator: An iterator that yields request values for the RPC.
timeout: An optional duration of time in seconds to allow for the RPC. timeout: An optional duration of time in seconds to allow for the RPC.
if not specified the timeout is considered infinite.
metadata: Optional :term:`metadata` to be transmitted to the metadata: Optional :term:`metadata` to be transmitted to the
service-side of the RPC. service-side of the RPC.
credentials: An optional CallCredentials for the RPC. credentials: An optional CallCredentials for the RPC.
Returns: Returns:
An object that is both a Call for the RPC and an iterator of response An object that is both a Call for the RPC and an iterator of response
values. Drawing response values from the returned Call-iterator may values. Drawing response values from the returned Call-iterator may
raise RpcError indicating termination of the RPC with non-OK status. raise RpcError indicating termination of the RPC with non-OK status.
""" """
@ -623,27 +638,32 @@ class StreamStreamMultiCallable(six.with_metaclass(abc.ABCMeta)):
class Channel(six.with_metaclass(abc.ABCMeta)): class Channel(six.with_metaclass(abc.ABCMeta)):
"""Affords RPC invocation via generic methods.""" """Affords RPC invocation via generic methods on client-side."""
@abc.abstractmethod @abc.abstractmethod
def subscribe(self, callback, try_to_connect=False): def subscribe(self, callback, try_to_connect=False):
"""Subscribes to this Channel's connectivity. """Subscribe to this Channel's connectivity state machine.
A Channel may be in any of the states described by ChannelConnectivity.
This method allows application to monitor the state transitions.
The typical use case is to debug or gain better visibility into gRPC
runtime's state.
Args: Args:
callback: A callable to be invoked and passed a ChannelConnectivity value callback: A callable to be invoked with ChannelConnectivity argument.
describing this Channel's connectivity. The callable will be invoked ChannelConnectivity describes current state of the channel.
immediately upon subscription and again for every change to this The callable will be invoked immediately upon subscription and again for
Channel's connectivity thereafter until it is unsubscribed or this every change to ChannelConnectivity until it is unsubscribed or this
Channel object goes out of scope. Channel object goes out of scope.
try_to_connect: A boolean indicating whether or not this Channel should try_to_connect: A boolean indicating whether or not this Channel should
attempt to connect if it is not already connected and ready to conduct attempt to connect immediately. If set to False, gRPC runtime decides
RPCs. when to connect.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def unsubscribe(self, callback): def unsubscribe(self, callback):
"""Unsubscribes a callback from this Channel's connectivity. """Unsubscribes a subscribed callback from this Channel's connectivity.
Args: Args:
callback: A callable previously registered with this Channel from having callback: A callable previously registered with this Channel from having
@ -736,7 +756,7 @@ class ServicerContext(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def invocation_metadata(self): def invocation_metadata(self):
"""Accesses the metadata from the invocation-side of the RPC. """Accesses the metadata from the sent by the client.
Returns: Returns:
The invocation :term:`metadata`. The invocation :term:`metadata`.
@ -749,15 +769,16 @@ class ServicerContext(six.with_metaclass(abc.ABCMeta, RpcContext)):
Returns: Returns:
A string identifying the peer that invoked the RPC being serviced. A string identifying the peer that invoked the RPC being serviced.
The string format is determined by gRPC runtime.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def send_initial_metadata(self, initial_metadata): def send_initial_metadata(self, initial_metadata):
"""Sends the initial metadata value to the invocation-side of the RPC. """Sends the initial metadata value to the client.
This method need not be called by method implementations if they have no This method need not be called by implementations if they have no
service-side initial metadata to transmit. metadata to add to what the gRPC runtime will transmit.
Args: Args:
initial_metadata: The initial :term:`metadata`. initial_metadata: The initial :term:`metadata`.
@ -766,10 +787,10 @@ class ServicerContext(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def set_trailing_metadata(self, trailing_metadata): def set_trailing_metadata(self, trailing_metadata):
"""Accepts the trailing metadata value of the RPC. """Sends the trailing metadata for the RPC.
This method need not be called by method implementations if they have no This method need not be called by implementations if they have no
service-side trailing metadata to transmit. metadata to add to what the gRPC runtime will transmit.
Args: Args:
trailing_metadata: The trailing :term:`metadata`. trailing_metadata: The trailing :term:`metadata`.
@ -778,27 +799,25 @@ class ServicerContext(six.with_metaclass(abc.ABCMeta, RpcContext)):
@abc.abstractmethod @abc.abstractmethod
def set_code(self, code): def set_code(self, code):
"""Accepts the status code of the RPC. """Sets the value to be used as status code upon RPC completion.
This method need not be called by method implementations if they wish the This method need not be called by method implementations if they wish the
gRPC runtime to determine the status code of the RPC. gRPC runtime to determine the status code of the RPC.
Args: Args:
code: A StatusCode value to be transmitted to the invocation side of the code: A StatusCode object to be sent to the client.
RPC as the status code of the RPC.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def set_details(self, details): def set_details(self, details):
"""Accepts the service-side details of the RPC. """Sets the value to be used as detail string upon RPC completion.
This method need not be called by method implementations if they have no This method need not be called by method implementations if they have no
details to transmit. details to transmit.
Args: Args:
details: A string to be transmitted to the invocation side of the RPC as details: An arbitrary string to be sent to the client upon completion.
the status details of the RPC.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -845,7 +864,7 @@ class HandlerCallDetails(six.with_metaclass(abc.ABCMeta)):
"""Describes an RPC that has just arrived for service. """Describes an RPC that has just arrived for service.
Attributes: Attributes:
method: The method name of the RPC. method: The method name of the RPC.
invocation_metadata: The :term:`metadata` from the invocation side of the RPC. invocation_metadata: The :term:`metadata` sent by the client.
""" """
@ -854,14 +873,14 @@ class GenericRpcHandler(six.with_metaclass(abc.ABCMeta)):
@abc.abstractmethod @abc.abstractmethod
def service(self, handler_call_details): def service(self, handler_call_details):
"""Services an RPC (or not). """Returns the handler for servicing the RPC.
Args: Args:
handler_call_details: A HandlerCallDetails describing the RPC. handler_call_details: A HandlerCallDetails describing the RPC.
Returns: Returns:
An RpcMethodHandler with which the RPC may be serviced, or None to An RpcMethodHandler with which the RPC may be serviced if the implementation
indicate that this object will not be servicing the RPC. chooses to service this RPC, or None otherwise.
""" """
raise NotImplementedError() raise NotImplementedError()
@ -870,15 +889,15 @@ class ServiceRpcHandler(six.with_metaclass(abc.ABCMeta, GenericRpcHandler)):
"""An implementation of RPC methods belonging to a service. """An implementation of RPC methods belonging to a service.
A service handles RPC methods with structured names of the form A service handles RPC methods with structured names of the form
'/Service.Name/Service.MethodX', where 'Service.Name' is the value '/Service.Name/Service.Method', where 'Service.Name' is the value
returned by service_name(), and 'Service.MethodX' is the service method returned by service_name(), and 'Service.Method' is the method
name. A service can have multiple service methods names, but only a single name. A service can have multiple method names, but only a single
service name. service name.
""" """
@abc.abstractmethod @abc.abstractmethod
def service_name(self): def service_name(self):
"""Returns this services name. """Returns this service's name.
Returns: Returns:
The service name. The service name.
@ -900,88 +919,78 @@ class Server(six.with_metaclass(abc.ABCMeta)):
Args: Args:
generic_rpc_handlers: An iterable of GenericRpcHandlers that will be used generic_rpc_handlers: An iterable of GenericRpcHandlers that will be used
to service RPCs after this Server is started. to service RPCs.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def add_insecure_port(self, address): def add_insecure_port(self, address):
"""Reserves a port for insecure RPC service once this Server becomes active. """Opens an insecure port for accepting RPCs.
This method may only be called before calling this Server's start method is This method may only be called before starting the server.
called.
Args: Args:
address: The address for which to open a port. address: The address for which to open a port.
if the port is 0, or not specified in the address, then gRPC runtime
will choose a port.
Returns: Returns:
An integer port on which RPCs will be serviced after this link has been integer:
started. This is typically the same number as the port number contained An integer port on which server will accept RPC requests.
in the passed address, but will likely be different if the port number
contained in the passed address was zero.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def add_secure_port(self, address, server_credentials): def add_secure_port(self, address, server_credentials):
"""Reserves a port for secure RPC service after this Server becomes active. """Opens a secure port for accepting RPCs.
This method may only be called before calling this Server's start method is This method may only be called before starting the server.
called.
Args: Args:
address: The address for which to open a port. address: The address for which to open a port.
server_credentials: A ServerCredentials. if the port is 0, or not specified in the address, then gRPC runtime
will choose a port.
server_credentials: A ServerCredentials object.
Returns: Returns:
An integer port on which RPCs will be serviced after this link has been integer:
started. This is typically the same number as the port number contained An integer port on which server will accept RPC requests.
in the passed address, but will likely be different if the port number
contained in the passed address was zero.
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def start(self): def start(self):
"""Starts this Server's service of RPCs. """Starts this Server.
This method may only be called while the server is not serving RPCs (i.e. it This method may only be called once. (i.e. it is not idempotent).
is not idempotent).
""" """
raise NotImplementedError() raise NotImplementedError()
@abc.abstractmethod @abc.abstractmethod
def stop(self, grace): def stop(self, grace):
"""Stops this Server's service of RPCs. """Stops this Server.
All calls to this method immediately stop service of new RPCs. When existing This method immediately stop service of new RPCs in all cases.
RPCs are aborted is controlled by the grace period parameter passed to this If a grace period is specified, this method returns immediately
method. and all RPCs active at the end of the grace period are aborted.
This method may be called at any time and is idempotent. Passing a smaller If a grace period is not specified, then all existing RPCs are
grace value than has been passed in a previous call will have the effect of teriminated immediately and the this method blocks until the last
stopping the Server sooner. Passing a larger grace value than has been RPC handler terminates.
passed in a previous call will not have the effect of stopping the server
later.
This method does not block for any significant length of time. If None is This method is idempotent and may be called at any time. Passing a smaller
passed as the grace value, existing RPCs are immediately aborted and this grace value in subsequentcall will have the effect of stopping the Server
method blocks until this Server is completely stopped. sooner. Passing a larger grace value in subsequent call *will not* have the
effect of stopping the server later (i.e. the most restrictive grace
value is used).
Args: Args:
grace: A duration of time in seconds or None. If a duration of time in grace: A duration of time in seconds or None.
seconds, the time to allow existing RPCs to complete before being
aborted by this Server's stopping. If None, all RPCs will be aborted
immediately and this method will block until this Server is completely
stopped.
Returns: Returns:
A threading.Event that will be set when this Server has completely A threading.Event that will be set when this Server has completely
stopped. The returned event may not be set until after the full grace stopped, i.e. when running RPCs either complete or are aborted and
period (if some ongoing RPC continues for the full length of the period) all handlers have terminated.
of it may be set much sooner (such as if this Server had no RPCs underway
at the time it was stopped or if all RPCs that it had underway completed
very early in the grace period).
""" """
raise NotImplementedError() raise NotImplementedError()
@ -995,14 +1004,13 @@ def unary_unary_rpc_method_handler(behavior,
"""Creates an RpcMethodHandler for a unary-unary RPC method. """Creates an RpcMethodHandler for a unary-unary RPC method.
Args: Args:
behavior: The implementation of an RPC method as a callable behavior taking behavior: The implementation of an RPC that accepts one request and returns
a single request value and returning a single response value. one response.
request_deserializer: An optional request deserialization behavior. request_deserializer: An optional behavior for request deserialization.
response_serializer: An optional response serialization behavior. response_serializer: An optional behavior for response serialization.
Returns: Returns:
An RpcMethodHandler for a unary-unary RPC method constructed from the given An RpcMethodHandler object that is typically used by grpc.Server.
parameters.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.RpcMethodHandler(False, False, request_deserializer, return _utilities.RpcMethodHandler(False, False, request_deserializer,
@ -1016,14 +1024,13 @@ def unary_stream_rpc_method_handler(behavior,
"""Creates an RpcMethodHandler for a unary-stream RPC method. """Creates an RpcMethodHandler for a unary-stream RPC method.
Args: Args:
behavior: The implementation of an RPC method as a callable behavior taking behavior: The implementation of an RPC that accepts one request and returns
a single request value and returning an iterator of response values. an iterator of response values.
request_deserializer: An optional request deserialization behavior. request_deserializer: An optional behavior for request deserialization.
response_serializer: An optional response serialization behavior. response_serializer: An optional behavior for response serialization.
Returns: Returns:
An RpcMethodHandler for a unary-stream RPC method constructed from the An RpcMethodHandler object that is typically used by grpc.Server.
given parameters.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.RpcMethodHandler(False, True, request_deserializer, return _utilities.RpcMethodHandler(False, True, request_deserializer,
@ -1037,14 +1044,13 @@ def stream_unary_rpc_method_handler(behavior,
"""Creates an RpcMethodHandler for a stream-unary RPC method. """Creates an RpcMethodHandler for a stream-unary RPC method.
Args: Args:
behavior: The implementation of an RPC method as a callable behavior taking behavior: The implementation of an RPC that accepts an iterator of request
an iterator of request values and returning a single response value. values and returns a single response value.
request_deserializer: An optional request deserialization behavior. request_deserializer: An optional behavior for request deserialization.
response_serializer: An optional response serialization behavior. response_serializer: An optional behavior for response serialization.
Returns: Returns:
An RpcMethodHandler for a stream-unary RPC method constructed from the An RpcMethodHandler object that is typically used by grpc.Server.
given parameters.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.RpcMethodHandler(True, False, request_deserializer, return _utilities.RpcMethodHandler(True, False, request_deserializer,
@ -1058,15 +1064,13 @@ def stream_stream_rpc_method_handler(behavior,
"""Creates an RpcMethodHandler for a stream-stream RPC method. """Creates an RpcMethodHandler for a stream-stream RPC method.
Args: Args:
behavior: The implementation of an RPC method as a callable behavior taking behavior: The implementation of an RPC that accepts an iterator of request
an iterator of request values and returning an iterator of response values and returns an iterator of response values.
values. request_deserializer: An optional behavior for request deserialization.
request_deserializer: An optional request deserialization behavior. response_serializer: An optional behavior for response serialization.
response_serializer: An optional response serialization behavior.
Returns: Returns:
An RpcMethodHandler for a stream-stream RPC method constructed from the An RpcMethodHandler object that is typically used by grpc.Server.
given parameters.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.RpcMethodHandler(True, True, request_deserializer, return _utilities.RpcMethodHandler(True, True, request_deserializer,
@ -1075,15 +1079,16 @@ def stream_stream_rpc_method_handler(behavior,
def method_handlers_generic_handler(service, method_handlers): def method_handlers_generic_handler(service, method_handlers):
"""Creates a grpc.GenericRpcHandler from RpcMethodHandlers. """Creates a GenericRpcHandler from RpcMethodHandlers.
Args: Args:
service: A service name to be used for the given method handlers. service: The name of the service that is implemented by the method_handlers.
method_handlers: A dictionary from method name to RpcMethodHandler method_handlers: A dictionary that maps method names to corresponding
implementing the named method. RpcMethodHandler.
Returns: Returns:
A GenericRpcHandler constructed from the given parameters. A GenericRpcHandler. This is typically added to the grpc.Server object
with add_generic_rpc_handlers() before starting the server.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.DictionaryGenericHandler(service, method_handlers) return _utilities.DictionaryGenericHandler(service, method_handlers)
@ -1095,12 +1100,12 @@ def ssl_channel_credentials(root_certificates=None,
"""Creates a ChannelCredentials for use with an SSL-enabled Channel. """Creates a ChannelCredentials for use with an SSL-enabled Channel.
Args: Args:
root_certificates: The PEM-encoded root certificates or unset to ask for root_certificates: The PEM-encoded root certificates as a byte string,
them to be retrieved from a default location. or None to retrieve them from a default location chosen by gRPC runtime.
private_key: The PEM-encoded private key to use or unset if no private key private_key: The PEM-encoded private key as a byte string, or None if no
should be used. private key should be used.
certificate_chain: The PEM-encoded certificate chain to use or unset if no certificate_chain: The PEM-encoded certificate chain as a byte string
certificate chain should be used. to use or or None if no certificate chain should be used.
Returns: Returns:
A ChannelCredentials for use with an SSL-enabled Channel. A ChannelCredentials for use with an SSL-enabled Channel.
@ -1117,9 +1122,8 @@ def metadata_call_credentials(metadata_plugin, name=None):
"""Construct CallCredentials from an AuthMetadataPlugin. """Construct CallCredentials from an AuthMetadataPlugin.
Args: Args:
metadata_plugin: An AuthMetadataPlugin to use as the authentication behavior metadata_plugin: An AuthMetadataPlugin to use for authentication.
in the created CallCredentials. name: An optional name for the plugin.
name: A name for the plugin.
Returns: Returns:
A CallCredentials. A CallCredentials.
@ -1142,7 +1146,8 @@ def access_token_call_credentials(access_token):
Args: Args:
access_token: A string to place directly in the http request access_token: A string to place directly in the http request
authorization header, ie "authorization: Bearer <access_token>". authorization header, for example
"authorization: Bearer <access_token>".
Returns: Returns:
A CallCredentials. A CallCredentials.
@ -1173,12 +1178,12 @@ def composite_channel_credentials(channel_credentials, *call_credentials):
"""Compose a ChannelCredentials and one or more CallCredentials objects. """Compose a ChannelCredentials and one or more CallCredentials objects.
Args: Args:
channel_credentials: A ChannelCredentials. channel_credentials: A ChannelCredentials object.
*call_credentials: One or more CallCredentials objects. *call_credentials: One or more CallCredentials objects.
Returns: Returns:
A ChannelCredentials composed of the given ChannelCredentials and A ChannelCredentials composed of the given ChannelCredentials and
CallCredentials objects. CallCredentials objects.
""" """
from grpc import _credential_composition # pylint: disable=cyclic-import from grpc import _credential_composition # pylint: disable=cyclic-import
cygrpc_call_credentials = tuple( cygrpc_call_credentials = tuple(
@ -1195,18 +1200,18 @@ def ssl_server_credentials(private_key_certificate_chain_pairs,
"""Creates a ServerCredentials for use with an SSL-enabled Server. """Creates a ServerCredentials for use with an SSL-enabled Server.
Args: Args:
private_key_certificate_chain_pairs: A nonempty sequence each element of private_key_certificate_chain_pairs: A list of pairs of the form
which is a pair the first element of which is a PEM-encoded private key [PEM-encoded private key, PEM-encoded certificate chain].
and the second element of which is the corresponding PEM-encoded root_certificates: An optional byte string of PEM-encoded client root
certificate chain. certificates that the server will use to verify client authentication.
root_certificates: PEM-encoded client root certificates to be used for If omitted, require_client_auth must also be False.
verifying authenticated clients. If omitted, require_client_auth must also require_client_auth: A boolean indicating whether or not to require
be omitted or be False. clients to be authenticated. May only be True if root_certificates
require_client_auth: A boolean indicating whether or not to require clients is not None.
to be authenticated. May only be True if root_certificates is not None.
Returns: Returns:
A ServerCredentials for use with an SSL-enabled Server. A ServerCredentials for use with an SSL-enabled Server. Typically, this
object is an argument to add_secure_port() method during server setup.
""" """
if len(private_key_certificate_chain_pairs) == 0: if len(private_key_certificate_chain_pairs) == 0:
raise ValueError( raise ValueError(
@ -1224,18 +1229,17 @@ def ssl_server_credentials(private_key_certificate_chain_pairs,
def channel_ready_future(channel): def channel_ready_future(channel):
"""Creates a Future tracking when a Channel is ready. """Creates a Future that tracks when a Channel is ready.
Cancelling the returned Future does not tell the given Channel to abandon Cancelling the Future does not affect the channel's state machine.
attempts it may have been making to connect; cancelling merely deactivates the It merely decouples the Future from channel state machine.
returned Future's subscription to the given Channel's connectivity.
Args: Args:
channel: A Channel. channel: A Channel object.
Returns: Returns:
A Future that matures when the given Channel has connectivity A Future object that matures when the channel connectivity is
ChannelConnectivity.READY. ChannelConnectivity.READY.
""" """
from grpc import _utilities # pylint: disable=cyclic-import from grpc import _utilities # pylint: disable=cyclic-import
return _utilities.channel_ready_future(channel) return _utilities.channel_ready_future(channel)
@ -1245,12 +1249,12 @@ def insecure_channel(target, options=None):
"""Creates an insecure Channel to a server. """Creates an insecure Channel to a server.
Args: Args:
target: The target to which to connect. target: The server address
options: A sequence of string-value pairs according to which to configure options: An optional list of key-value pairs (channel args in gRPC runtime)
the created channel. to configure the channel.
Returns: Returns:
A Channel to the target through which RPCs may be conducted. A Channel object.
""" """
from grpc import _channel # pylint: disable=cyclic-import from grpc import _channel # pylint: disable=cyclic-import
return _channel.Channel(target, () if options is None else options, None) return _channel.Channel(target, () if options is None else options, None)
@ -1260,13 +1264,13 @@ def secure_channel(target, credentials, options=None):
"""Creates a secure Channel to a server. """Creates a secure Channel to a server.
Args: Args:
target: The target to which to connect. target: The server address.
credentials: A ChannelCredentials instance. credentials: A ChannelCredentials instance.
options: A sequence of string-value pairs according to which to configure options: An optional list of key-value pairs (channel args in gRPC runtime)
the created channel. to configure the channel.
Returns: Returns:
A Channel to the target through which RPCs may be conducted. A Channel object.
""" """
from grpc import _channel # pylint: disable=cyclic-import from grpc import _channel # pylint: disable=cyclic-import
return _channel.Channel(target, () if options is None else options, return _channel.Channel(target, () if options is None else options,
@ -1280,21 +1284,19 @@ def server(thread_pool,
"""Creates a Server with which RPCs can be serviced. """Creates a Server with which RPCs can be serviced.
Args: Args:
thread_pool: A futures.ThreadPoolExecutor to be used by the returned Server thread_pool: A futures.ThreadPoolExecutor to be used by the Server
to service RPCs. to execute RPC handlers.
handlers: An optional sequence of GenericRpcHandlers to be used to service handlers: An optional list of GenericRpcHandlers used for executing RPCs.
RPCs after the returned Server is started. These handlers need not be the More handlers may be added by calling add_generic_rpc_handlers any time
only handlers the server will use to service RPCs; other handlers may before the server is started.
later be added by calling add_generic_rpc_handlers any time before the options: An optional list of key-value pairs (channel args in gRPC runtime)
returned Server is started. to configure the channel.
options: A sequence of string-value pairs according to which to configure
the created server.
maximum_concurrent_rpcs: The maximum number of concurrent RPCs this server maximum_concurrent_rpcs: The maximum number of concurrent RPCs this server
will service before returning status RESOURCE_EXHAUSTED, or None to will service before returning RESOURCE_EXHAUSTED status, or None to
indicate no limit. indicate no limit.
Returns: Returns:
A Server with which RPCs can be serviced. A Server object.
""" """
from grpc import _server # pylint: disable=cyclic-import from grpc import _server # pylint: disable=cyclic-import
return _server.Server(thread_pool, () if handlers is None else handlers, () return _server.Server(thread_pool, () if handlers is None else handlers, ()

@ -37,9 +37,16 @@ cdef int _INTERRUPT_CHECK_PERIOD_MS = 200
cdef class CompletionQueue: cdef class CompletionQueue:
def __cinit__(self): def __cinit__(self, shutdown_cq=False):
cdef grpc_completion_queue_attributes c_attrs
grpc_init() grpc_init()
with nogil: if shutdown_cq:
c_attrs.version = 1
c_attrs.cq_completion_type = GRPC_CQ_NEXT
c_attrs.cq_polling_type = GRPC_CQ_NON_LISTENING
self.c_completion_queue = grpc_completion_queue_create(
grpc_completion_queue_factory_lookup(&c_attrs), &c_attrs, NULL);
else:
self.c_completion_queue = grpc_completion_queue_create_for_next(NULL) self.c_completion_queue = grpc_completion_queue_create_for_next(NULL)
self.is_shutting_down = False self.is_shutting_down = False
self.is_shutdown = False self.is_shutdown = False

@ -217,6 +217,20 @@ cdef extern from "grpc/grpc.h":
GRPC_CALL_ERROR_INVALID_FLAGS GRPC_CALL_ERROR_INVALID_FLAGS
GRPC_CALL_ERROR_INVALID_METADATA GRPC_CALL_ERROR_INVALID_METADATA
ctypedef enum grpc_cq_completion_type:
GRPC_CQ_NEXT
GRPC_CQ_PLUCK
ctypedef enum grpc_cq_polling_type:
GRPC_CQ_DEFAULT_POLLING
GRPC_CQ_NON_LISTENING
GRPC_CQ_NON_POLLING
ctypedef struct grpc_completion_queue_attributes:
int version
grpc_cq_completion_type cq_completion_type
grpc_cq_polling_type cq_polling_type
ctypedef enum grpc_connectivity_state: ctypedef enum grpc_connectivity_state:
GRPC_CHANNEL_IDLE GRPC_CHANNEL_IDLE
GRPC_CHANNEL_CONNECTING GRPC_CHANNEL_CONNECTING
@ -309,6 +323,14 @@ cdef extern from "grpc/grpc.h":
void grpc_init() nogil void grpc_init() nogil
void grpc_shutdown() nogil void grpc_shutdown() nogil
ctypedef struct grpc_completion_queue_factory:
pass
grpc_completion_queue_factory *grpc_completion_queue_factory_lookup(
const grpc_completion_queue_attributes* attributes) nogil
grpc_completion_queue *grpc_completion_queue_create(
const grpc_completion_queue_factory* factory,
const grpc_completion_queue_attributes* attr, void* reserved) nogil
grpc_completion_queue *grpc_completion_queue_create_for_next(void *reserved) nogil grpc_completion_queue *grpc_completion_queue_create_for_next(void *reserved) nogil
grpc_event grpc_completion_queue_next(grpc_completion_queue *cq, grpc_event grpc_completion_queue_next(grpc_completion_queue *cq,

@ -85,7 +85,7 @@ cdef class Server:
def start(self): def start(self):
if self.is_started: if self.is_started:
raise ValueError("the server has already started") raise ValueError("the server has already started")
self.backup_shutdown_queue = CompletionQueue() self.backup_shutdown_queue = CompletionQueue(shutdown_cq=True)
self.register_completion_queue(self.backup_shutdown_queue) self.register_completion_queue(self.backup_shutdown_queue)
self.is_started = True self.is_started = True
with nogil: with nogil:

@ -41,15 +41,16 @@
{ {
'variables': { 'variables': {
'runtime%': 'node', 'runtime%': 'node',
# UV integration in C core is enabled by default. It can be disabled
# by setting this argument to anything else.
'grpc_uv%': 'true',
# Some Node installations use the system installation of OpenSSL, and on # Some Node installations use the system installation of OpenSSL, and on
# some systems, the system OpenSSL still does not have ALPN support. This # some systems, the system OpenSSL still does not have ALPN support. This
# will let users recompile gRPC to work without ALPN. # will let users recompile gRPC to work without ALPN.
'grpc_alpn%': 'true', 'grpc_alpn%': 'true',
# Indicates that the library should be built with gcov. # Indicates that the library should be built with gcov.
'grpc_gcov%': 'false' 'grpc_gcov%': 'false',
# Indicates that the library should be built with compatibility for musl
# libc, so that it can run on Alpine Linux. This is only necessary if not
# building on Alpine Linux
'grpc_alpine%': 'false'
}, },
'target_defaults': { 'target_defaults': {
'configurations': { 'configurations': {
@ -83,17 +84,11 @@
'include' 'include'
], ],
'defines': [ 'defines': [
'GPR_BACKWARDS_COMPATIBILITY_MODE' 'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0',
'GRPC_UV'
], ],
'conditions': [ 'conditions': [
['grpc_uv=="true"', {
'defines': [
'GRPC_ARES=0',
# Disabling this while bugs are ironed out. Uncomment this to
# re-enable libuv integration in C core.
'GRPC_UV'
]
}],
['grpc_gcov=="true"', { ['grpc_gcov=="true"', {
% for arg, prop in [('CPPFLAGS', 'cflags'), ('DEFINES', 'defines'), ('LDFLAGS', 'ldflags')]: % for arg, prop in [('CPPFLAGS', 'cflags'), ('DEFINES', 'defines'), ('LDFLAGS', 'ldflags')]:
% if configs['gcov'].get(arg, None) is not None: % if configs['gcov'].get(arg, None) is not None:
@ -105,6 +100,11 @@
% endif % endif
% endfor % endfor
}], }],
['grpc_alpine=="true"', {
'defines': [
'GPR_MUSL_LIBC_COMPAT'
]
}],
['OS!="win" and runtime=="electron"', { ['OS!="win" and runtime=="electron"', {
"defines": [ "defines": [
'OPENSSL_NO_THREADS' 'OPENSSL_NO_THREADS'
@ -233,6 +233,10 @@
} }
] ]
}, },
]
}],
['OS == "win"', {
'targets': [
# Only want to compile zlib under Windows # Only want to compile zlib under Windows
% for module in node_modules: % for module in node_modules:
% for lib in libs: % for lib in libs:
@ -264,13 +268,6 @@
}] }]
], ],
'targets': [ 'targets': [
<%
for lib in libs:
if 'grpc' in lib.transitive_deps or lib.name == 'grpc':
lib.deps.append('node_modules/cares/deps/cares/cares.gyp:cares')
for module in node_modules:
module.deps.append('node_modules/cares/deps/cares/cares.gyp:cares')
%>
% for module in node_modules: % for module in node_modules:
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name not in ('boringssl', 'z'): % if lib.name in module.transitive_deps and lib.name not in ('boringssl', 'z'):

@ -36,8 +36,7 @@
"lodash": "^4.15.0", "lodash": "^4.15.0",
"nan": "^2.0.0", "nan": "^2.0.0",
"node-pre-gyp": "^0.6.0", "node-pre-gyp": "^0.6.0",
"protobufjs": "^6.7.0", "protobufjs": "^6.7.0"
"cares": "^1.1.5"
}, },
"devDependencies": { "devDependencies": {
"async": "^2.0.1", "async": "^2.0.1",

@ -189,23 +189,6 @@ int byte_buffer_eq_string(grpc_byte_buffer *bb, const char *str) {
return res; return res;
} }
static void verify_matches(expectation *e, grpc_event *ev) {
GPR_ASSERT(e->type == ev->type);
switch (e->type) {
case GRPC_QUEUE_SHUTDOWN:
gpr_log(GPR_ERROR, "premature queue shutdown");
abort();
break;
case GRPC_OP_COMPLETE:
GPR_ASSERT(e->success == ev->success);
break;
case GRPC_QUEUE_TIMEOUT:
gpr_log(GPR_ERROR, "not implemented");
abort();
break;
}
}
static void expectation_to_strvec(gpr_strvec *buf, expectation *e) { static void expectation_to_strvec(gpr_strvec *buf, expectation *e) {
char *tmp; char *tmp;
@ -214,7 +197,7 @@ static void expectation_to_strvec(gpr_strvec *buf, expectation *e) {
switch (e->type) { switch (e->type) {
case GRPC_OP_COMPLETE: case GRPC_OP_COMPLETE:
gpr_asprintf(&tmp, "GRPC_OP_COMPLETE result=%d %s:%d", e->success, gpr_asprintf(&tmp, "GRPC_OP_COMPLETE success=%d %s:%d", e->success,
e->file, e->line); e->file, e->line);
gpr_strvec_add(buf, tmp); gpr_strvec_add(buf, tmp);
break; break;
@ -248,6 +231,32 @@ static void fail_no_event_received(cq_verifier *v) {
abort(); abort();
} }
static void verify_matches(expectation *e, grpc_event *ev) {
GPR_ASSERT(e->type == ev->type);
switch (e->type) {
case GRPC_OP_COMPLETE:
if (e->success != ev->success) {
gpr_strvec expected;
gpr_strvec_init(&expected);
expectation_to_strvec(&expected, e);
char *s = gpr_strvec_flatten(&expected, NULL);
gpr_strvec_destroy(&expected);
gpr_log(GPR_ERROR, "actual success does not match expected: %s", s);
gpr_free(s);
abort();
}
break;
case GRPC_QUEUE_SHUTDOWN:
gpr_log(GPR_ERROR, "premature queue shutdown");
abort();
break;
case GRPC_QUEUE_TIMEOUT:
gpr_log(GPR_ERROR, "not implemented");
abort();
break;
}
}
void cq_verify(cq_verifier *v) { void cq_verify(cq_verifier *v) {
const gpr_timespec deadline = grpc_timeout_seconds_to_deadline(10); const gpr_timespec deadline = grpc_timeout_seconds_to_deadline(10);
while (v->first_expectation != NULL) { while (v->first_expectation != NULL) {

@ -33,6 +33,7 @@
#include "src/core/lib/transport/bdp_estimator.h" #include "src/core/lib/transport/bdp_estimator.h"
#include <grpc/grpc.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
@ -64,6 +65,8 @@ static void add_samples(grpc_bdp_estimator *estimator, int64_t *samples,
GPR_ASSERT(grpc_bdp_estimator_add_incoming_bytes(estimator, samples[i]) == GPR_ASSERT(grpc_bdp_estimator_add_incoming_bytes(estimator, samples[i]) ==
false); false);
} }
gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
gpr_time_from_millis(1, GPR_TIMESPAN)));
grpc_bdp_estimator_complete_ping(estimator); grpc_bdp_estimator_complete_ping(estimator);
} }
@ -123,24 +126,25 @@ static void test_get_estimate_random_values(size_t n) {
gpr_log(GPR_INFO, "test_get_estimate_random_values(%" PRIdPTR ")", n); gpr_log(GPR_INFO, "test_get_estimate_random_values(%" PRIdPTR ")", n);
grpc_bdp_estimator est; grpc_bdp_estimator est;
grpc_bdp_estimator_init(&est, "test"); grpc_bdp_estimator_init(&est, "test");
int min = INT_MAX; const int kMaxSample = 65535;
int max = 65535; // Windows rand() has limited range, make sure the ASSERT int min = kMaxSample;
// passes int max = 0;
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
int sample = rand(); int sample = rand() % (kMaxSample + 1);
if (sample < min) min = sample; if (sample < min) min = sample;
if (sample > max) max = sample; if (sample > max) max = sample;
add_sample(&est, sample); add_sample(&est, sample);
if (i >= 3) { if (i >= 3) {
gpr_log(GPR_DEBUG, "est:%" PRId64 " min:%d max:%d", get_estimate(&est), gpr_log(GPR_DEBUG, "est:%" PRId64 " min:%d max:%d", get_estimate(&est),
min, max); min, max);
GPR_ASSERT(get_estimate(&est) <= 2 * next_pow_2(max)); GPR_ASSERT(get_estimate(&est) <= GPR_MAX(65536, 2 * next_pow_2(max)));
} }
} }
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
grpc_test_init(argc, argv); grpc_test_init(argc, argv);
grpc_init();
test_noop(); test_noop();
test_get_estimate_no_samples(); test_get_estimate_no_samples();
test_get_estimate_1_sample(); test_get_estimate_1_sample();
@ -149,5 +153,6 @@ int main(int argc, char **argv) {
for (size_t i = 3; i < 1000; i = i * 3 / 2) { for (size_t i = 3; i < 1000; i = i * 3 / 2) {
test_get_estimate_random_values(i); test_get_estimate_random_values(i);
} }
grpc_shutdown();
return 0; return 0;
} }

@ -44,6 +44,8 @@
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_internal.h"
#define WRITE_BUFFER_SIZE (2 * 1024 * 1024)
typedef struct { typedef struct {
grpc_endpoint base; grpc_endpoint base;
double bytes_per_second; double bytes_per_second;
@ -55,6 +57,7 @@ typedef struct {
grpc_slice_buffer writing_buffer; grpc_slice_buffer writing_buffer;
grpc_error *error; grpc_error *error;
bool writing; bool writing;
grpc_closure *write_cb;
} trickle_endpoint; } trickle_endpoint;
static void te_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, static void te_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep,
@ -63,10 +66,20 @@ static void te_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep,
grpc_endpoint_read(exec_ctx, te->wrapped, slices, cb); grpc_endpoint_read(exec_ctx, te->wrapped, slices, cb);
} }
static void maybe_call_write_cb_locked(grpc_exec_ctx *exec_ctx,
trickle_endpoint *te) {
if (te->write_cb != NULL && (te->error != GRPC_ERROR_NONE ||
te->write_buffer.length <= WRITE_BUFFER_SIZE)) {
grpc_closure_sched(exec_ctx, te->write_cb, GRPC_ERROR_REF(te->error));
te->write_cb = NULL;
}
}
static void te_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, static void te_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep,
grpc_slice_buffer *slices, grpc_closure *cb) { grpc_slice_buffer *slices, grpc_closure *cb) {
trickle_endpoint *te = (trickle_endpoint *)ep; trickle_endpoint *te = (trickle_endpoint *)ep;
gpr_mu_lock(&te->mu); gpr_mu_lock(&te->mu);
GPR_ASSERT(te->write_cb == NULL);
if (te->write_buffer.length == 0) { if (te->write_buffer.length == 0) {
te->last_write = gpr_now(GPR_CLOCK_MONOTONIC); te->last_write = gpr_now(GPR_CLOCK_MONOTONIC);
} }
@ -74,7 +87,8 @@ static void te_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep,
grpc_slice_buffer_add(&te->write_buffer, grpc_slice_buffer_add(&te->write_buffer,
grpc_slice_copy(slices->slices[i])); grpc_slice_copy(slices->slices[i]));
} }
grpc_closure_sched(exec_ctx, cb, GRPC_ERROR_REF(te->error)); te->write_cb = cb;
maybe_call_write_cb_locked(exec_ctx, te);
gpr_mu_unlock(&te->mu); gpr_mu_unlock(&te->mu);
} }
@ -102,6 +116,7 @@ static void te_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep,
if (te->error == GRPC_ERROR_NONE) { if (te->error == GRPC_ERROR_NONE) {
te->error = GRPC_ERROR_REF(why); te->error = GRPC_ERROR_REF(why);
} }
maybe_call_write_cb_locked(exec_ctx, te);
gpr_mu_unlock(&te->mu); gpr_mu_unlock(&te->mu);
grpc_endpoint_shutdown(exec_ctx, te->wrapped, why); grpc_endpoint_shutdown(exec_ctx, te->wrapped, why);
} }
@ -157,6 +172,7 @@ grpc_endpoint *grpc_trickle_endpoint_create(grpc_endpoint *wrap,
te->base.vtable = &vtable; te->base.vtable = &vtable;
te->wrapped = wrap; te->wrapped = wrap;
te->bytes_per_second = bytes_per_second; te->bytes_per_second = bytes_per_second;
te->write_cb = NULL;
gpr_mu_init(&te->mu); gpr_mu_init(&te->mu);
grpc_slice_buffer_init(&te->write_buffer); grpc_slice_buffer_init(&te->write_buffer);
grpc_slice_buffer_init(&te->writing_buffer); grpc_slice_buffer_init(&te->writing_buffer);
@ -187,9 +203,18 @@ size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx,
grpc_endpoint_write( grpc_endpoint_write(
exec_ctx, te->wrapped, &te->writing_buffer, exec_ctx, te->wrapped, &te->writing_buffer,
grpc_closure_create(te_finish_write, te, grpc_schedule_on_exec_ctx)); grpc_closure_create(te_finish_write, te, grpc_schedule_on_exec_ctx));
maybe_call_write_cb_locked(exec_ctx, te);
} }
} }
size_t backlog = te->write_buffer.length; size_t backlog = te->write_buffer.length;
gpr_mu_unlock(&te->mu); gpr_mu_unlock(&te->mu);
return backlog; return backlog;
} }
size_t grpc_trickle_get_backlog(grpc_endpoint *ep) {
trickle_endpoint *te = (trickle_endpoint *)ep;
gpr_mu_lock(&te->mu);
size_t backlog = te->write_buffer.length;
gpr_mu_unlock(&te->mu);
return backlog;
}

@ -43,4 +43,6 @@ grpc_endpoint *grpc_trickle_endpoint_create(grpc_endpoint *wrap,
size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx, size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx,
grpc_endpoint *endpoint); grpc_endpoint *endpoint);
size_t grpc_trickle_get_backlog(grpc_endpoint *endpoint);
#endif #endif

@ -50,6 +50,10 @@ TEST_F(CredentialsTest, InvalidGoogleRefreshToken) {
EXPECT_EQ(static_cast<CallCredentials*>(nullptr), bad1.get()); EXPECT_EQ(static_cast<CallCredentials*>(nullptr), bad1.get());
} }
TEST_F(CredentialsTest, DefaultCredentials) {
auto creds = GoogleDefaultCredentials();
}
} // namespace testing } // namespace testing
} // namespace grpc } // namespace grpc

@ -69,6 +69,9 @@ namespace testing {
// ServiceA leading comment 1 // ServiceA leading comment 1
class ServiceA final { class ServiceA final {
public: public:
static constexpr char const* service_full_name() {
return "grpc.testing.ServiceA";
}
class StubInterface { class StubInterface {
public: public:
virtual ~StubInterface() {} virtual ~StubInterface() {}
@ -373,6 +376,9 @@ class ServiceA final {
// ServiceB leading comment 1 // ServiceB leading comment 1
class ServiceB final { class ServiceB final {
public: public:
static constexpr char const* service_full_name() {
return "grpc.testing.ServiceB";
}
class StubInterface { class StubInterface {
public: public:
virtual ~StubInterface() {} virtual ~StubInterface() {}

@ -469,6 +469,8 @@ class SingleBalancerTest : public GrpclbEnd2endTest {
TEST_F(SingleBalancerTest, Vanilla) { TEST_F(SingleBalancerTest, Vanilla) {
ScheduleResponseForBalancer( ScheduleResponseForBalancer(
0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts()), 0); 0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts()), 0);
// Make sure that trying to connect works without a call.
channel_->GetState(true /* try_to_connect */);
// Start servers and send 100 RPCs per server. // Start servers and send 100 RPCs per server.
const auto& statuses_and_responses = SendRpc(kMessage_, 100 * num_backends_); const auto& statuses_and_responses = SendRpc(kMessage_, 100 * num_backends_);

@ -92,7 +92,7 @@ cc_test(
cc_test( cc_test(
name = "bm_fullstack_trickle", name = "bm_fullstack_trickle",
srcs = ["bm_fullstack_trickle.cc"], srcs = ["bm_fullstack_trickle.cc"],
deps = [":helpers"], deps = [":helpers", "//external:gflags"],
) )
cc_test( cc_test(

@ -34,6 +34,8 @@
/* Benchmark gRPC end2end in various configurations */ /* Benchmark gRPC end2end in various configurations */
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
#include <gflags/gflags.h>
#include <fstream>
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/cpp/client/create_channel_internal.h" #include "src/cpp/client/create_channel_internal.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h"
@ -45,16 +47,57 @@ extern "C" {
#include "test/core/util/trickle_endpoint.h" #include "test/core/util/trickle_endpoint.h"
} }
DEFINE_bool(log, false, "Log state to CSV files");
DEFINE_int32(
warmup_megabytes, 1,
"Number of megabytes to pump before collecting flow control stats");
DEFINE_int32(
warmup_iterations, 100,
"Number of megabytes to pump before collecting flow control stats");
DEFINE_int32(warmup_max_time_seconds, 10,
"Maximum number of seconds to run warmup loop");
namespace grpc { namespace grpc {
namespace testing { namespace testing {
static void* tag(intptr_t x) { return reinterpret_cast<void*>(x); } static void* tag(intptr_t x) { return reinterpret_cast<void*>(x); }
template <class A0>
static void write_csv(std::ostream* out, A0&& a0) {
if (!out) return;
(*out) << a0 << "\n";
}
template <class A0, class... Arg>
static void write_csv(std::ostream* out, A0&& a0, Arg&&... arg) {
if (!out) return;
(*out) << a0 << ",";
write_csv(out, std::forward<Arg>(arg)...);
}
class TrickledCHTTP2 : public EndpointPairFixture { class TrickledCHTTP2 : public EndpointPairFixture {
public: public:
TrickledCHTTP2(Service* service, size_t megabits_per_second) TrickledCHTTP2(Service* service, size_t message_size,
: EndpointPairFixture(service, MakeEndpoints(megabits_per_second), size_t kilobits_per_second)
FixtureConfiguration()) {} : EndpointPairFixture(service, MakeEndpoints(kilobits_per_second),
FixtureConfiguration()) {
if (FLAGS_log) {
std::ostringstream fn;
fn << "trickle." << message_size << "." << kilobits_per_second << ".csv";
log_.reset(new std::ofstream(fn.str().c_str()));
write_csv(log_.get(), "t", "iteration", "client_backlog",
"server_backlog", "client_t_stall", "client_s_stall",
"server_t_stall", "server_s_stall", "client_t_outgoing",
"server_t_outgoing", "client_t_incoming", "server_t_incoming",
"client_s_outgoing_delta", "server_s_outgoing_delta",
"client_s_incoming_delta", "server_s_incoming_delta",
"client_s_announce_window", "server_s_announce_window",
"client_peer_iws", "client_local_iws", "client_sent_iws",
"client_acked_iws", "server_peer_iws", "server_local_iws",
"server_sent_iws", "server_acked_iws", "client_queued_bytes",
"server_queued_bytes");
}
}
void AddToLabel(std::ostream& out, benchmark::State& state) { void AddToLabel(std::ostream& out, benchmark::State& state) {
out << " writes/iter:" out << " writes/iter:"
@ -75,7 +118,58 @@ class TrickledCHTTP2 : public EndpointPairFixture {
(double)state.iterations()); (double)state.iterations());
} }
void Step() { void Log(int64_t iteration) {
auto now = gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), start_);
grpc_chttp2_transport* client =
reinterpret_cast<grpc_chttp2_transport*>(client_transport_);
grpc_chttp2_transport* server =
reinterpret_cast<grpc_chttp2_transport*>(server_transport_);
grpc_chttp2_stream* client_stream =
client->stream_map.count == 1
? static_cast<grpc_chttp2_stream*>(client->stream_map.values[0])
: nullptr;
grpc_chttp2_stream* server_stream =
server->stream_map.count == 1
? static_cast<grpc_chttp2_stream*>(server->stream_map.values[0])
: nullptr;
write_csv(
log_.get(), static_cast<double>(now.tv_sec) +
1e-9 * static_cast<double>(now.tv_nsec),
iteration, grpc_trickle_get_backlog(endpoint_pair_.client),
grpc_trickle_get_backlog(endpoint_pair_.server),
client->lists[GRPC_CHTTP2_LIST_STALLED_BY_TRANSPORT].head != nullptr,
client->lists[GRPC_CHTTP2_LIST_STALLED_BY_STREAM].head != nullptr,
server->lists[GRPC_CHTTP2_LIST_STALLED_BY_TRANSPORT].head != nullptr,
server->lists[GRPC_CHTTP2_LIST_STALLED_BY_STREAM].head != nullptr,
client->outgoing_window, server->outgoing_window,
client->incoming_window, server->incoming_window,
client_stream ? client_stream->outgoing_window_delta : -1,
server_stream ? server_stream->outgoing_window_delta : -1,
client_stream ? client_stream->incoming_window_delta : -1,
server_stream ? server_stream->incoming_window_delta : -1,
client_stream ? client_stream->announce_window : -1,
server_stream ? server_stream->announce_window : -1,
client->settings[GRPC_PEER_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
client->settings[GRPC_LOCAL_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
client->settings[GRPC_SENT_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
client->settings[GRPC_ACKED_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
server->settings[GRPC_PEER_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
server->settings[GRPC_LOCAL_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
server->settings[GRPC_SENT_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
server->settings[GRPC_ACKED_SETTINGS]
[GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE],
client_stream ? client_stream->flow_controlled_buffer.length : 0,
server_stream ? server_stream->flow_controlled_buffer.length : 0);
}
void Step(bool update_stats) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
size_t client_backlog = size_t client_backlog =
grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client); grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client);
@ -83,10 +177,12 @@ class TrickledCHTTP2 : public EndpointPairFixture {
grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server); grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, if (update_stats) {
client_backlog); UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_,
UpdateStats((grpc_chttp2_transport*)server_transport_, &server_stats_, client_backlog);
server_backlog); UpdateStats((grpc_chttp2_transport*)server_transport_, &server_stats_,
server_backlog);
}
} }
private: private:
@ -97,6 +193,8 @@ class TrickledCHTTP2 : public EndpointPairFixture {
}; };
Stats client_stats_; Stats client_stats_;
Stats server_stats_; Stats server_stats_;
std::unique_ptr<std::ofstream> log_;
gpr_timespec start_ = gpr_now(GPR_CLOCK_MONOTONIC);
grpc_endpoint_pair MakeEndpoints(size_t kilobits) { grpc_endpoint_pair MakeEndpoints(size_t kilobits) {
grpc_endpoint_pair p; grpc_endpoint_pair p;
@ -123,13 +221,15 @@ class TrickledCHTTP2 : public EndpointPairFixture {
// force library initialization // force library initialization
auto& force_library_initialization = Library::get(); auto& force_library_initialization = Library::get();
static void TrickleCQNext(TrickledCHTTP2* fixture, void** t, bool* ok) { static void TrickleCQNext(TrickledCHTTP2* fixture, void** t, bool* ok,
int64_t iteration) {
while (true) { while (true) {
fixture->Log(iteration);
switch (fixture->cq()->AsyncNext( switch (fixture->cq()->AsyncNext(
t, ok, gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), t, ok, gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
gpr_time_from_micros(100, GPR_TIMESPAN)))) { gpr_time_from_micros(100, GPR_TIMESPAN)))) {
case CompletionQueue::TIMEOUT: case CompletionQueue::TIMEOUT:
fixture->Step(); fixture->Step(iteration != -1);
break; break;
case CompletionQueue::SHUTDOWN: case CompletionQueue::SHUTDOWN:
GPR_ASSERT(false); GPR_ASSERT(false);
@ -143,7 +243,7 @@ static void TrickleCQNext(TrickledCHTTP2* fixture, void** t, bool* ok) {
static void BM_PumpStreamServerToClient_Trickle(benchmark::State& state) { static void BM_PumpStreamServerToClient_Trickle(benchmark::State& state) {
EchoTestService::AsyncService service; EchoTestService::AsyncService service;
std::unique_ptr<TrickledCHTTP2> fixture( std::unique_ptr<TrickledCHTTP2> fixture(
new TrickledCHTTP2(&service, state.range(1))); new TrickledCHTTP2(&service, state.range(0), state.range(1)));
{ {
EchoResponse send_response; EchoResponse send_response;
EchoResponse recv_response; EchoResponse recv_response;
@ -163,18 +263,19 @@ static void BM_PumpStreamServerToClient_Trickle(benchmark::State& state) {
void* t; void* t;
bool ok; bool ok;
while (need_tags) { while (need_tags) {
TrickleCQNext(fixture.get(), &t, &ok); TrickleCQNext(fixture.get(), &t, &ok, -1);
GPR_ASSERT(ok); GPR_ASSERT(ok);
int i = (int)(intptr_t)t; int i = (int)(intptr_t)t;
GPR_ASSERT(need_tags & (1 << i)); GPR_ASSERT(need_tags & (1 << i));
need_tags &= ~(1 << i); need_tags &= ~(1 << i);
} }
request_rw->Read(&recv_response, tag(0)); request_rw->Read(&recv_response, tag(0));
while (state.KeepRunning()) { auto inner_loop = [&](bool in_warmup) {
GPR_TIMER_SCOPE("BenchmarkCycle", 0); GPR_TIMER_SCOPE("BenchmarkCycle", 0);
response_rw.Write(send_response, tag(1)); response_rw.Write(send_response, tag(1));
while (true) { while (true) {
TrickleCQNext(fixture.get(), &t, &ok); TrickleCQNext(fixture.get(), &t, &ok,
in_warmup ? -1 : state.iterations());
if (t == tag(0)) { if (t == tag(0)) {
request_rw->Read(&recv_response, tag(0)); request_rw->Read(&recv_response, tag(0));
} else if (t == tag(1)) { } else if (t == tag(1)) {
@ -183,11 +284,26 @@ static void BM_PumpStreamServerToClient_Trickle(benchmark::State& state) {
GPR_ASSERT(false); GPR_ASSERT(false);
} }
} }
};
gpr_timespec warmup_start = gpr_now(GPR_CLOCK_MONOTONIC);
for (int i = 0;
i < GPR_MAX(FLAGS_warmup_iterations, FLAGS_warmup_megabytes * 1024 *
1024 / (14 + state.range(0)));
i++) {
inner_loop(true);
if (gpr_time_cmp(gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), warmup_start),
gpr_time_from_seconds(FLAGS_warmup_max_time_seconds,
GPR_TIMESPAN)) > 0) {
break;
}
}
while (state.KeepRunning()) {
inner_loop(false);
} }
response_rw.Finish(Status::OK, tag(1)); response_rw.Finish(Status::OK, tag(1));
need_tags = (1 << 0) | (1 << 1); need_tags = (1 << 0) | (1 << 1);
while (need_tags) { while (need_tags) {
TrickleCQNext(fixture.get(), &t, &ok); TrickleCQNext(fixture.get(), &t, &ok, -1);
int i = (int)(intptr_t)t; int i = (int)(intptr_t)t;
GPR_ASSERT(need_tags & (1 << i)); GPR_ASSERT(need_tags & (1 << i));
need_tags &= ~(1 << i); need_tags &= ~(1 << i);
@ -204,10 +320,10 @@ static void BM_PumpStreamServerToClient_Trickle(benchmark::State& state) {
static void TrickleArgs(benchmark::internal::Benchmark* b) { static void TrickleArgs(benchmark::internal::Benchmark* b) {
for (int i = 1; i <= 128 * 1024 * 1024; i *= 8) { for (int i = 1; i <= 128 * 1024 * 1024; i *= 8) {
for (int j = 1; j <= 128 * 1024 * 1024; j *= 8) { for (int j = 64; j <= 128 * 1024 * 1024; j *= 8) {
double expected_time = double expected_time =
static_cast<double>(14 + i) / (125.0 * static_cast<double>(j)); static_cast<double>(14 + i) / (125.0 * static_cast<double>(j));
if (expected_time > 0.01) continue; if (expected_time > 2.0) continue;
b->Args({i, j}); b->Args({i, j});
} }
} }
@ -217,4 +333,8 @@ BENCHMARK(BM_PumpStreamServerToClient_Trickle)->Apply(TrickleArgs);
} }
} }
BENCHMARK_MAIN(); int main(int argc, char** argv) {
::benchmark::Initialize(&argc, argv);
::google::ParseCommandLineFlags(&argc, &argv, false);
::benchmark::RunSpecifiedBenchmarks();
}

@ -459,11 +459,8 @@ class ClientImpl : public Client {
create_stub_; create_stub_;
}; };
std::unique_ptr<Client> CreateSynchronousUnaryClient(const ClientConfig& args); std::unique_ptr<Client> CreateSynchronousClient(const ClientConfig& args);
std::unique_ptr<Client> CreateSynchronousStreamingClient( std::unique_ptr<Client> CreateAsyncClient(const ClientConfig& args);
const ClientConfig& args);
std::unique_ptr<Client> CreateAsyncUnaryClient(const ClientConfig& args);
std::unique_ptr<Client> CreateAsyncStreamingClient(const ClientConfig& args);
std::unique_ptr<Client> CreateGenericAsyncStreamingClient( std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
const ClientConfig& args); const ClientConfig& args);

@ -321,9 +321,9 @@ class AsyncUnaryClient final
}; };
template <class RequestType, class ResponseType> template <class RequestType, class ResponseType>
class ClientRpcContextStreamingImpl : public ClientRpcContext { class ClientRpcContextStreamingPingPongImpl : public ClientRpcContext {
public: public:
ClientRpcContextStreamingImpl( ClientRpcContextStreamingPingPongImpl(
BenchmarkService::Stub* stub, const RequestType& req, BenchmarkService::Stub* stub, const RequestType& req,
std::function<gpr_timespec()> next_issue, std::function<gpr_timespec()> next_issue,
std::function<std::unique_ptr< std::function<std::unique_ptr<
@ -341,7 +341,7 @@ class ClientRpcContextStreamingImpl : public ClientRpcContext {
callback_(on_done), callback_(on_done),
next_issue_(next_issue), next_issue_(next_issue),
start_req_(start_req) {} start_req_(start_req) {}
~ClientRpcContextStreamingImpl() override {} ~ClientRpcContextStreamingPingPongImpl() override {}
void Start(CompletionQueue* cq, const ClientConfig& config) override { void Start(CompletionQueue* cq, const ClientConfig& config) override {
StartInternal(cq, config.messages_per_stream()); StartInternal(cq, config.messages_per_stream());
} }
@ -402,8 +402,8 @@ class ClientRpcContextStreamingImpl : public ClientRpcContext {
} }
} }
void StartNewClone(CompletionQueue* cq) override { void StartNewClone(CompletionQueue* cq) override {
auto* clone = new ClientRpcContextStreamingImpl(stub_, req_, next_issue_, auto* clone = new ClientRpcContextStreamingPingPongImpl(
start_req_, callback_); stub_, req_, next_issue_, start_req_, callback_);
clone->StartInternal(cq, messages_per_stream_); clone->StartInternal(cq, messages_per_stream_);
} }
@ -442,23 +442,23 @@ class ClientRpcContextStreamingImpl : public ClientRpcContext {
void StartInternal(CompletionQueue* cq, int messages_per_stream) { void StartInternal(CompletionQueue* cq, int messages_per_stream) {
cq_ = cq; cq_ = cq;
next_state_ = State::STREAM_IDLE;
stream_ = start_req_(stub_, &context_, cq, ClientRpcContext::tag(this));
messages_per_stream_ = messages_per_stream; messages_per_stream_ = messages_per_stream;
messages_issued_ = 0; messages_issued_ = 0;
next_state_ = State::STREAM_IDLE;
stream_ = start_req_(stub_, &context_, cq, ClientRpcContext::tag(this));
} }
}; };
class AsyncStreamingClient final class AsyncStreamingPingPongClient final
: public AsyncClient<BenchmarkService::Stub, SimpleRequest> { : public AsyncClient<BenchmarkService::Stub, SimpleRequest> {
public: public:
explicit AsyncStreamingClient(const ClientConfig& config) explicit AsyncStreamingPingPongClient(const ClientConfig& config)
: AsyncClient<BenchmarkService::Stub, SimpleRequest>( : AsyncClient<BenchmarkService::Stub, SimpleRequest>(
config, SetupCtx, BenchmarkStubCreator) { config, SetupCtx, BenchmarkStubCreator) {
StartThreads(num_async_threads_); StartThreads(num_async_threads_);
} }
~AsyncStreamingClient() override {} ~AsyncStreamingPingPongClient() override {}
private: private:
static void CheckDone(grpc::Status s, SimpleResponse* response) {} static void CheckDone(grpc::Status s, SimpleResponse* response) {}
@ -472,9 +472,250 @@ class AsyncStreamingClient final
static ClientRpcContext* SetupCtx(BenchmarkService::Stub* stub, static ClientRpcContext* SetupCtx(BenchmarkService::Stub* stub,
std::function<gpr_timespec()> next_issue, std::function<gpr_timespec()> next_issue,
const SimpleRequest& req) { const SimpleRequest& req) {
return new ClientRpcContextStreamingImpl<SimpleRequest, SimpleResponse>( return new ClientRpcContextStreamingPingPongImpl<SimpleRequest,
stub, req, next_issue, AsyncStreamingClient::StartReq, SimpleResponse>(
AsyncStreamingClient::CheckDone); stub, req, next_issue, AsyncStreamingPingPongClient::StartReq,
AsyncStreamingPingPongClient::CheckDone);
}
};
template <class RequestType, class ResponseType>
class ClientRpcContextStreamingFromClientImpl : public ClientRpcContext {
public:
ClientRpcContextStreamingFromClientImpl(
BenchmarkService::Stub* stub, const RequestType& req,
std::function<gpr_timespec()> next_issue,
std::function<std::unique_ptr<grpc::ClientAsyncWriter<RequestType>>(
BenchmarkService::Stub*, grpc::ClientContext*, ResponseType*,
CompletionQueue*, void*)>
start_req,
std::function<void(grpc::Status, ResponseType*)> on_done)
: context_(),
stub_(stub),
cq_(nullptr),
req_(req),
response_(),
next_state_(State::INVALID),
callback_(on_done),
next_issue_(next_issue),
start_req_(start_req) {}
~ClientRpcContextStreamingFromClientImpl() override {}
void Start(CompletionQueue* cq, const ClientConfig& config) override {
StartInternal(cq);
}
bool RunNextState(bool ok, HistogramEntry* entry) override {
while (true) {
switch (next_state_) {
case State::STREAM_IDLE:
if (!next_issue_) { // ready to issue
next_state_ = State::READY_TO_WRITE;
} else {
next_state_ = State::WAIT;
}
break; // loop around, don't return
case State::WAIT:
alarm_.reset(
new Alarm(cq_, next_issue_(), ClientRpcContext::tag(this)));
next_state_ = State::READY_TO_WRITE;
return true;
case State::READY_TO_WRITE:
if (!ok) {
return false;
}
start_ = UsageTimer::Now();
next_state_ = State::WRITE_DONE;
stream_->Write(req_, ClientRpcContext::tag(this));
return true;
case State::WRITE_DONE:
if (!ok) {
return false;
}
entry->set_value((UsageTimer::Now() - start_) * 1e9);
next_state_ = State::STREAM_IDLE;
break; // loop around
default:
GPR_ASSERT(false);
return false;
}
}
}
void StartNewClone(CompletionQueue* cq) override {
auto* clone = new ClientRpcContextStreamingFromClientImpl(
stub_, req_, next_issue_, start_req_, callback_);
clone->StartInternal(cq);
}
private:
grpc::ClientContext context_;
BenchmarkService::Stub* stub_;
CompletionQueue* cq_;
std::unique_ptr<Alarm> alarm_;
RequestType req_;
ResponseType response_;
enum State {
INVALID,
STREAM_IDLE,
WAIT,
READY_TO_WRITE,
WRITE_DONE,
};
State next_state_;
std::function<void(grpc::Status, ResponseType*)> callback_;
std::function<gpr_timespec()> next_issue_;
std::function<std::unique_ptr<grpc::ClientAsyncWriter<RequestType>>(
BenchmarkService::Stub*, grpc::ClientContext*, ResponseType*,
CompletionQueue*, void*)>
start_req_;
grpc::Status status_;
double start_;
std::unique_ptr<grpc::ClientAsyncWriter<RequestType>> stream_;
void StartInternal(CompletionQueue* cq) {
cq_ = cq;
stream_ = start_req_(stub_, &context_, &response_, cq,
ClientRpcContext::tag(this));
next_state_ = State::STREAM_IDLE;
}
};
class AsyncStreamingFromClientClient final
: public AsyncClient<BenchmarkService::Stub, SimpleRequest> {
public:
explicit AsyncStreamingFromClientClient(const ClientConfig& config)
: AsyncClient<BenchmarkService::Stub, SimpleRequest>(
config, SetupCtx, BenchmarkStubCreator) {
StartThreads(num_async_threads_);
}
~AsyncStreamingFromClientClient() override {}
private:
static void CheckDone(grpc::Status s, SimpleResponse* response) {}
static std::unique_ptr<grpc::ClientAsyncWriter<SimpleRequest>> StartReq(
BenchmarkService::Stub* stub, grpc::ClientContext* ctx,
SimpleResponse* resp, CompletionQueue* cq, void* tag) {
auto stream = stub->AsyncStreamingFromClient(ctx, resp, cq, tag);
return stream;
};
static ClientRpcContext* SetupCtx(BenchmarkService::Stub* stub,
std::function<gpr_timespec()> next_issue,
const SimpleRequest& req) {
return new ClientRpcContextStreamingFromClientImpl<SimpleRequest,
SimpleResponse>(
stub, req, next_issue, AsyncStreamingFromClientClient::StartReq,
AsyncStreamingFromClientClient::CheckDone);
}
};
template <class RequestType, class ResponseType>
class ClientRpcContextStreamingFromServerImpl : public ClientRpcContext {
public:
ClientRpcContextStreamingFromServerImpl(
BenchmarkService::Stub* stub, const RequestType& req,
std::function<gpr_timespec()> next_issue,
std::function<std::unique_ptr<grpc::ClientAsyncReader<ResponseType>>(
BenchmarkService::Stub*, grpc::ClientContext*, const RequestType&,
CompletionQueue*, void*)>
start_req,
std::function<void(grpc::Status, ResponseType*)> on_done)
: context_(),
stub_(stub),
cq_(nullptr),
req_(req),
response_(),
next_state_(State::INVALID),
callback_(on_done),
next_issue_(next_issue),
start_req_(start_req) {}
~ClientRpcContextStreamingFromServerImpl() override {}
void Start(CompletionQueue* cq, const ClientConfig& config) override {
StartInternal(cq);
}
bool RunNextState(bool ok, HistogramEntry* entry) override {
while (true) {
switch (next_state_) {
case State::STREAM_IDLE:
if (!ok) {
return false;
}
start_ = UsageTimer::Now();
next_state_ = State::READ_DONE;
stream_->Read(&response_, ClientRpcContext::tag(this));
return true;
case State::READ_DONE:
if (!ok) {
return false;
}
entry->set_value((UsageTimer::Now() - start_) * 1e9);
callback_(status_, &response_);
next_state_ = State::STREAM_IDLE;
break; // loop around
default:
GPR_ASSERT(false);
return false;
}
}
}
void StartNewClone(CompletionQueue* cq) override {
auto* clone = new ClientRpcContextStreamingFromServerImpl(
stub_, req_, next_issue_, start_req_, callback_);
clone->StartInternal(cq);
}
private:
grpc::ClientContext context_;
BenchmarkService::Stub* stub_;
CompletionQueue* cq_;
std::unique_ptr<Alarm> alarm_;
RequestType req_;
ResponseType response_;
enum State { INVALID, STREAM_IDLE, READ_DONE };
State next_state_;
std::function<void(grpc::Status, ResponseType*)> callback_;
std::function<gpr_timespec()> next_issue_;
std::function<std::unique_ptr<grpc::ClientAsyncReader<ResponseType>>(
BenchmarkService::Stub*, grpc::ClientContext*, const RequestType&,
CompletionQueue*, void*)>
start_req_;
grpc::Status status_;
double start_;
std::unique_ptr<grpc::ClientAsyncReader<ResponseType>> stream_;
void StartInternal(CompletionQueue* cq) {
// TODO(vjpai): Add support to rate-pace this
cq_ = cq;
next_state_ = State::STREAM_IDLE;
stream_ =
start_req_(stub_, &context_, req_, cq, ClientRpcContext::tag(this));
}
};
class AsyncStreamingFromServerClient final
: public AsyncClient<BenchmarkService::Stub, SimpleRequest> {
public:
explicit AsyncStreamingFromServerClient(const ClientConfig& config)
: AsyncClient<BenchmarkService::Stub, SimpleRequest>(
config, SetupCtx, BenchmarkStubCreator) {
StartThreads(num_async_threads_);
}
~AsyncStreamingFromServerClient() override {}
private:
static void CheckDone(grpc::Status s, SimpleResponse* response) {}
static std::unique_ptr<grpc::ClientAsyncReader<SimpleResponse>> StartReq(
BenchmarkService::Stub* stub, grpc::ClientContext* ctx,
const SimpleRequest& req, CompletionQueue* cq, void* tag) {
auto stream = stub->AsyncStreamingFromServer(ctx, req, cq, tag);
return stream;
};
static ClientRpcContext* SetupCtx(BenchmarkService::Stub* stub,
std::function<gpr_timespec()> next_issue,
const SimpleRequest& req) {
return new ClientRpcContextStreamingFromServerImpl<SimpleRequest,
SimpleResponse>(
stub, req, next_issue, AsyncStreamingFromServerClient::StartReq,
AsyncStreamingFromServerClient::CheckDone);
} }
}; };
@ -599,11 +840,11 @@ class ClientRpcContextGenericStreamingImpl : public ClientRpcContext {
cq_ = cq; cq_ = cq;
const grpc::string kMethodName( const grpc::string kMethodName(
"/grpc.testing.BenchmarkService/StreamingCall"); "/grpc.testing.BenchmarkService/StreamingCall");
messages_per_stream_ = messages_per_stream;
messages_issued_ = 0;
next_state_ = State::STREAM_IDLE; next_state_ = State::STREAM_IDLE;
stream_ = start_req_(stub_, &context_, kMethodName, cq, stream_ = start_req_(stub_, &context_, kMethodName, cq,
ClientRpcContext::tag(this)); ClientRpcContext::tag(this));
messages_per_stream_ = messages_per_stream;
messages_issued_ = 0;
} }
}; };
@ -640,11 +881,26 @@ class GenericAsyncStreamingClient final
} }
}; };
std::unique_ptr<Client> CreateAsyncUnaryClient(const ClientConfig& args) { std::unique_ptr<Client> CreateAsyncClient(const ClientConfig& config) {
return std::unique_ptr<Client>(new AsyncUnaryClient(args)); switch (config.rpc_type()) {
} case UNARY:
std::unique_ptr<Client> CreateAsyncStreamingClient(const ClientConfig& args) { return std::unique_ptr<Client>(new AsyncUnaryClient(config));
return std::unique_ptr<Client>(new AsyncStreamingClient(args)); case STREAMING:
return std::unique_ptr<Client>(new AsyncStreamingPingPongClient(config));
case STREAMING_FROM_CLIENT:
return std::unique_ptr<Client>(
new AsyncStreamingFromClientClient(config));
case STREAMING_FROM_SERVER:
return std::unique_ptr<Client>(
new AsyncStreamingFromServerClient(config));
case STREAMING_BOTH_WAYS:
// TODO(vjpai): Implement this
assert(false);
return nullptr;
default:
assert(false);
return nullptr;
}
} }
std::unique_ptr<Client> CreateGenericAsyncStreamingClient( std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
const ClientConfig& args) { const ClientConfig& args) {

@ -137,7 +137,8 @@ class SynchronousUnaryClient final : public SynchronousClient {
} }
}; };
class SynchronousStreamingClient final : public SynchronousClient { template <class StreamType>
class SynchronousStreamingClient : public SynchronousClient {
public: public:
SynchronousStreamingClient(const ClientConfig& config) SynchronousStreamingClient(const ClientConfig& config)
: SynchronousClient(config), : SynchronousClient(config),
@ -145,30 +146,69 @@ class SynchronousStreamingClient final : public SynchronousClient {
stream_(num_threads_), stream_(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_);
}
virtual ~SynchronousStreamingClient() {
std::vector<std::thread> cleanup_threads;
for (size_t i = 0; i < num_threads_; i++) {
cleanup_threads.emplace_back([this, i]() {
auto stream = &stream_[i];
if (*stream) {
// forcibly cancel the streams, then finish
context_[i].TryCancel();
(*stream)->Finish();
// don't log any error message on !ok since this was canceled
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
}
protected:
std::vector<grpc::ClientContext> context_;
std::vector<std::unique_ptr<StreamType>> stream_;
const int messages_per_stream_;
std::vector<int> messages_issued_;
void FinishStream(HistogramEntry* entry, size_t thread_idx) {
Status s = stream_[thread_idx]->Finish();
// don't set the value since the stream is failed and shouldn't be timed
entry->set_status(s.error_code());
if (!s.ok()) {
gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s", thread_idx,
s.error_message().c_str());
}
context_[thread_idx].~ClientContext();
new (&context_[thread_idx]) ClientContext();
}
};
class SynchronousStreamingPingPongClient final
: public SynchronousStreamingClient<
grpc::ClientReaderWriter<SimpleRequest, SimpleResponse>> {
public:
SynchronousStreamingPingPongClient(const ClientConfig& config)
: SynchronousStreamingClient(config) {
for (size_t thread_idx = 0; thread_idx < num_threads_; thread_idx++) { for (size_t thread_idx = 0; thread_idx < num_threads_; 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]); stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]);
messages_issued_[thread_idx] = 0; messages_issued_[thread_idx] = 0;
} }
StartThreads(num_threads_);
} }
~SynchronousStreamingClient() { ~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]() {
auto stream = &stream_[i]; auto stream = &stream_[i];
if (*stream) { if (*stream) {
(*stream)->WritesDone(); (*stream)->WritesDone();
Status s = (*stream)->Finish();
if (!s.ok()) {
gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s", i,
s.error_message().c_str());
}
} }
}); });
} }
for (size_t i = 0; i < num_threads_; i++) { for (auto& th : cleanup_threads) {
cleanup_threads[i].join(); th.join();
} }
} }
@ -176,7 +216,7 @@ class SynchronousStreamingClient final : public SynchronousClient {
if (!WaitToIssue(thread_idx)) { if (!WaitToIssue(thread_idx)) {
return true; return true;
} }
GPR_TIMER_SCOPE("SynchronousStreamingClient::ThreadFunc", 0); GPR_TIMER_SCOPE("SynchronousStreamingPingPongClient::ThreadFunc", 0);
double start = UsageTimer::Now(); double start = UsageTimer::Now();
if (stream_[thread_idx]->Write(request_) && if (stream_[thread_idx]->Write(request_) &&
stream_[thread_idx]->Read(&responses_[thread_idx])) { stream_[thread_idx]->Read(&responses_[thread_idx])) {
@ -192,40 +232,148 @@ class SynchronousStreamingClient final : public SynchronousClient {
} }
} }
stream_[thread_idx]->WritesDone(); stream_[thread_idx]->WritesDone();
Status s = stream_[thread_idx]->Finish(); FinishStream(entry, thread_idx);
// don't set the value since this is either a failure (shouldn't be timed)
// or a stream-end (already has been timed)
entry->set_status(s.error_code());
if (!s.ok()) {
gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s", thread_idx,
s.error_message().c_str());
}
auto* stub = channels_[thread_idx % channels_.size()].get_stub(); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
context_[thread_idx].~ClientContext();
new (&context_[thread_idx]) ClientContext();
stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]); stream_[thread_idx] = stub->StreamingCall(&context_[thread_idx]);
messages_issued_[thread_idx] = 0; messages_issued_[thread_idx] = 0;
return true; return true;
} }
};
class SynchronousStreamingFromClientClient final
: public SynchronousStreamingClient<grpc::ClientWriter<SimpleRequest>> {
public:
SynchronousStreamingFromClientClient(const ClientConfig& config)
: SynchronousStreamingClient(config), last_issue_(num_threads_) {
for (size_t thread_idx = 0; thread_idx < num_threads_; thread_idx++) {
auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx],
&responses_[thread_idx]);
last_issue_[thread_idx] = UsageTimer::Now();
}
}
~SynchronousStreamingFromClientClient() {
std::vector<std::thread> cleanup_threads;
for (size_t i = 0; i < num_threads_; i++) {
cleanup_threads.emplace_back([this, i]() {
auto stream = &stream_[i];
if (*stream) {
(*stream)->WritesDone();
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
}
bool ThreadFunc(HistogramEntry* entry, size_t thread_idx) override {
// Figure out how to make histogram sensible if this is rate-paced
if (!WaitToIssue(thread_idx)) {
return true;
}
GPR_TIMER_SCOPE("SynchronousStreamingFromClientClient::ThreadFunc", 0);
if (stream_[thread_idx]->Write(request_)) {
double now = UsageTimer::Now();
entry->set_value((now - last_issue_[thread_idx]) * 1e9);
last_issue_[thread_idx] = now;
return true;
}
stream_[thread_idx]->WritesDone();
FinishStream(entry, thread_idx);
auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingFromClient(&context_[thread_idx],
&responses_[thread_idx]);
return true;
}
private: private:
// These are both conceptually std::vector but cannot be for old compilers std::vector<double> last_issue_;
// that expect contained classes to support copy constructors
std::vector<grpc::ClientContext> context_;
std::vector<
std::unique_ptr<grpc::ClientReaderWriter<SimpleRequest, SimpleResponse>>>
stream_;
const int messages_per_stream_;
std::vector<int> messages_issued_;
}; };
std::unique_ptr<Client> CreateSynchronousUnaryClient( class SynchronousStreamingFromServerClient final
const ClientConfig& config) { : public SynchronousStreamingClient<grpc::ClientReader<SimpleResponse>> {
return std::unique_ptr<Client>(new SynchronousUnaryClient(config)); public:
} SynchronousStreamingFromServerClient(const ClientConfig& config)
std::unique_ptr<Client> CreateSynchronousStreamingClient( : SynchronousStreamingClient(config), last_recv_(num_threads_) {
const ClientConfig& config) { for (size_t thread_idx = 0; thread_idx < num_threads_; thread_idx++) {
return std::unique_ptr<Client>(new SynchronousStreamingClient(config)); auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] =
stub->StreamingFromServer(&context_[thread_idx], request_);
last_recv_[thread_idx] = UsageTimer::Now();
}
}
bool ThreadFunc(HistogramEntry* entry, size_t thread_idx) override {
GPR_TIMER_SCOPE("SynchronousStreamingFromServerClient::ThreadFunc", 0);
if (stream_[thread_idx]->Read(&responses_[thread_idx])) {
double now = UsageTimer::Now();
entry->set_value((now - last_recv_[thread_idx]) * 1e9);
last_recv_[thread_idx] = now;
return true;
}
FinishStream(entry, thread_idx);
auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] =
stub->StreamingFromServer(&context_[thread_idx], request_);
return true;
}
private:
std::vector<double> last_recv_;
};
class SynchronousStreamingBothWaysClient final
: public SynchronousStreamingClient<
grpc::ClientReaderWriter<SimpleRequest, SimpleResponse>> {
public:
SynchronousStreamingBothWaysClient(const ClientConfig& config)
: SynchronousStreamingClient(config) {
for (size_t thread_idx = 0; thread_idx < num_threads_; thread_idx++) {
auto* stub = channels_[thread_idx % channels_.size()].get_stub();
stream_[thread_idx] = stub->StreamingBothWays(&context_[thread_idx]);
}
}
~SynchronousStreamingBothWaysClient() {
std::vector<std::thread> cleanup_threads;
for (size_t i = 0; i < num_threads_; i++) {
cleanup_threads.emplace_back([this, i]() {
auto stream = &stream_[i];
if (*stream) {
(*stream)->WritesDone();
}
});
}
for (auto& th : cleanup_threads) {
th.join();
}
}
bool ThreadFunc(HistogramEntry* entry, size_t thread_idx) override {
// TODO (vjpai): Do this
return true;
}
};
std::unique_ptr<Client> CreateSynchronousClient(const ClientConfig& config) {
switch (config.rpc_type()) {
case UNARY:
return std::unique_ptr<Client>(new SynchronousUnaryClient(config));
case STREAMING:
return std::unique_ptr<Client>(
new SynchronousStreamingPingPongClient(config));
case STREAMING_FROM_CLIENT:
return std::unique_ptr<Client>(
new SynchronousStreamingFromClientClient(config));
case STREAMING_FROM_SERVER:
return std::unique_ptr<Client>(
new SynchronousStreamingFromServerClient(config));
case STREAMING_BOTH_WAYS:
return std::unique_ptr<Client>(
new SynchronousStreamingBothWaysClient(config));
default:
assert(false);
return nullptr;
}
} }
} // namespace testing } // namespace testing

@ -68,15 +68,11 @@ static std::unique_ptr<Client> CreateClient(const ClientConfig& config) {
switch (config.client_type()) { switch (config.client_type()) {
case ClientType::SYNC_CLIENT: case ClientType::SYNC_CLIENT:
return (config.rpc_type() == RpcType::UNARY) return CreateSynchronousClient(config);
? CreateSynchronousUnaryClient(config)
: CreateSynchronousStreamingClient(config);
case ClientType::ASYNC_CLIENT: case ClientType::ASYNC_CLIENT:
return (config.rpc_type() == RpcType::UNARY) return config.payload_config().has_bytebuf_params()
? CreateAsyncUnaryClient(config) ? CreateGenericAsyncStreamingClient(config)
: (config.payload_config().has_bytebuf_params() : CreateAsyncClient(config);
? CreateGenericAsyncStreamingClient(config)
: CreateAsyncStreamingClient(config));
default: default:
abort(); abort();
} }

@ -71,6 +71,18 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
ServerAsyncReaderWriter<ResponseType, RequestType> *, ServerAsyncReaderWriter<ResponseType, RequestType> *,
CompletionQueue *, ServerCompletionQueue *, void *)> CompletionQueue *, ServerCompletionQueue *, void *)>
request_streaming_function, request_streaming_function,
std::function<void(ServiceType *, ServerContextType *,
ServerAsyncReader<ResponseType, RequestType> *,
CompletionQueue *, ServerCompletionQueue *, void *)>
request_streaming_from_client_function,
std::function<void(ServiceType *, ServerContextType *, RequestType *,
ServerAsyncWriter<ResponseType> *, CompletionQueue *,
ServerCompletionQueue *, void *)>
request_streaming_from_server_function,
std::function<void(ServiceType *, ServerContextType *,
ServerAsyncReaderWriter<ResponseType, RequestType> *,
CompletionQueue *, ServerCompletionQueue *, void *)>
request_streaming_both_ways_function,
std::function<grpc::Status(const PayloadConfig &, const RequestType *, std::function<grpc::Status(const PayloadConfig &, const RequestType *,
ResponseType *)> ResponseType *)>
process_rpc) process_rpc)
@ -107,7 +119,7 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
std::bind(process_rpc, config.payload_config(), std::placeholders::_1, std::bind(process_rpc, config.payload_config(), std::placeholders::_1,
std::placeholders::_2); std::placeholders::_2);
for (int i = 0; i < 15000; i++) { for (int i = 0; i < 5000; i++) {
for (int j = 0; j < num_threads; j++) { for (int j = 0; j < num_threads; j++) {
if (request_unary_function) { if (request_unary_function) {
auto request_unary = std::bind( auto request_unary = std::bind(
@ -125,6 +137,26 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
contexts_.emplace_back(new ServerRpcContextStreamingImpl( contexts_.emplace_back(new ServerRpcContextStreamingImpl(
request_streaming, process_rpc_bound)); request_streaming, process_rpc_bound));
} }
if (request_streaming_from_client_function) {
auto request_streaming_from_client = std::bind(
request_streaming_from_client_function, &async_service_,
std::placeholders::_1, std::placeholders::_2, srv_cqs_[j].get(),
srv_cqs_[j].get(), std::placeholders::_3);
contexts_.emplace_back(new ServerRpcContextStreamingFromClientImpl(
request_streaming_from_client, process_rpc_bound));
}
if (request_streaming_from_server_function) {
auto request_streaming_from_server =
std::bind(request_streaming_from_server_function, &async_service_,
std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, srv_cqs_[j].get(),
srv_cqs_[j].get(), std::placeholders::_4);
contexts_.emplace_back(new ServerRpcContextStreamingFromServerImpl(
request_streaming_from_server, process_rpc_bound));
}
if (request_streaming_both_ways_function) {
// TODO(vjpai): Add this code
}
} }
} }
@ -297,8 +329,8 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
if (!ok) { if (!ok) {
return false; return false;
} }
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
next_state_ = &ServerRpcContextStreamingImpl::read_done; next_state_ = &ServerRpcContextStreamingImpl::read_done;
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
return true; return true;
} }
@ -308,23 +340,23 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
// Call the RPC processing function // Call the RPC processing function
grpc::Status status = invoke_method_(&req_, &response_); grpc::Status status = invoke_method_(&req_, &response_);
// initiate the write // initiate the write
stream_.Write(response_, AsyncQpsServerTest::tag(this));
next_state_ = &ServerRpcContextStreamingImpl::write_done; next_state_ = &ServerRpcContextStreamingImpl::write_done;
stream_.Write(response_, AsyncQpsServerTest::tag(this));
} else { // client has sent writes done } else { // client has sent writes done
// finish the stream // finish the stream
stream_.Finish(Status::OK, AsyncQpsServerTest::tag(this));
next_state_ = &ServerRpcContextStreamingImpl::finish_done; next_state_ = &ServerRpcContextStreamingImpl::finish_done;
stream_.Finish(Status::OK, AsyncQpsServerTest::tag(this));
} }
return true; return true;
} }
bool write_done(bool ok) { bool write_done(bool ok) {
// now go back and get another streaming read! // now go back and get another streaming read!
if (ok) { if (ok) {
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
next_state_ = &ServerRpcContextStreamingImpl::read_done; next_state_ = &ServerRpcContextStreamingImpl::read_done;
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
} else { } else {
stream_.Finish(Status::OK, AsyncQpsServerTest::tag(this));
next_state_ = &ServerRpcContextStreamingImpl::finish_done; next_state_ = &ServerRpcContextStreamingImpl::finish_done;
stream_.Finish(Status::OK, AsyncQpsServerTest::tag(this));
} }
return true; return true;
} }
@ -343,6 +375,146 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
grpc::ServerAsyncReaderWriter<ResponseType, RequestType> stream_; grpc::ServerAsyncReaderWriter<ResponseType, RequestType> stream_;
}; };
class ServerRpcContextStreamingFromClientImpl final
: public ServerRpcContext {
public:
ServerRpcContextStreamingFromClientImpl(
std::function<void(ServerContextType *,
grpc::ServerAsyncReader<ResponseType, RequestType> *,
void *)>
request_method,
std::function<grpc::Status(const RequestType *, ResponseType *)>
invoke_method)
: srv_ctx_(new ServerContextType),
next_state_(&ServerRpcContextStreamingFromClientImpl::request_done),
request_method_(request_method),
invoke_method_(invoke_method),
stream_(srv_ctx_.get()) {
request_method_(srv_ctx_.get(), &stream_, AsyncQpsServerTest::tag(this));
}
~ServerRpcContextStreamingFromClientImpl() override {}
bool RunNextState(bool ok) override { return (this->*next_state_)(ok); }
void Reset() override {
srv_ctx_.reset(new ServerContextType);
req_ = RequestType();
stream_ =
grpc::ServerAsyncReader<ResponseType, RequestType>(srv_ctx_.get());
// Then request the method
next_state_ = &ServerRpcContextStreamingFromClientImpl::request_done;
request_method_(srv_ctx_.get(), &stream_, AsyncQpsServerTest::tag(this));
}
private:
bool request_done(bool ok) {
if (!ok) {
return false;
}
next_state_ = &ServerRpcContextStreamingFromClientImpl::read_done;
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
return true;
}
bool read_done(bool ok) {
if (ok) {
// In this case, just do another read
// next_state_ is unchanged
stream_.Read(&req_, AsyncQpsServerTest::tag(this));
return true;
} else { // client has sent writes done
// invoke the method
// Call the RPC processing function
grpc::Status status = invoke_method_(&req_, &response_);
// finish the stream
next_state_ = &ServerRpcContextStreamingFromClientImpl::finish_done;
stream_.Finish(response_, Status::OK, AsyncQpsServerTest::tag(this));
}
return true;
}
bool finish_done(bool ok) { return false; /* reset the context */ }
std::unique_ptr<ServerContextType> srv_ctx_;
RequestType req_;
ResponseType response_;
bool (ServerRpcContextStreamingFromClientImpl::*next_state_)(bool);
std::function<void(ServerContextType *,
grpc::ServerAsyncReader<ResponseType, RequestType> *,
void *)>
request_method_;
std::function<grpc::Status(const RequestType *, ResponseType *)>
invoke_method_;
grpc::ServerAsyncReader<ResponseType, RequestType> stream_;
};
class ServerRpcContextStreamingFromServerImpl final
: public ServerRpcContext {
public:
ServerRpcContextStreamingFromServerImpl(
std::function<void(ServerContextType *, RequestType *,
grpc::ServerAsyncWriter<ResponseType> *, void *)>
request_method,
std::function<grpc::Status(const RequestType *, ResponseType *)>
invoke_method)
: srv_ctx_(new ServerContextType),
next_state_(&ServerRpcContextStreamingFromServerImpl::request_done),
request_method_(request_method),
invoke_method_(invoke_method),
stream_(srv_ctx_.get()) {
request_method_(srv_ctx_.get(), &req_, &stream_,
AsyncQpsServerTest::tag(this));
}
~ServerRpcContextStreamingFromServerImpl() override {}
bool RunNextState(bool ok) override { return (this->*next_state_)(ok); }
void Reset() override {
srv_ctx_.reset(new ServerContextType);
req_ = RequestType();
stream_ = grpc::ServerAsyncWriter<ResponseType>(srv_ctx_.get());
// Then request the method
next_state_ = &ServerRpcContextStreamingFromServerImpl::request_done;
request_method_(srv_ctx_.get(), &req_, &stream_,
AsyncQpsServerTest::tag(this));
}
private:
bool request_done(bool ok) {
if (!ok) {
return false;
}
// invoke the method
// Call the RPC processing function
grpc::Status status = invoke_method_(&req_, &response_);
next_state_ = &ServerRpcContextStreamingFromServerImpl::write_done;
stream_.Write(response_, AsyncQpsServerTest::tag(this));
return true;
}
bool write_done(bool ok) {
if (ok) {
// Do another write!
// next_state_ is unchanged
stream_.Write(response_, AsyncQpsServerTest::tag(this));
} else { // must be done so let's finish
next_state_ = &ServerRpcContextStreamingFromServerImpl::finish_done;
stream_.Finish(Status::OK, AsyncQpsServerTest::tag(this));
}
return true;
}
bool finish_done(bool ok) { return false; /* reset the context */ }
std::unique_ptr<ServerContextType> srv_ctx_;
RequestType req_;
ResponseType response_;
bool (ServerRpcContextStreamingFromServerImpl::*next_state_)(bool);
std::function<void(ServerContextType *, RequestType *,
grpc::ServerAsyncWriter<ResponseType> *, void *)>
request_method_;
std::function<grpc::Status(const RequestType *, ResponseType *)>
invoke_method_;
grpc::ServerAsyncWriter<ResponseType> stream_;
};
std::vector<std::thread> threads_; std::vector<std::thread> threads_;
std::unique_ptr<grpc::Server> server_; std::unique_ptr<grpc::Server> server_;
std::vector<std::unique_ptr<grpc::ServerCompletionQueue>> srv_cqs_; std::vector<std::unique_ptr<grpc::ServerCompletionQueue>> srv_cqs_;
@ -398,6 +570,9 @@ std::unique_ptr<Server> CreateAsyncServer(const ServerConfig &config) {
config, RegisterBenchmarkService, config, RegisterBenchmarkService,
&BenchmarkService::AsyncService::RequestUnaryCall, &BenchmarkService::AsyncService::RequestUnaryCall,
&BenchmarkService::AsyncService::RequestStreamingCall, &BenchmarkService::AsyncService::RequestStreamingCall,
&BenchmarkService::AsyncService::RequestStreamingFromClient,
&BenchmarkService::AsyncService::RequestStreamingFromServer,
&BenchmarkService::AsyncService::RequestStreamingBothWays,
ProcessSimpleRPC)); ProcessSimpleRPC));
} }
std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) { std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) {
@ -405,7 +580,8 @@ std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) {
new AsyncQpsServerTest<ByteBuffer, ByteBuffer, grpc::AsyncGenericService, new AsyncQpsServerTest<ByteBuffer, ByteBuffer, grpc::AsyncGenericService,
grpc::GenericServerContext>( grpc::GenericServerContext>(
config, RegisterGenericService, nullptr, config, RegisterGenericService, nullptr,
&grpc::AsyncGenericService::RequestCall, ProcessGenericRPC)); &grpc::AsyncGenericService::RequestCall, nullptr, nullptr, nullptr,
ProcessGenericRPC));
} }
} // namespace testing } // namespace testing

@ -31,6 +31,9 @@
* *
*/ */
#include <atomic>
#include <thread>
#include <grpc++/resource_quota.h> #include <grpc++/resource_quota.h>
#include <grpc++/security/server_credentials.h> #include <grpc++/security/server_credentials.h>
#include <grpc++/server.h> #include <grpc++/server.h>
@ -52,12 +55,9 @@ class BenchmarkServiceImpl final : public BenchmarkService::Service {
public: public:
Status UnaryCall(ServerContext* context, const SimpleRequest* request, Status UnaryCall(ServerContext* context, const SimpleRequest* request,
SimpleResponse* response) override { SimpleResponse* response) override {
if (request->response_size() > 0) { auto s = SetResponse(request, response);
if (!Server::SetPayload(request->response_type(), if (!s.ok()) {
request->response_size(), return s;
response->mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
} }
return Status::OK; return Status::OK;
} }
@ -67,12 +67,9 @@ class BenchmarkServiceImpl final : public BenchmarkService::Service {
SimpleRequest request; SimpleRequest request;
while (stream->Read(&request)) { while (stream->Read(&request)) {
SimpleResponse response; SimpleResponse response;
if (request.response_size() > 0) { auto s = SetResponse(&request, &response);
if (!Server::SetPayload(request.response_type(), if (!s.ok()) {
request.response_size(), return s;
response.mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
} }
if (!stream->Write(response)) { if (!stream->Write(response)) {
return Status(StatusCode::INTERNAL, "Server couldn't respond"); return Status(StatusCode::INTERNAL, "Server couldn't respond");
@ -80,6 +77,96 @@ class BenchmarkServiceImpl final : public BenchmarkService::Service {
} }
return Status::OK; return Status::OK;
} }
Status StreamingFromClient(ServerContext* context,
ServerReader<SimpleRequest>* stream,
SimpleResponse* response) override {
auto s = ClientPull(context, stream, response);
if (!s.ok()) {
return s;
}
return Status::OK;
}
Status StreamingFromServer(ServerContext* context,
const SimpleRequest* request,
ServerWriter<SimpleResponse>* stream) override {
SimpleResponse response;
auto s = SetResponse(request, &response);
if (!s.ok()) {
return s;
}
return ServerPush(context, stream, response, nullptr);
}
Status StreamingBothWays(
ServerContext* context,
ServerReaderWriter<SimpleResponse, SimpleRequest>* stream) override {
// Read the first client message to setup server response
SimpleRequest request;
if (!stream->Read(&request)) {
return Status::OK;
}
SimpleResponse response;
auto s = SetResponse(&request, &response);
if (!s.ok()) {
return s;
}
std::atomic_bool done;
Status sp;
std::thread t([context, stream, &response, &done, &sp]() {
sp = ServerPush(context, stream, response, [&done]() {
return done.load(std::memory_order_relaxed);
});
});
SimpleResponse dummy;
auto cp = ClientPull(context, stream, &dummy);
done.store(true, std::memory_order_relaxed); // can be lazy
t.join();
if (!cp.ok()) {
return cp;
}
if (!sp.ok()) {
return sp;
}
return Status::OK;
}
private:
static Status ClientPull(ServerContext* context,
ReaderInterface<SimpleRequest>* stream,
SimpleResponse* response) {
SimpleRequest request;
while (stream->Read(&request)) {
}
if (request.response_size() > 0) {
if (!Server::SetPayload(request.response_type(), request.response_size(),
response->mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
}
return Status::OK;
}
static Status ServerPush(ServerContext* context,
WriterInterface<SimpleResponse>* stream,
const SimpleResponse& response,
std::function<bool()> done) {
while ((done == nullptr) || !done()) {
// TODO(vjpai): Add potential for rate-pacing on this
if (!stream->Write(response)) {
return Status(StatusCode::INTERNAL, "Server couldn't push");
}
}
return Status::OK;
}
static Status SetResponse(const SimpleRequest* request,
SimpleResponse* response) {
if (request->response_size() > 0) {
if (!Server::SetPayload(request->response_type(),
request->response_size(),
response->mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
}
return Status::OK;
}
}; };
class SynchronousServer final : public grpc::testing::Server { class SynchronousServer final : public grpc::testing::Server {

@ -91,7 +91,7 @@ void CliCall::Write(const grpc::string& request) {
void* got_tag; void* got_tag;
bool ok; bool ok;
grpc_slice s = grpc_slice_from_copied_string(request.c_str()); gpr_slice s = gpr_slice_from_copied_buffer(request.data(), request.size());
grpc::Slice req_slice(s, grpc::Slice::STEAL_REF); grpc::Slice req_slice(s, grpc::Slice::STEAL_REF);
grpc::ByteBuffer send_buffer(&req_slice, 1); grpc::ByteBuffer send_buffer(&req_slice, 1);
call_->Write(send_buffer, tag(2)); call_->Write(send_buffer, tag(2));

@ -251,4 +251,14 @@
typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t; typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
#endif #endif
/* Undefine UNICODE, as c-ares does not use the ANSI version of functions */
/* explicitly. */
#ifdef UNICODE
# undef UNICODE
#endif
#ifdef _UNICODE
# undef _UNICODE
#endif
#endif /* __CARES_BUILD_H */ #endif /* __CARES_BUILD_H */

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_api.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
# runtime 23 * 60 mins
config=asan-trace-cmp runtime=82800 tools/jenkins/run_fuzzer.sh api_fuzzer

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_client.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
# runtime 23 * 60 mins
config=asan-trace-cmp runtime=82800 tools/jenkins/run_fuzzer.sh client_fuzzer

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_hpack_parser.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
config=asan-trace-cmp tools/jenkins/run_fuzzer.sh hpack_parser_fuzzer_test

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_http_request.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
config=asan-trace-cmp tools/jenkins/run_fuzzer.sh http_request_fuzzer_test

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_json.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
config=asan-trace-cmp tools/jenkins/run_fuzzer.sh json_fuzzer_test

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_nanopb_response.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,40 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
config=asan-trace-cmp tools/jenkins/run_fuzzer.sh nanopb_fuzzer_response_test

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_server.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
# runtime 23 * 60 mins
config=asan-trace-cmp runtime=82800 tools/jenkins/run_fuzzer.sh server_fuzzer

@ -1,39 +0,0 @@
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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_fuzzer_uri.sh"
timeout_mins: 1440 # 24 hours is the maximum allowed value
action {
define_artifacts {
regex: "git/grpc/fuzzer_output/**"
}
}

@ -1,40 +0,0 @@
#!/bin/bash
# Copyright 2017, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
git submodule update --init
# download fuzzer docker image from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting
config=asan-trace-cmp tools/jenkins/run_fuzzer.sh uri_fuzzer_test

@ -41,10 +41,10 @@ clang --version || true
docker --version || true docker --version || true
# Need to increase open files limit for c tests # Need to increase open files limit for c tests
ulimit -n 2000 ulimit -n 32768
git submodule update --init git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f basictests linux --internal_ci tools/run_tests/run_tests_matrix.py -f basictests linux --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f portability linux --internal_ci tools/run_tests/run_tests_matrix.py -f portability linux --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f c asan tools/run_tests/run_tests_matrix.py -f c asan --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f c msan tools/run_tests/run_tests_matrix.py -f c msan --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f c tsan tools/run_tests/run_tests_matrix.py -f c tsan --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f c++ asan tools/run_tests/run_tests_matrix.py -f c++ asan --inner_jobs 16 -j 1 --internal_ci

@ -37,4 +37,4 @@ git submodule update --init
# download docker images from dockerhub # download docker images from dockerhub
export DOCKERHUB_ORGANIZATION=grpctesting export DOCKERHUB_ORGANIZATION=grpctesting
tools/run_tests/run_tests_matrix.py -f c++ tsan tools/run_tests/run_tests_matrix.py -f c++ tsan --inner_jobs 16 -j 1 --internal_ci

@ -56,6 +56,10 @@ _INTERESTING = (
'writes_per_iteration', 'writes_per_iteration',
'atm_cas_per_iteration', 'atm_cas_per_iteration',
'atm_add_per_iteration', 'atm_add_per_iteration',
'cli_transport_stalls_per_iteration',
'cli_stream_stalls_per_iteration',
'svr_transport_stalls_per_iteration',
'svr_stream_stalls_per_iteration'
'nows_per_iteration', 'nows_per_iteration',
) )

@ -33,7 +33,7 @@ the script also supports orchestrating test runs with client and server running
to BigQuery. to BigQuery.
###### Example ###### Example
`tools/run_tests/run_peformance_tests.py -l c++ node` `tools/run_tests/run_performance_tests.py -l c++ node`
###### Useful options ###### Useful options
- `--regex` use regex to select particular scenarios to run. - `--regex` use regex to select particular scenarios to run.

@ -48,7 +48,7 @@ electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 )
for version in ${node_versions[@]} for version in ${node_versions[@]}
do do
./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=$NODE_TARGET_ARCH ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=$NODE_TARGET_ARCH --grpc_alpine=true
cp -r build/stage/* artifacts/ cp -r build/stage/* artifacts/
done done

File diff suppressed because it is too large Load Diff

@ -46,6 +46,4 @@ case "$CONFIG" in
*) config_flag='--release' ;; *) config_flag='--release' ;;
esac esac
uv_flag=$2 npm install --unsafe-perm --build-from-source $config_flag
npm install --unsafe-perm --build-from-source $uv_flag $config_flag

@ -61,9 +61,6 @@ do
"csharp") "csharp")
python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 --compiler coreclr python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 --compiler coreclr
;; ;;
"node")
python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 --iomgr_platform=uv
;;
*) *)
python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8
;; ;;

@ -310,7 +310,7 @@ class CXXLanguage:
secure=secure, secure=secure,
categories=smoketest_categories + [SCALABLE]) categories=smoketest_categories + [SCALABLE])
for rpc_type in ['unary', 'streaming']: for rpc_type in ['unary', 'streaming', 'streaming_from_client', 'streaming_from_server']:
for synchronicity in ['sync', 'async']: for synchronicity in ['sync', 'async']:
yield _ping_pong_scenario( yield _ping_pong_scenario(
'cpp_protobuf_%s_%s_ping_pong_%s' % (synchronicity, rpc_type, secstr), 'cpp_protobuf_%s_%s_ping_pong_%s' % (synchronicity, rpc_type, secstr),

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2.7
# Copyright 2015, Google Inc. # Copyright 2015, Google Inc.
# All rights reserved. # All rights reserved.
# #
@ -30,8 +30,6 @@
"""Manage TCP ports for unit tests; started by run_tests.py""" """Manage TCP ports for unit tests; started by run_tests.py"""
from __future__ import print_function
import argparse import argparse
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
import hashlib import hashlib
@ -39,18 +37,20 @@ import os
import socket import socket
import sys import sys
import time import time
import random
from SocketServer import ThreadingMixIn from SocketServer import ThreadingMixIn
import threading import threading
import platform
# increment this number whenever making a change to ensure that # increment this number whenever making a change to ensure that
# the changes are picked up by running CI servers # the changes are picked up by running CI servers
# note that all changes must be backwards compatible # note that all changes must be backwards compatible
_MY_VERSION = 14 _MY_VERSION = 20
if len(sys.argv) == 2 and sys.argv[1] == 'dump_version': if len(sys.argv) == 2 and sys.argv[1] == 'dump_version':
print(_MY_VERSION) print _MY_VERSION
sys.exit(0) sys.exit(0)
@ -66,16 +66,42 @@ if args.logfile is not None:
sys.stderr = open(args.logfile, 'w') sys.stderr = open(args.logfile, 'w')
sys.stdout = sys.stderr sys.stdout = sys.stderr
print('port server running on port %d' % args.port) print 'port server running on port %d' % args.port
pool = [] pool = []
in_use = {} in_use = {}
mu = threading.Lock() mu = threading.Lock()
def can_connect(port):
# this test is only really useful on unices where SO_REUSE_PORT is available
# so on Windows, where this test is expensive, skip it
if platform.system() == 'Windows': return False
s = socket.socket()
try:
s.connect(('localhost', port))
return True
except socket.error, e:
return False
finally:
s.close()
def can_bind(port, proto):
s = socket.socket(proto, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try:
s.bind(('localhost', port))
return True
except socket.error, e:
return False
finally:
s.close()
def refill_pool(max_timeout, req): def refill_pool(max_timeout, req):
"""Scan for ports not marked for being in use""" """Scan for ports not marked for being in use"""
for i in range(1025, 32766): chk = list(range(1025, 32766))
random.shuffle(chk)
for i in chk:
if len(pool) > 100: break if len(pool) > 100: break
if i in in_use: if i in in_use:
age = time.time() - in_use[i] age = time.time() - in_use[i]
@ -83,16 +109,9 @@ def refill_pool(max_timeout, req):
continue continue
req.log_message("kill old request %d" % i) req.log_message("kill old request %d" % i)
del in_use[i] del in_use[i]
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if can_bind(i, socket.AF_INET) and can_bind(i, socket.AF_INET6) and not can_connect(i):
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try:
s.bind(('localhost', i))
req.log_message("found available port %d" % i) req.log_message("found available port %d" % i)
pool.append(i) pool.append(i)
except:
pass # we really don't care about failures
finally:
s.close()
def allocate_port(req): def allocate_port(req):
@ -120,7 +139,7 @@ keep_running = True
class Handler(BaseHTTPRequestHandler): class Handler(BaseHTTPRequestHandler):
def setup(self): def setup(self):
# If the client is unreachable for 5 seconds, close the connection # If the client is unreachable for 5 seconds, close the connection
self.timeout = 5 self.timeout = 5
@ -128,6 +147,7 @@ class Handler(BaseHTTPRequestHandler):
def do_GET(self): def do_GET(self):
global keep_running global keep_running
global mu
if self.path == '/get': if self.path == '/get':
# allocate a new port, it will stay bound for ten minutes and until # allocate a new port, it will stay bound for ten minutes and until
# it's unused # it's unused
@ -142,12 +162,15 @@ class Handler(BaseHTTPRequestHandler):
self.send_header('Content-Type', 'text/plain') self.send_header('Content-Type', 'text/plain')
self.end_headers() self.end_headers()
p = int(self.path[6:]) p = int(self.path[6:])
mu.acquire()
if p in in_use: if p in in_use:
del in_use[p] del in_use[p]
pool.append(p) pool.append(p)
self.log_message('drop known port %d' % p) k = 'known'
else: else:
self.log_message('drop unknown port %d' % p) k = 'unknown'
mu.release()
self.log_message('drop %s port %d' % (k, p))
elif self.path == '/version_number': elif self.path == '/version_number':
# fetch a version string and the current process pid # fetch a version string and the current process pid
self.send_response(200) self.send_response(200)
@ -161,8 +184,11 @@ class Handler(BaseHTTPRequestHandler):
self.send_response(200) self.send_response(200)
self.send_header('Content-Type', 'text/plain') self.send_header('Content-Type', 'text/plain')
self.end_headers() self.end_headers()
mu.acquire()
now = time.time() now = time.time()
self.wfile.write(yaml.dump({'pool': pool, 'in_use': dict((k, now - v) for k, v in in_use.items())})) out = yaml.dump({'pool': pool, 'in_use': dict((k, now - v) for k, v in in_use.items())})
mu.release()
self.wfile.write(out)
elif self.path == '/quitquitquit': elif self.path == '/quitquitquit':
self.send_response(200) self.send_response(200)
self.end_headers() self.end_headers()
@ -171,6 +197,4 @@ class Handler(BaseHTTPRequestHandler):
class ThreadedHTTPServer(ThreadingMixIn, HTTPServer): class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
"""Handle requests in a separate thread""" """Handle requests in a separate thread"""
ThreadedHTTPServer(('', args.port), Handler).serve_forever() ThreadedHTTPServer(('', args.port), Handler).serve_forever()

@ -64,19 +64,24 @@ def render_junit_xml_report(resultset, xml_report, suite_package='grpc',
root = ET.Element('testsuites') root = ET.Element('testsuites')
testsuite = ET.SubElement(root, 'testsuite', id='1', package=suite_package, testsuite = ET.SubElement(root, 'testsuite', id='1', package=suite_package,
name=suite_name) name=suite_name)
failure_count = 0
error_count = 0
for shortname, results in six.iteritems(resultset): for shortname, results in six.iteritems(resultset):
for result in results: for result in results:
xml_test = ET.SubElement(testsuite, 'testcase', name=shortname) xml_test = ET.SubElement(testsuite, 'testcase', name=shortname)
if result.elapsed_time: if result.elapsed_time:
xml_test.set('time', str(result.elapsed_time)) xml_test.set('time', str(result.elapsed_time))
ET.SubElement(xml_test, 'system-out').text = _filter_msg(result.message, filtered_msg = _filter_msg(result.message, 'XML')
'XML')
if result.state == 'FAILED': if result.state == 'FAILED':
ET.SubElement(xml_test, 'failure', message='Failure') ET.SubElement(xml_test, 'failure', message='Failure').text = filtered_msg
failure_count += 1
elif result.state == 'TIMEOUT': elif result.state == 'TIMEOUT':
ET.SubElement(xml_test, 'error', message='Timeout') ET.SubElement(xml_test, 'error', message='Timeout').text = filtered_msg
error_count += 1
elif result.state == 'SKIPPED': elif result.state == 'SKIPPED':
ET.SubElement(xml_test, 'skipped', message='Skipped') ET.SubElement(xml_test, 'skipped', message='Skipped')
testsuite.set('failures', str(failure_count))
testsuite.set('errors', str(error_count))
# ensure the report directory exists # ensure the report directory exists
report_dir = os.path.dirname(os.path.abspath(xml_report)) report_dir = os.path.dirname(os.path.abspath(xml_report))
if not os.path.exists(report_dir): if not os.path.exists(report_dir):

@ -27,9 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function import urllib
from six.moves import urllib
import jobset import jobset
import logging import logging
import os import os
@ -50,9 +48,9 @@ def start_port_server():
# otherwise, leave it up # otherwise, leave it up
try: try:
version = int( version = int(
urllib.request.urlopen( urllib.urlopen(
'http://localhost:%d/version_number' % _PORT_SERVER_PORT, 'http://localhost:%d/version_number' %
timeout=10).read()) _PORT_SERVER_PORT).read())
logging.info('detected port server running version %d', version) logging.info('detected port server running version %d', version)
running = True running = True
except Exception as e: except Exception as e:
@ -69,8 +67,8 @@ def start_port_server():
running = (version >= current_version) running = (version >= current_version)
if not running: if not running:
logging.info('port_server version mismatch: killing the old one') logging.info('port_server version mismatch: killing the old one')
urllib.request.urlopen('http://localhost:%d/quitquitquit' % urllib.urlopen('http://localhost:%d/quitquitquit' %
_PORT_SERVER_PORT).read() _PORT_SERVER_PORT).read()
time.sleep(1) time.sleep(1)
if not running: if not running:
fd, logfile = tempfile.mkstemp() fd, logfile = tempfile.mkstemp()
@ -109,9 +107,8 @@ def start_port_server():
# try one final time: maybe another build managed to start one # try one final time: maybe another build managed to start one
time.sleep(1) time.sleep(1)
try: try:
urllib.request.urlopen( urllib.urlopen(
'http://localhost:%d/get' % _PORT_SERVER_PORT, 'http://localhost:%d/get' % _PORT_SERVER_PORT).read()
timeout=1).read()
logging.info( logging.info(
'last ditch attempt to contact port server succeeded') 'last ditch attempt to contact port server succeeded')
break break
@ -119,18 +116,18 @@ def start_port_server():
logging.exception( logging.exception(
'final attempt to contact port server failed') 'final attempt to contact port server failed')
port_log = open(logfile, 'r').read() port_log = open(logfile, 'r').read()
print(port_log) print port_log
sys.exit(1) sys.exit(1)
try: try:
port_server_url = 'http://localhost:%d/get' % _PORT_SERVER_PORT port_server_url = 'http://localhost:%d/get' % _PORT_SERVER_PORT
urllib.request.urlopen(port_server_url, timeout=1).read() urllib.urlopen(port_server_url).read()
logging.info('port server is up and ready') logging.info('port server is up and ready')
break break
except socket.timeout: except socket.timeout:
logging.exception('while waiting for port_server') logging.exception('while waiting for port_server')
time.sleep(1) time.sleep(1)
waits += 1 waits += 1
except urllib.error.URLError: except IOError:
logging.exception('while waiting for port_server') logging.exception('while waiting for port_server')
time.sleep(1) time.sleep(1)
waits += 1 waits += 1

@ -430,10 +430,6 @@ class NodeLanguage(object):
_check_compiler(self.args.compiler, ['default', 'node0.12', _check_compiler(self.args.compiler, ['default', 'node0.12',
'node4', 'node5', 'node6', 'node4', 'node5', 'node6',
'node7', 'electron1.3', 'electron1.6']) 'node7', 'electron1.3', 'electron1.6'])
if args.iomgr_platform == "uv":
self.use_uv = True
else:
self.use_uv = False
if self.args.compiler == 'default': if self.args.compiler == 'default':
self.runtime = 'node' self.runtime = 'node'
self.node_version = '7' self.node_version = '7'
@ -481,7 +477,6 @@ class NodeLanguage(object):
else: else:
config_flag = '--release' config_flag = '--release'
return [['tools\\run_tests\\helper_scripts\\build_node.bat', return [['tools\\run_tests\\helper_scripts\\build_node.bat',
'--grpc_uv={}'.format('true' if self.use_uv else 'false'),
config_flag]] config_flag]]
else: else:
build_script = 'build_node' build_script = 'build_node'
@ -490,8 +485,7 @@ class NodeLanguage(object):
# building for electron requires a patch version # building for electron requires a patch version
self.node_version += '.0' self.node_version += '.0'
return [['tools/run_tests/helper_scripts/{}.sh'.format(build_script), return [['tools/run_tests/helper_scripts/{}.sh'.format(build_script),
self.node_version, self.node_version]]
'--grpc_uv={}'.format('true' if self.use_uv else 'false')]]
def post_tests_steps(self): def post_tests_steps(self):
return [] return []

@ -169,7 +169,7 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
# sanitizers # sanitizers
test_jobs += _generate_jobs(languages=['c'], test_jobs += _generate_jobs(languages=['c'],
configs=['msan', 'asan', 'tsan'], configs=['msan', 'asan', 'tsan', 'ubsan'],
platforms=['linux'], platforms=['linux'],
labels=['sanitizers'], labels=['sanitizers'],
extra_args=extra_args, extra_args=extra_args,
@ -289,15 +289,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS)
platforms=['linux'], platforms=['linux'],
arch='default', arch='default',
compiler='electron1.6', compiler='electron1.6',
iomgr_platform='uv',
labels=['portability'],
extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['node'],
configs=['dbg'],
platforms=['linux'],
iomgr_platform='uv',
labels=['portability'], labels=['portability'],
extra_args=extra_args, extra_args=extra_args,
inner_jobs=inner_jobs) inner_jobs=inner_jobs)

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2.7
# Copyright 2017, Google Inc. # Copyright 2017, Google Inc.
# All rights reserved. # All rights reserved.
@ -39,10 +39,8 @@ The path to this file is called out in test/core/util/port.c, and printed as
an error message to users. an error message to users.
""" """
from __future__ import print_function
import python_utils.start_port_server as start_port_server import python_utils.start_port_server as start_port_server
start_port_server.start_port_server() start_port_server.start_port_server()
print("Port server started successfully") print "Port server started successfully"

Loading…
Cancel
Save