From a478b52cb4e35e5d65db920ab9305452f09f3b8a Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 07:34:07 +0100 Subject: Creating placeholders for missing census functions. --- src/core/statistics/census_init.c | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'src') diff --git a/src/core/statistics/census_init.c b/src/core/statistics/census_init.c index e6306f5e6f..6959c69eaa 100644 --- a/src/core/statistics/census_init.c +++ b/src/core/statistics/census_init.c @@ -46,3 +46,76 @@ void census_shutdown(void) { census_stats_store_shutdown(); census_tracing_shutdown(); } + +census_tag_set *census_context_tag_set(census_context *context) { + (void)context; + abort(); +} + +int census_get_trace_record(census_trace_record *trace_record) { + (void)trace_record); + abort(); +} + +void census_record_values(census_context *context, census_value *values, + size_t nvalues) { + (void)context; + (void)values; + (void)nvalues; + abort(); +} + +void census_set_rpc_client_peer(census_context *context, const char *peer) { + (void)context; + (void)peer; + abort(); +} + +void census_trace_scan_end() { abort(); } + +int census_trace_scan_start(int consume) { + (void)consume; + abort(); +} + +void census_trace_scan_end() { abort(); } + +const census_aggregation *census_view_aggregrations(const census_view *view) { + (void)view; + abort(); +} + +census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, + const census_aggregation *aggregations, + size_t naggregations) { + (void)metric_id; + (void)tags; + (void)census_aggregation; + (void)naggregations; + abort(); +} + +void census_view_delete(census_view *view) { + (void)view; + abort(); +} + +const census_view_data *census_view_get_data(const census_view *view) { + (void)view; + abort(); +} + +size_t census_view_metric(const census_view *view) { + (void)view; + abort(); +} + +size_t census_view_naggregations(const census_view *view) { + (void)view; + abort(); +} + +void census_view_reset(census_view *view) { + (void)view; + abort(); +} -- cgit v1.2.3 From fa132c2f560f6cb6ce42322f446f2d61205e88f6 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:31:15 +0100 Subject: Actually moving this to the proper place. --- BUILD | 3 + Makefile | 2 + binding.gyp | 1 + build.yaml | 1 + gRPC.podspec | 1 + grpc.gemspec | 1 + package.json | 1 + src/core/census/placeholders.c | 109 +++++++++++++++++++++ src/core/statistics/census_init.c | 73 -------------- src/python/grpcio/grpc_core_dependencies.py | 1 + tools/doxygen/Doxyfile.core.internal | 1 + tools/run_tests/sources_and_headers.json | 2 + vsprojects/vcxproj/grpc/grpc.vcxproj | 2 + vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 3 + .../vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 2 + .../grpc_unsecure/grpc_unsecure.vcxproj.filters | 3 + 16 files changed, 133 insertions(+), 73 deletions(-) create mode 100644 src/core/census/placeholders.c (limited to 'src') diff --git a/BUILD b/BUILD index 459aebd820..23a4a94ad5 100644 --- a/BUILD +++ b/BUILD @@ -438,6 +438,7 @@ cc_library( "src/core/census/context.c", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/tag_set.c", "src/core/census/tracing.c", ], @@ -714,6 +715,7 @@ cc_library( "src/core/census/context.c", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/tag_set.c", "src/core/census/tracing.c", ], @@ -1388,6 +1390,7 @@ objc_library( "src/core/census/context.c", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/tag_set.c", "src/core/census/tracing.c", ], diff --git a/Makefile b/Makefile index 31559d5c65..ede3da3693 100644 --- a/Makefile +++ b/Makefile @@ -2505,6 +2505,7 @@ LIBGRPC_SRC = \ src/core/census/context.c \ src/core/census/initialize.c \ src/core/census/operation.c \ + src/core/census/placeholders.c \ src/core/census/tag_set.c \ src/core/census/tracing.c \ @@ -2809,6 +2810,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/census/context.c \ src/core/census/initialize.c \ src/core/census/operation.c \ + src/core/census/placeholders.c \ src/core/census/tag_set.c \ src/core/census/tracing.c \ diff --git a/binding.gyp b/binding.gyp index 651c2e13af..4234f62deb 100644 --- a/binding.gyp +++ b/binding.gyp @@ -699,6 +699,7 @@ 'src/core/census/context.c', 'src/core/census/initialize.c', 'src/core/census/operation.c', + 'src/core/census/placeholders.c', 'src/core/census/tag_set.c', 'src/core/census/tracing.c', ], diff --git a/build.yaml b/build.yaml index 1b3cb79202..f44d42084d 100644 --- a/build.yaml +++ b/build.yaml @@ -20,6 +20,7 @@ filegroups: - src/core/census/context.c - src/core/census/initialize.c - src/core/census/operation.c + - src/core/census/placeholders.c - src/core/census/tag_set.c - src/core/census/tracing.c - name: grpc++_base diff --git a/gRPC.podspec b/gRPC.podspec index 922b246c54..f8740c102b 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -449,6 +449,7 @@ Pod::Spec.new do |s| 'src/core/census/context.c', 'src/core/census/initialize.c', 'src/core/census/operation.c', + 'src/core/census/placeholders.c', 'src/core/census/tag_set.c', 'src/core/census/tracing.c' diff --git a/grpc.gemspec b/grpc.gemspec index 7f11ec778a..61f0380b57 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -432,6 +432,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/census/context.c ) s.files += %w( src/core/census/initialize.c ) s.files += %w( src/core/census/operation.c ) + s.files += %w( src/core/census/placeholders.c ) s.files += %w( src/core/census/tag_set.c ) s.files += %w( src/core/census/tracing.c ) end diff --git a/package.json b/package.json index f02a100bc7..51b3e12b02 100644 --- a/package.json +++ b/package.json @@ -373,6 +373,7 @@ "src/core/census/context.c", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/tag_set.c", "src/core/census/tracing.c", "third_party/zlib/crc32.h", diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c new file mode 100644 index 0000000000..4f6d9f6303 --- /dev/null +++ b/src/core/census/placeholders.c @@ -0,0 +1,109 @@ +/* + * + * Copyright 2016, 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. + * + */ + +#include + +/* Placeholders for the pending APIs */ + +census_tag_set *census_context_tag_set(census_context *context) { + (void)context; + abort(); +} + +int census_get_trace_record(census_trace_record *trace_record) { + (void)trace_record); + abort(); +} + +void census_record_values(census_context *context, census_value *values, + size_t nvalues) { + (void)context; + (void)values; + (void)nvalues; + abort(); +} + +void census_set_rpc_client_peer(census_context *context, const char *peer) { + (void)context; + (void)peer; + abort(); +} + +void census_trace_scan_end() { abort(); } + +int census_trace_scan_start(int consume) { + (void)consume; + abort(); +} + +void census_trace_scan_end() { abort(); } + +const census_aggregation *census_view_aggregrations(const census_view *view) { + (void)view; + abort(); +} + +census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, + const census_aggregation *aggregations, + size_t naggregations) { + (void)metric_id; + (void)tags; + (void)census_aggregation; + (void)naggregations; + abort(); +} + +void census_view_delete(census_view *view) { + (void)view; + abort(); +} + +const census_view_data *census_view_get_data(const census_view *view) { + (void)view; + abort(); +} + +size_t census_view_metric(const census_view *view) { + (void)view; + abort(); +} + +size_t census_view_naggregations(const census_view *view) { + (void)view; + abort(); +} + +void census_view_reset(census_view *view) { + (void)view; + abort(); +} diff --git a/src/core/statistics/census_init.c b/src/core/statistics/census_init.c index 6959c69eaa..e6306f5e6f 100644 --- a/src/core/statistics/census_init.c +++ b/src/core/statistics/census_init.c @@ -46,76 +46,3 @@ void census_shutdown(void) { census_stats_store_shutdown(); census_tracing_shutdown(); } - -census_tag_set *census_context_tag_set(census_context *context) { - (void)context; - abort(); -} - -int census_get_trace_record(census_trace_record *trace_record) { - (void)trace_record); - abort(); -} - -void census_record_values(census_context *context, census_value *values, - size_t nvalues) { - (void)context; - (void)values; - (void)nvalues; - abort(); -} - -void census_set_rpc_client_peer(census_context *context, const char *peer) { - (void)context; - (void)peer; - abort(); -} - -void census_trace_scan_end() { abort(); } - -int census_trace_scan_start(int consume) { - (void)consume; - abort(); -} - -void census_trace_scan_end() { abort(); } - -const census_aggregation *census_view_aggregrations(const census_view *view) { - (void)view; - abort(); -} - -census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, - const census_aggregation *aggregations, - size_t naggregations) { - (void)metric_id; - (void)tags; - (void)census_aggregation; - (void)naggregations; - abort(); -} - -void census_view_delete(census_view *view) { - (void)view; - abort(); -} - -const census_view_data *census_view_get_data(const census_view *view) { - (void)view; - abort(); -} - -size_t census_view_metric(const census_view *view) { - (void)view; - abort(); -} - -size_t census_view_naggregations(const census_view *view) { - (void)view; - abort(); -} - -void census_view_reset(census_view *view) { - (void)view; - abort(); -} diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 98ab1ff7f0..6dfc179ac7 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -221,6 +221,7 @@ CORE_SOURCE_FILES = [ 'src/core/census/context.c', 'src/core/census/initialize.c', 'src/core/census/operation.c', + 'src/core/census/placeholders.c', 'src/core/census/tag_set.c', 'src/core/census/tracing.c', 'src/boringssl/err_data.c', diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 11dc33a463..47df693106 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1047,6 +1047,7 @@ src/core/transport/transport_op_string.c \ src/core/census/context.c \ src/core/census/initialize.c \ src/core/census/operation.c \ +src/core/census/placeholders.c \ src/core/census/tag_set.c \ src/core/census/tracing.c \ include/grpc/support/alloc.h \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 9113f1ca05..bb3c9c413e 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -3092,6 +3092,7 @@ "src/core/census/grpc_filter.h", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/rpc_metric_id.h", "src/core/census/tag_set.c", "src/core/census/tracing.c", @@ -3591,6 +3592,7 @@ "src/core/census/grpc_filter.h", "src/core/census/initialize.c", "src/core/census/operation.c", + "src/core/census/placeholders.c", "src/core/census/rpc_metric_id.h", "src/core/census/tag_set.c", "src/core/census/tracing.c", diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 438667a4d9..89056959a9 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -708,6 +708,8 @@ + + diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 90395cadda..70b3761aa3 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -451,6 +451,9 @@ src\core\census + + src\core\census + src\core\census diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 014e67f461..ff1cb8b76e 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -644,6 +644,8 @@ + + diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 4f8a77d4b2..738137d095 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -391,6 +391,9 @@ src\core\census + + src\core\census + src\core\census -- cgit v1.2.3 From 64cfcc6cf0c9d4a3987748a09501d5a5495bd59e Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:38:34 +0100 Subject: Typo. --- src/core/census/placeholders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c index 4f6d9f6303..0868df9d3c 100644 --- a/src/core/census/placeholders.c +++ b/src/core/census/placeholders.c @@ -41,7 +41,7 @@ census_tag_set *census_context_tag_set(census_context *context) { } int census_get_trace_record(census_trace_record *trace_record) { - (void)trace_record); + (void)trace_record; abort(); } -- cgit v1.2.3 From 8002718e979bb807dbe96fad153be38a253b3afc Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:42:42 +0100 Subject: Typos. --- src/core/census/placeholders.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c index 0868df9d3c..88f8fb1fc4 100644 --- a/src/core/census/placeholders.c +++ b/src/core/census/placeholders.c @@ -66,8 +66,6 @@ int census_trace_scan_start(int consume) { abort(); } -void census_trace_scan_end() { abort(); } - const census_aggregation *census_view_aggregrations(const census_view *view) { (void)view; abort(); @@ -78,7 +76,7 @@ census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, size_t naggregations) { (void)metric_id; (void)tags; - (void)census_aggregation; + (void)aggregations; (void)naggregations; abort(); } -- cgit v1.2.3 From b46a5ea5f66f52bf3e72d364793b527d8b4cf8a0 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:45:42 +0100 Subject: Missed one. --- src/core/census/placeholders.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c index 88f8fb1fc4..ef9e4854be 100644 --- a/src/core/census/placeholders.c +++ b/src/core/census/placeholders.c @@ -81,6 +81,10 @@ census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, abort(); } +const census_tag_set *census_view_tags(const census_view *view) { + (void)view; +} + void census_view_delete(census_view *view) { (void)view; abort(); -- cgit v1.2.3 From 2cd3210fc089d96c80c2969244a6a7317a24c717 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:48:07 +0100 Subject: Forgot the abort(). --- src/core/census/placeholders.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c index ef9e4854be..b15a296984 100644 --- a/src/core/census/placeholders.c +++ b/src/core/census/placeholders.c @@ -83,6 +83,7 @@ census_view *census_view_create(uint32_t metric_id, const census_tag_set *tags, const census_tag_set *census_view_tags(const census_view *view) { (void)view; + abort(); } void census_view_delete(census_view *view) { -- cgit v1.2.3 From 780f336a10d72b4aa9c213c70d3d14f89a70e4c1 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 31 Jan 2016 09:53:33 +0100 Subject: Adding log.h for definition of abort. --- src/core/census/placeholders.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/core/census/placeholders.c b/src/core/census/placeholders.c index b15a296984..5829cc9460 100644 --- a/src/core/census/placeholders.c +++ b/src/core/census/placeholders.c @@ -33,6 +33,8 @@ #include +#include + /* Placeholders for the pending APIs */ census_tag_set *census_context_tag_set(census_context *context) { -- cgit v1.2.3 From 50c69ab7f0da3a15c982bdb421a35623761260e6 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Mon, 1 Feb 2016 00:46:54 +0100 Subject: Fixing copyrights. --- src/core/statistics/census_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/statistics/census_init.c b/src/core/statistics/census_init.c index e6306f5e6f..b6a962f228 100644 --- a/src/core/statistics/census_init.c +++ b/src/core/statistics/census_init.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.2.3