From 280866817ffdec59d0446df3c99c2544837da3ad Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 18 Jul 2017 14:22:19 -0700 Subject: Add a simple stats framework to gRPC C core --- vsprojects/vcxproj/grpc/grpc.vcxproj | 6 ++++++ vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 12 ++++++++++++ vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj | 6 ++++++ .../vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters | 12 ++++++++++++ vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 6 ++++++ .../vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | 12 ++++++++++++ 6 files changed, 54 insertions(+) (limited to 'vsprojects') diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 41fe1b222b..6ffb0ac084 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -412,6 +412,8 @@ + + @@ -776,6 +778,10 @@ + + + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 00b8705826..ea58322a65 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -382,6 +382,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + src\core\ext\transport\chttp2\server\secure @@ -1193,6 +1199,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + src\core\ext\transport\chttp2\transport diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj index 32809ca589..4ba0ef78cf 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj @@ -307,6 +307,8 @@ + + @@ -601,6 +603,10 @@ + + + + diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters index def8de4202..fa2a6e3545 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters @@ -439,6 +439,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + @@ -917,6 +923,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index ac98dc0540..7684ed42e2 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -402,6 +402,8 @@ + + @@ -742,6 +744,10 @@ + + + + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index fea68c51dc..93f68e5698 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -385,6 +385,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + src\core\ext\transport\chttp2\server\insecure @@ -1100,6 +1106,12 @@ src\core\lib\debug + + src\core\lib\debug + + + src\core\lib\debug + src\core\ext\transport\chttp2\transport -- cgit v1.2.3 From b89304652b162453df2ad21ab45123735a106392 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 19 Jul 2017 16:24:19 -0700 Subject: Build simplification --- CMakeLists.txt | 20 ++++++++-------- Makefile | 20 ++++++++-------- binding.gyp | 4 ++-- build.yaml | 14 ++++------- config.m4 | 4 ++-- config.w32 | 4 ++-- gRPC-Core.podspec | 12 +++++----- grpc.gemspec | 8 +++---- package.xml | 8 +++---- src/python/grpcio/grpc_core_dependencies.py | 4 ++-- test/cpp/microbenchmarks/helpers.cc | 7 ++++++ test/cpp/microbenchmarks/helpers.h | 3 +++ tools/run_tests/generated/sources_and_headers.json | 27 +++++----------------- vsprojects/vcxproj/grpc/grpc.vcxproj | 12 +++++----- vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 24 +++++++++---------- .../vcxproj/grpc_test_util/grpc_test_util.vcxproj | 12 +++++----- .../grpc_test_util/grpc_test_util.vcxproj.filters | 24 +++++++++---------- .../vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 12 +++++----- .../grpc_unsecure/grpc_unsecure.vcxproj.filters | 24 +++++++++---------- 19 files changed, 116 insertions(+), 127 deletions(-) (limited to 'vsprojects') diff --git a/CMakeLists.txt b/CMakeLists.txt index db629e8499..d50bd440a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -957,6 +957,8 @@ add_library(grpc src/core/lib/compression/compression.c src/core/lib/compression/message_compress.c src/core/lib/compression/stream_compression.c + src/core/lib/debug/stats.c + src/core/lib/debug/stats_data.c src/core/lib/http/format_request.c src/core/lib/http/httpcli.c src/core/lib/http/parser.c @@ -1073,8 +1075,6 @@ add_library(grpc src/core/lib/transport/transport.c src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c - src/core/lib/debug/stats.c - src/core/lib/debug/stats_data.c src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c src/core/ext/transport/chttp2/transport/bin_decoder.c src/core/ext/transport/chttp2/transport/bin_encoder.c @@ -1302,6 +1302,8 @@ add_library(grpc_cronet src/core/lib/compression/compression.c src/core/lib/compression/message_compress.c src/core/lib/compression/stream_compression.c + src/core/lib/debug/stats.c + src/core/lib/debug/stats_data.c src/core/lib/http/format_request.c src/core/lib/http/httpcli.c src/core/lib/http/parser.c @@ -1418,8 +1420,6 @@ add_library(grpc_cronet src/core/lib/transport/transport.c src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c - src/core/lib/debug/stats.c - src/core/lib/debug/stats_data.c src/core/ext/transport/cronet/client/secure/cronet_channel_create.c src/core/ext/transport/cronet/transport/cronet_api_dummy.c src/core/ext/transport/cronet/transport/cronet_transport.c @@ -1625,6 +1625,8 @@ add_library(grpc_test_util src/core/lib/compression/compression.c src/core/lib/compression/message_compress.c src/core/lib/compression/stream_compression.c + src/core/lib/debug/stats.c + src/core/lib/debug/stats_data.c src/core/lib/http/format_request.c src/core/lib/http/httpcli.c src/core/lib/http/parser.c @@ -1741,8 +1743,6 @@ add_library(grpc_test_util src/core/lib/transport/transport.c src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c - src/core/lib/debug/stats.c - src/core/lib/debug/stats_data.c ) if(WIN32 AND MSVC) @@ -1890,6 +1890,8 @@ add_library(grpc_unsecure src/core/lib/compression/compression.c src/core/lib/compression/message_compress.c src/core/lib/compression/stream_compression.c + src/core/lib/debug/stats.c + src/core/lib/debug/stats_data.c src/core/lib/http/format_request.c src/core/lib/http/httpcli.c src/core/lib/http/parser.c @@ -2006,8 +2008,6 @@ add_library(grpc_unsecure src/core/lib/transport/transport.c src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c - src/core/lib/debug/stats.c - src/core/lib/debug/stats_data.c src/core/ext/transport/chttp2/server/insecure/server_chttp2.c src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c src/core/ext/transport/chttp2/transport/bin_decoder.c @@ -2551,6 +2551,8 @@ add_library(grpc++_cronet src/core/lib/compression/compression.c src/core/lib/compression/message_compress.c src/core/lib/compression/stream_compression.c + src/core/lib/debug/stats.c + src/core/lib/debug/stats_data.c src/core/lib/http/format_request.c src/core/lib/http/httpcli.c src/core/lib/http/parser.c @@ -2667,8 +2669,6 @@ add_library(grpc++_cronet src/core/lib/transport/transport.c src/core/lib/transport/transport_op_string.c src/core/lib/debug/trace.c - src/core/lib/debug/stats.c - src/core/lib/debug/stats_data.c src/core/ext/transport/chttp2/alpn/alpn.c src/core/ext/filters/http/client/http_client_filter.c src/core/ext/filters/http/http_filters_plugin.c diff --git a/Makefile b/Makefile index d942f94e4a..9b005ef9e2 100644 --- a/Makefile +++ b/Makefile @@ -2901,6 +2901,8 @@ LIBGRPC_SRC = \ src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -3017,8 +3019,6 @@ LIBGRPC_SRC = \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c \ src/core/ext/transport/chttp2/transport/bin_decoder.c \ src/core/ext/transport/chttp2/transport/bin_encoder.c \ @@ -3244,6 +3244,8 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -3360,8 +3362,6 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ src/core/ext/transport/cronet/client/secure/cronet_channel_create.c \ src/core/ext/transport/cronet/transport/cronet_api_dummy.c \ src/core/ext/transport/cronet/transport/cronet_transport.c \ @@ -3564,6 +3564,8 @@ LIBGRPC_TEST_UTIL_SRC = \ src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -3680,8 +3682,6 @@ LIBGRPC_TEST_UTIL_SRC = \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ @@ -3801,6 +3801,8 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -3917,8 +3919,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \ src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \ src/core/ext/transport/chttp2/transport/bin_decoder.c \ @@ -4446,6 +4446,8 @@ LIBGRPC++_CRONET_SRC = \ src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -4562,8 +4564,6 @@ LIBGRPC++_CRONET_SRC = \ src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ src/core/ext/transport/chttp2/alpn/alpn.c \ src/core/ext/filters/http/client/http_client_filter.c \ src/core/ext/filters/http/http_filters_plugin.c \ diff --git a/binding.gyp b/binding.gyp index f091850be1..b514d7aa60 100644 --- a/binding.gyp +++ b/binding.gyp @@ -646,6 +646,8 @@ 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/compression/stream_compression.c', + 'src/core/lib/debug/stats.c', + 'src/core/lib/debug/stats_data.c', 'src/core/lib/http/format_request.c', 'src/core/lib/http/httpcli.c', 'src/core/lib/http/parser.c', @@ -762,8 +764,6 @@ 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', 'src/core/lib/debug/trace.c', - 'src/core/lib/debug/stats.c', - 'src/core/lib/debug/stats_data.c', 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/ext/transport/chttp2/transport/bin_decoder.c', 'src/core/ext/transport/chttp2/transport/bin_encoder.c', diff --git a/build.yaml b/build.yaml index 0811606e40..ea2eb1d42b 100644 --- a/build.yaml +++ b/build.yaml @@ -192,6 +192,8 @@ filegroups: - src/core/lib/compression/algorithm_metadata.h - src/core/lib/compression/message_compress.h - src/core/lib/compression/stream_compression.h + - src/core/lib/debug/stats.h + - src/core/lib/debug/stats_data.h - src/core/lib/http/format_request.h - src/core/lib/http/httpcli.h - src/core/lib/http/parser.h @@ -302,6 +304,8 @@ filegroups: - src/core/lib/compression/compression.c - src/core/lib/compression/message_compress.c - src/core/lib/compression/stream_compression.c + - src/core/lib/debug/stats.c + - src/core/lib/debug/stats_data.c - src/core/lib/http/format_request.c - src/core/lib/http/httpcli.c - src/core/lib/http/parser.c @@ -422,7 +426,6 @@ filegroups: uses: - grpc_codegen - grpc_trace - - grpc_stats - name: grpc_client_channel headers: - src/core/ext/filters/client_channel/client_channel.h @@ -680,15 +683,6 @@ filegroups: - src/core/ext/filters/workarounds/workaround_utils.c uses: - grpc_base -- name: grpc_stats - headers: - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - src: - - src/core/lib/debug/stats.c - - src/core/lib/debug/stats_data.c - deps: - - gpr - name: grpc_test_util_base build: test headers: diff --git a/config.m4 b/config.m4 index 9e43a78be5..0f1253bdc1 100644 --- a/config.m4 +++ b/config.m4 @@ -96,6 +96,8 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/compression/compression.c \ src/core/lib/compression/message_compress.c \ src/core/lib/compression/stream_compression.c \ + src/core/lib/debug/stats.c \ + src/core/lib/debug/stats_data.c \ src/core/lib/http/format_request.c \ src/core/lib/http/httpcli.c \ src/core/lib/http/parser.c \ @@ -212,8 +214,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/transport.c \ src/core/lib/transport/transport_op_string.c \ src/core/lib/debug/trace.c \ - src/core/lib/debug/stats.c \ - src/core/lib/debug/stats_data.c \ src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c \ src/core/ext/transport/chttp2/transport/bin_decoder.c \ src/core/ext/transport/chttp2/transport/bin_encoder.c \ diff --git a/config.w32 b/config.w32 index 2dd3b4d3de..86578ab057 100644 --- a/config.w32 +++ b/config.w32 @@ -73,6 +73,8 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\compression\\compression.c " + "src\\core\\lib\\compression\\message_compress.c " + "src\\core\\lib\\compression\\stream_compression.c " + + "src\\core\\lib\\debug\\stats.c " + + "src\\core\\lib\\debug\\stats_data.c " + "src\\core\\lib\\http\\format_request.c " + "src\\core\\lib\\http\\httpcli.c " + "src\\core\\lib\\http\\parser.c " + @@ -189,8 +191,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\transport.c " + "src\\core\\lib\\transport\\transport_op_string.c " + "src\\core\\lib\\debug\\trace.c " + - "src\\core\\lib\\debug\\stats.c " + - "src\\core\\lib\\debug\\stats_data.c " + "src\\core\\ext\\transport\\chttp2\\server\\secure\\server_secure_chttp2.c " + "src\\core\\ext\\transport\\chttp2\\transport\\bin_decoder.c " + "src\\core\\ext\\transport\\chttp2\\transport\\bin_encoder.c " + diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 4135c6522e..0c3d1f914d 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -255,6 +255,8 @@ Pod::Spec.new do |s| 'src/core/lib/compression/algorithm_metadata.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/compression/stream_compression.h', + 'src/core/lib/debug/stats.h', + 'src/core/lib/debug/stats_data.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/parser.h', @@ -355,8 +357,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_impl.h', 'src/core/lib/debug/trace.h', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', @@ -472,6 +472,8 @@ Pod::Spec.new do |s| 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/compression/stream_compression.c', + 'src/core/lib/debug/stats.c', + 'src/core/lib/debug/stats_data.c', 'src/core/lib/http/format_request.c', 'src/core/lib/http/httpcli.c', 'src/core/lib/http/parser.c', @@ -588,8 +590,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', 'src/core/lib/debug/trace.c', - 'src/core/lib/debug/stats.c', - 'src/core/lib/debug/stats_data.c', 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/ext/transport/chttp2/transport/bin_decoder.c', 'src/core/ext/transport/chttp2/transport/bin_encoder.c', @@ -743,6 +743,8 @@ Pod::Spec.new do |s| 'src/core/lib/compression/algorithm_metadata.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/compression/stream_compression.h', + 'src/core/lib/debug/stats.h', + 'src/core/lib/debug/stats_data.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/parser.h', @@ -843,8 +845,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_impl.h', 'src/core/lib/debug/trace.h', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', 'src/core/ext/transport/chttp2/transport/chttp2_transport.h', diff --git a/grpc.gemspec b/grpc.gemspec index 9c4badb5a6..21d02219cb 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -187,6 +187,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/compression/algorithm_metadata.h ) s.files += %w( src/core/lib/compression/message_compress.h ) s.files += %w( src/core/lib/compression/stream_compression.h ) + s.files += %w( src/core/lib/debug/stats.h ) + s.files += %w( src/core/lib/debug/stats_data.h ) s.files += %w( src/core/lib/http/format_request.h ) s.files += %w( src/core/lib/http/httpcli.h ) s.files += %w( src/core/lib/http/parser.h ) @@ -287,8 +289,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport.h ) s.files += %w( src/core/lib/transport/transport_impl.h ) s.files += %w( src/core/lib/debug/trace.h ) - s.files += %w( src/core/lib/debug/stats.h ) - s.files += %w( src/core/lib/debug/stats_data.h ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_decoder.h ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h ) s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h ) @@ -408,6 +408,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/compression/compression.c ) s.files += %w( src/core/lib/compression/message_compress.c ) s.files += %w( src/core/lib/compression/stream_compression.c ) + s.files += %w( src/core/lib/debug/stats.c ) + s.files += %w( src/core/lib/debug/stats_data.c ) s.files += %w( src/core/lib/http/format_request.c ) s.files += %w( src/core/lib/http/httpcli.c ) s.files += %w( src/core/lib/http/parser.c ) @@ -524,8 +526,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport.c ) s.files += %w( src/core/lib/transport/transport_op_string.c ) s.files += %w( src/core/lib/debug/trace.c ) - s.files += %w( src/core/lib/debug/stats.c ) - s.files += %w( src/core/lib/debug/stats_data.c ) s.files += %w( src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_decoder.c ) s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.c ) diff --git a/package.xml b/package.xml index ded7ffc52b..b9b9f21572 100644 --- a/package.xml +++ b/package.xml @@ -201,6 +201,8 @@ + + @@ -301,8 +303,6 @@ - - @@ -422,6 +422,8 @@ + + @@ -538,8 +540,6 @@ - - diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 1f3a8c8a63..41b7e7dc74 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -72,6 +72,8 @@ CORE_SOURCE_FILES = [ 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/compression/stream_compression.c', + 'src/core/lib/debug/stats.c', + 'src/core/lib/debug/stats_data.c', 'src/core/lib/http/format_request.c', 'src/core/lib/http/httpcli.c', 'src/core/lib/http/parser.c', @@ -188,8 +190,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/transport.c', 'src/core/lib/transport/transport_op_string.c', 'src/core/lib/debug/trace.c', - 'src/core/lib/debug/stats.c', - 'src/core/lib/debug/stats_data.c', 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c', 'src/core/ext/transport/chttp2/transport/bin_decoder.c', 'src/core/ext/transport/chttp2/transport/bin_encoder.c', diff --git a/test/cpp/microbenchmarks/helpers.cc b/test/cpp/microbenchmarks/helpers.cc index 0c10d6c4ce..415d27445f 100644 --- a/test/cpp/microbenchmarks/helpers.cc +++ b/test/cpp/microbenchmarks/helpers.cc @@ -29,6 +29,13 @@ void TrackCounters::Finish(benchmark::State &state) { } void TrackCounters::AddToLabel(std::ostream &out, benchmark::State &state) { + grpc_stats_data stats_end; + grpc_stats_collect(&stats_end); + for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { + out << " " << grpc_stats_counter_name[i] << "/iter:" + << ((double)(stats_end.counters[i] - stats_begin_.counters[i]) / + (double)state.iterations()); + } #ifdef GPR_LOW_LEVEL_COUNTERS grpc_memory_counters counters_at_end = grpc_memory_counters_snapshot(); out << " locks/iter:" << ((double)(gpr_atm_no_barrier_load(&gpr_mu_locks) - diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index c81d95a4ea..07dd611709 100644 --- a/test/cpp/microbenchmarks/helpers.h +++ b/test/cpp/microbenchmarks/helpers.h @@ -23,6 +23,7 @@ extern "C" { #include +#include "src/core/lib/debug/stats.h" #include "test/core/util/memory_counters.h" } @@ -62,10 +63,12 @@ extern "C" gpr_atm gpr_now_call_count; class TrackCounters { public: + TrackCounters() { grpc_stats_collect(&stats_begin_); } virtual void Finish(benchmark::State& state); virtual void AddToLabel(std::ostream& out, benchmark::State& state); private: + grpc_stats_data stats_begin_; #ifdef GPR_LOW_LEVEL_COUNTERS const size_t mu_locks_at_start_ = gpr_atm_no_barrier_load(&gpr_mu_locks); const size_t atm_cas_at_start_ = diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index bdad9e9d01..b0dbc0da89 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -7691,7 +7691,6 @@ "deps": [ "gpr", "grpc_codegen", - "grpc_stats", "grpc_trace" ], "headers": [ @@ -7717,6 +7716,8 @@ "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/compression/stream_compression.h", + "src/core/lib/debug/stats.h", + "src/core/lib/debug/stats_data.h", "src/core/lib/http/format_request.h", "src/core/lib/http/httpcli.h", "src/core/lib/http/parser.h", @@ -7853,6 +7854,10 @@ "src/core/lib/compression/message_compress.h", "src/core/lib/compression/stream_compression.c", "src/core/lib/compression/stream_compression.h", + "src/core/lib/debug/stats.c", + "src/core/lib/debug/stats.h", + "src/core/lib/debug/stats_data.c", + "src/core/lib/debug/stats_data.h", "src/core/lib/http/format_request.c", "src/core/lib/http/format_request.h", "src/core/lib/http/httpcli.c", @@ -8552,26 +8557,6 @@ "third_party": false, "type": "filegroup" }, - { - "deps": [ - "gpr" - ], - "headers": [ - "src/core/lib/debug/stats.h", - "src/core/lib/debug/stats_data.h" - ], - "is_filegroup": true, - "language": "c", - "name": "grpc_stats", - "src": [ - "src/core/lib/debug/stats.c", - "src/core/lib/debug/stats.h", - "src/core/lib/debug/stats_data.c", - "src/core/lib/debug/stats_data.h" - ], - "third_party": false, - "type": "filegroup" - }, { "deps": [ "gpr_test_util", diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 6ffb0ac084..6376fd5ad2 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -312,6 +312,8 @@ + + @@ -412,8 +414,6 @@ - - @@ -546,6 +546,10 @@ + + + + @@ -778,10 +782,6 @@ - - - - diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index ea58322a65..9335e1deb8 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -34,6 +34,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -382,12 +388,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - src\core\ext\transport\chttp2\server\secure @@ -899,6 +899,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -1199,12 +1205,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - src\core\ext\transport\chttp2\transport diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj index 4ba0ef78cf..08abb31a00 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj @@ -207,6 +207,8 @@ + + @@ -307,8 +309,6 @@ - - @@ -371,6 +371,10 @@ + + + + @@ -603,10 +607,6 @@ - - - - diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters index fa2a6e3545..b4a934986e 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters @@ -91,6 +91,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -439,12 +445,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - @@ -623,6 +623,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -923,12 +929,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 7684ed42e2..2ba8917fdd 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -302,6 +302,8 @@ + + @@ -402,8 +404,6 @@ - - @@ -512,6 +512,10 @@ + + + + @@ -744,10 +748,6 @@ - - - - diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 93f68e5698..53cce0aa0f 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -37,6 +37,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -385,12 +391,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - src\core\ext\transport\chttp2\server\insecure @@ -806,6 +806,12 @@ src\core\lib\compression + + src\core\lib\debug + + + src\core\lib\debug + src\core\lib\http @@ -1106,12 +1112,6 @@ src\core\lib\debug - - src\core\lib\debug - - - src\core\lib\debug - src\core\ext\transport\chttp2\transport -- cgit v1.2.3