diff options
author | 2018-05-11 12:20:11 -0700 | |
---|---|---|
committer | 2018-05-11 12:20:11 -0700 | |
commit | 4fad281ce8affe27fb7428f264d2c3b9dfc45f2f (patch) | |
tree | ca96c9efd69afec56aa2e5fe072a9f758247d0a3 /test/cpp/qps | |
parent | ec445cc2bb270ed4acb1c710c3533fca14a50019 (diff) | |
parent | 61fdb46ac456027c79841949272ec540f66d2317 (diff) |
Merge remote-tracking branch 'upstream/master' into fork_exec_ctx_check
Diffstat (limited to 'test/cpp/qps')
-rw-r--r-- | test/cpp/qps/BUILD | 6 | ||||
-rw-r--r-- | test/cpp/qps/benchmark_config.cc | 4 | ||||
-rw-r--r-- | test/cpp/qps/client.h | 10 | ||||
-rw-r--r-- | test/cpp/qps/client_async.cc | 10 | ||||
-rw-r--r-- | test/cpp/qps/client_sync.cc | 10 | ||||
-rw-r--r-- | test/cpp/qps/driver.cc | 7 | ||||
-rwxr-xr-x | test/cpp/qps/gen_build_yaml.py | 47 | ||||
-rw-r--r-- | test/cpp/qps/interarrival.h | 2 | ||||
-rw-r--r-- | test/cpp/qps/parse_json.h | 4 | ||||
-rw-r--r-- | test/cpp/qps/qps_json_driver.cc | 2 | ||||
-rw-r--r-- | test/cpp/qps/qps_worker.cc | 10 | ||||
-rw-r--r-- | test/cpp/qps/qps_worker.h | 6 | ||||
-rw-r--r-- | test/cpp/qps/report.cc | 4 | ||||
-rw-r--r-- | test/cpp/qps/report.h | 6 | ||||
-rw-r--r-- | test/cpp/qps/server.h | 6 | ||||
-rw-r--r-- | test/cpp/qps/server_async.cc | 16 | ||||
-rw-r--r-- | test/cpp/qps/server_sync.cc | 8 |
17 files changed, 82 insertions, 76 deletions
diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index f1abb19e64..a348b88079 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -47,9 +47,10 @@ grpc_cc_library( "//:grpc", "//:grpc++", "//:grpc++_core_stats", + "//src/proto/grpc/testing:benchmark_service_proto", "//src/proto/grpc/testing:control_proto", "//src/proto/grpc/testing:payloads_proto", - "//src/proto/grpc/testing:services_proto", + "//src/proto/grpc/testing:worker_service_proto", "//test/core/end2end:ssl_test_data", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", @@ -74,7 +75,8 @@ grpc_cc_library( "//:grpc++", "//src/proto/grpc/testing:control_proto", "//src/proto/grpc/testing:messages_proto", - "//src/proto/grpc/testing:services_proto", + "//src/proto/grpc/testing:report_qps_scenario_service_proto", + "//src/proto/grpc/testing:worker_service_proto", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index fb1e0608c5..a4fd9de820 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -18,9 +18,9 @@ #include "test/cpp/qps/benchmark_config.h" #include <gflags/gflags.h> -#include <grpc++/create_channel.h> -#include <grpc++/security/credentials.h> #include <grpc/support/log.h> +#include <grpcpp/create_channel.h> +#include <grpcpp/security/credentials.h> DEFINE_bool(enable_log_reporter, true, "Enable reporting of benchmark results through GprLog"); diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 82c6361abd..31ae6ca1fb 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -24,15 +24,15 @@ #include <unordered_map> #include <vector> -#include <grpc++/channel.h> -#include <grpc++/support/byte_buffer.h> -#include <grpc++/support/channel_arguments.h> -#include <grpc++/support/slice.h> #include <grpc/support/log.h> #include <grpc/support/time.h> +#include <grpcpp/channel.h> +#include <grpcpp/support/byte_buffer.h> +#include <grpcpp/support/channel_arguments.h> +#include <grpcpp/support/slice.h> +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/payloads.pb.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" #include "src/cpp/util/core_stats.h" #include "test/cpp/qps/histogram.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 8215ecbf55..c79a10d1b4 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -26,16 +26,16 @@ #include <thread> #include <vector> -#include <grpc++/alarm.h> -#include <grpc++/channel.h> -#include <grpc++/client_context.h> -#include <grpc++/generic/generic_stub.h> #include <grpc/grpc.h> #include <grpc/support/cpu.h> #include <grpc/support/log.h> +#include <grpcpp/alarm.h> +#include <grpcpp/channel.h> +#include <grpcpp/client_context.h> +#include <grpcpp/generic/generic_stub.h> #include "src/core/lib/surface/completion_queue.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" #include "test/cpp/util/create_test_channel.h" diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index 8c1d9417fa..e65e3b43f3 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -24,18 +24,18 @@ #include <thread> #include <vector> -#include <grpc++/channel.h> -#include <grpc++/client_context.h> -#include <grpc++/server.h> -#include <grpc++/server_builder.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/time.h> +#include <grpcpp/channel.h> +#include <grpcpp/client_context.h> +#include <grpcpp/server.h> +#include <grpcpp/server_builder.h> #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/profiling/timers.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 4e0d266d77..34f1291576 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -23,16 +23,17 @@ #include <unordered_map> #include <vector> -#include <grpc++/channel.h> -#include <grpc++/client_context.h> -#include <grpc++/create_channel.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include <grpcpp/channel.h> +#include <grpcpp/client_context.h> +#include <grpcpp/create_channel.h> #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/profiling/timers.h" +#include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index bd40d0a5a2..776283c25a 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -63,6 +63,11 @@ def guess_cpu(scenario_json, is_tsan): return (scenario_json['num_clients'] * client + scenario_json['num_servers'] * server) +def maybe_exclude_gcov(scenario_json): + if scenario_json['client_config']['client_channels'] > 100: + return ['gcov'] + return [] + print yaml.dump({ 'tests': [ { @@ -76,7 +81,7 @@ print yaml.dump({ 'boringssl': True, 'defaults': 'boringssl', 'cpu_cost': guess_cpu(scenario_json, False), - 'exclude_configs': ['tsan', 'asan'], + 'exclude_configs': ['tsan', 'asan'] + maybe_exclude_gcov(scenario_json), 'timeout_seconds': 2*60, 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []), 'auto_timeout_scaling': False @@ -101,26 +106,24 @@ print yaml.dump({ } for scenario_json in scenario_config.CXXLanguage().scenarios() if 'inproc' in scenario_json.get('CATEGORIES', []) + ] + [ + { + 'name': 'json_run_localhost', + 'shortname': 'json_run_localhost:%s_low_thread_count' % scenario_json['name'], + 'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)], + 'ci_platforms': ['linux'], + 'platforms': ['linux'], + 'flaky': False, + 'language': 'c++', + 'boringssl': True, + 'defaults': 'boringssl', + 'cpu_cost': guess_cpu(scenario_json, True), + 'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')), + 'timeout_seconds': 10*60, + 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []), + 'auto_timeout_scaling': False + } + for scenario_json in scenario_config.CXXLanguage().scenarios() + if 'scalable' in scenario_json.get('CATEGORIES', []) ] - # Disabled until https://github.com/grpc/grpc/issues/13122 is resolved. - # + [ - # { - # 'name': 'json_run_localhost', - # 'shortname': 'json_run_localhost:%s_low_thread_count' % scenario_json['name'], - # 'args': ['--scenarios_json', _scenario_json_string(scenario_json, True)], - # 'ci_platforms': ['linux'], - # 'platforms': ['linux'], - # 'flaky': False, - # 'language': 'c++', - # 'boringssl': True, - # 'defaults': 'boringssl', - # 'cpu_cost': guess_cpu(scenario_json, True), - # 'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')), - # 'timeout_seconds': 10*60, - # 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []), - # 'auto_timeout_scaling': False - # } - # for scenario_json in scenario_config.CXXLanguage().scenarios() - # if 'scalable' in scenario_json.get('CATEGORIES', []) - # ] }) diff --git a/test/cpp/qps/interarrival.h b/test/cpp/qps/interarrival.h index 9c48066c9c..ce4bf3d30c 100644 --- a/test/cpp/qps/interarrival.h +++ b/test/cpp/qps/interarrival.h @@ -24,7 +24,7 @@ #include <random> #include <vector> -#include <grpc++/support/config.h> +#include <grpcpp/support/config.h> namespace grpc { namespace testing { diff --git a/test/cpp/qps/parse_json.h b/test/cpp/qps/parse_json.h index f2fffb52d4..089d9989ba 100644 --- a/test/cpp/qps/parse_json.h +++ b/test/cpp/qps/parse_json.h @@ -19,8 +19,8 @@ #ifndef TEST_QPS_PARSE_JSON_H #define TEST_QPS_PARSE_JSON_H -#include <grpc++/impl/codegen/config_protobuf.h> -#include <grpc++/support/config.h> +#include <grpcpp/impl/codegen/config_protobuf.h> +#include <grpcpp/support/config.h> namespace grpc { namespace testing { diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index b2449da69c..0ff692255c 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -21,7 +21,7 @@ #include <memory> #include <set> -#include <grpc++/impl/codegen/config_protobuf.h> +#include <grpcpp/impl/codegen/config_protobuf.h> #include <gflags/gflags.h> #include <grpc/support/log.h> diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 215a7bfbc9..d3f0380474 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -25,17 +25,17 @@ #include <thread> #include <vector> -#include <grpc++/client_context.h> -#include <grpc++/security/server_credentials.h> -#include <grpc++/server.h> -#include <grpc++/server_builder.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/cpu.h> #include <grpc/support/log.h> +#include <grpcpp/client_context.h> +#include <grpcpp/security/server_credentials.h> +#include <grpcpp/server.h> +#include <grpcpp/server_builder.h> #include "src/core/lib/gpr/host_port.h" -#include "src/proto/grpc/testing/services.pb.h" +#include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/util/grpc_profiler.h" #include "test/core/util/histogram.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/qps_worker.h b/test/cpp/qps/qps_worker.h index a5167426d0..3a8796ee5a 100644 --- a/test/cpp/qps/qps_worker.h +++ b/test/cpp/qps/qps_worker.h @@ -21,10 +21,10 @@ #include <memory> -#include <grpc++/server.h> -#include <grpc++/support/channel_arguments.h> -#include <grpc++/support/config.h> #include <grpc/support/atm.h> +#include <grpcpp/server.h> +#include <grpcpp/support/channel_arguments.h> +#include <grpcpp/support/config.h> #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc index c5e90bd9a4..607f4e579b 100644 --- a/test/cpp/qps/report.cc +++ b/test/cpp/qps/report.cc @@ -25,9 +25,9 @@ #include "test/cpp/qps/parse_json.h" #include "test/cpp/qps/stats.h" -#include <grpc++/client_context.h> +#include <grpcpp/client_context.h> #include "src/cpp/util/core_stats.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/report.h b/test/cpp/qps/report.h index 1d7b2b54e7..8e62f4f449 100644 --- a/test/cpp/qps/report.h +++ b/test/cpp/qps/report.h @@ -23,12 +23,12 @@ #include <set> #include <vector> -#include <grpc++/support/config.h> +#include <grpcpp/support/config.h> #include "test/cpp/qps/driver.h" -#include <grpc++/channel.h> -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include <grpcpp/channel.h> +#include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index d772e709de..6b1ef93617 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -19,11 +19,11 @@ #ifndef TEST_QPS_SERVER_H #define TEST_QPS_SERVER_H -#include <grpc++/resource_quota.h> -#include <grpc++/security/server_credentials.h> -#include <grpc++/server_builder.h> #include <grpc/support/cpu.h> #include <grpc/support/log.h> +#include <grpcpp/resource_quota.h> +#include <grpcpp/security/server_credentials.h> +#include <grpcpp/server_builder.h> #include <vector> #include "src/cpp/util/core_stats.h" diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index f1dfea24d8..1dfef6cfc1 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -23,20 +23,20 @@ #include <mutex> #include <thread> -#include <grpc++/generic/async_generic_service.h> -#include <grpc++/resource_quota.h> -#include <grpc++/security/server_credentials.h> -#include <grpc++/server.h> -#include <grpc++/server_builder.h> -#include <grpc++/server_context.h> -#include <grpc++/support/config.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include <grpcpp/generic/async_generic_service.h> +#include <grpcpp/resource_quota.h> +#include <grpcpp/security/server_credentials.h> +#include <grpcpp/server.h> +#include <grpcpp/server_builder.h> +#include <grpcpp/server_context.h> +#include <grpcpp/support/config.h> #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/surface/completion_queue.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/core/util/test_config.h" #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index 19cbb53445..82a9186989 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -19,14 +19,14 @@ #include <atomic> #include <thread> -#include <grpc++/security/server_credentials.h> -#include <grpc++/server.h> -#include <grpc++/server_context.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> +#include <grpcpp/security/server_credentials.h> +#include <grpcpp/server.h> +#include <grpcpp/server_context.h> #include "src/core/lib/gpr/host_port.h" -#include "src/proto/grpc/testing/services.grpc.pb.h" +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/server.h" #include "test/cpp/qps/usage_timer.h" |