diff options
author | ncteisen <ncteisen@gmail.com> | 2018-06-28 00:12:02 -0700 |
---|---|---|
committer | ncteisen <ncteisen@gmail.com> | 2018-06-28 00:12:02 -0700 |
commit | 8db7788d46fcdf9f35e8708e3b04bc4753f9f288 (patch) | |
tree | d321282205f58aa6dad45c29f4c3ab9331553436 /BUILD | |
parent | 0d878eae6cedf32e6e77e02f4c29ec232b41eb63 (diff) | |
parent | 28512108da77ccbc7954642c71312425744dfe19 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into serialization
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD | 75 |
1 files changed, 63 insertions, 12 deletions
@@ -29,8 +29,8 @@ package( load( "//bazel:grpc_build_system.bzl", "grpc_cc_library", - "grpc_proto_plugin", "grpc_generate_one_off_targets", + "grpc_proto_plugin", ) config_setting( @@ -676,6 +676,7 @@ grpc_cc_library( "src/core/lib/channel/channel_stack.cc", "src/core/lib/channel/channel_stack_builder.cc", "src/core/lib/channel/channel_trace.cc", + "src/core/lib/channel/channelz.cc", "src/core/lib/channel/channelz_registry.cc", "src/core/lib/channel/connected_channel.cc", "src/core/lib/channel/handshaker.cc", @@ -823,6 +824,7 @@ grpc_cc_library( "src/core/lib/channel/channel_stack.h", "src/core/lib/channel/channel_stack_builder.h", "src/core/lib/channel/channel_trace.h", + "src/core/lib/channel/channelz.h", "src/core/lib/channel/channelz_registry.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", @@ -986,7 +988,6 @@ grpc_cc_library( "grpc_client_authority_filter", "grpc_lb_policy_pick_first", "grpc_lb_policy_round_robin", - "grpc_server_load_reporting", "grpc_max_age_filter", "grpc_message_size_filter", "grpc_resolver_dns_ares", @@ -1197,6 +1198,8 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc", "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c", ], hdrs = [ "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h", @@ -1205,6 +1208,8 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h", ], external_deps = [ "nanopb", @@ -1226,6 +1231,8 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc", "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc", "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c", ], hdrs = [ "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h", @@ -1234,6 +1241,8 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h", "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h", + "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h", ], external_deps = [ "nanopb", @@ -1286,18 +1295,22 @@ grpc_cc_library( ) grpc_cc_library( - name = "grpc_server_load_reporting", + name = "lb_server_load_reporting_filter", srcs = [ "src/core/ext/filters/load_reporting/server_load_reporting_filter.cc", - "src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc", ], hdrs = [ + "src/core/ext/filters/load_reporting/registered_opencensus_objects.h", "src/core/ext/filters/load_reporting/server_load_reporting_filter.h", - "src/core/ext/filters/load_reporting/server_load_reporting_plugin.h", + "src/cpp/server/load_reporter/constants.h", + ], + external_deps = [ + "opencensus-stats", ], language = "c++", deps = [ - "grpc_base", + "grpc++_base", + "grpc_secure", ], ) @@ -1307,6 +1320,7 @@ grpc_cc_library( "src/cpp/server/load_reporter/load_data_store.cc", ], hdrs = [ + "src/cpp/server/load_reporter/constants.h", "src/cpp/server/load_reporter/load_data_store.h", ], language = "c++", @@ -1316,6 +1330,43 @@ grpc_cc_library( ) grpc_cc_library( + name = "lb_get_cpu_stats", + srcs = [ + "src/cpp/server/load_reporter/get_cpu_stats_linux.cc", + "src/cpp/server/load_reporter/get_cpu_stats_macos.cc", + "src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc", + "src/cpp/server/load_reporter/get_cpu_stats_windows.cc", + ], + hdrs = [ + "src/cpp/server/load_reporter/get_cpu_stats.h", + ], + language = "c++", + deps = [ + "grpc++", + ], +) + +grpc_cc_library( + name = "lb_load_reporter", + srcs = [ + "src/cpp/server/load_reporter/load_reporter.cc", + ], + hdrs = [ + "src/cpp/server/load_reporter/constants.h", + "src/cpp/server/load_reporter/load_reporter.h", + ], + external_deps = [ + "opencensus-stats", + ], + language = "c++", + deps = [ + "lb_get_cpu_stats", + "lb_load_data_store", + "//src/proto/grpc/lb/v1:load_reporter_proto", + ], +) + +grpc_cc_library( name = "grpc_resolver_dns_native", srcs = [ "src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc", @@ -1738,11 +1789,11 @@ grpc_cc_library( "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h", "src/core/tsi/alts/handshaker/transport_security_common_api.h", ], - public_hdrs = GRPC_SECURE_PUBLIC_HDRS, external_deps = [ "nanopb", ], language = "c++", + public_hdrs = GRPC_SECURE_PUBLIC_HDRS, deps = [ "alts_proto", "gpr", @@ -1992,33 +2043,33 @@ grpc_cc_library( grpc_cc_library( name = "grpc_opencensus_plugin", srcs = [ - "src/cpp/ext/filters/census/client_filter.cc", - "src/cpp/ext/filters/census/server_filter.cc", "src/cpp/ext/filters/census/channel_filter.cc", + "src/cpp/ext/filters/census/client_filter.cc", "src/cpp/ext/filters/census/context.cc", "src/cpp/ext/filters/census/grpc_context.cc", "src/cpp/ext/filters/census/grpc_plugin.cc", "src/cpp/ext/filters/census/measures.cc", "src/cpp/ext/filters/census/rpc_encoding.cc", + "src/cpp/ext/filters/census/server_filter.cc", "src/cpp/ext/filters/census/views.cc", ], hdrs = [ "include/grpcpp/opencensus.h", - "src/cpp/ext/filters/census/client_filter.h", - "src/cpp/ext/filters/census/server_filter.h", "src/cpp/ext/filters/census/channel_filter.h", + "src/cpp/ext/filters/census/client_filter.h", "src/cpp/ext/filters/census/context.h", "src/cpp/ext/filters/census/grpc_plugin.h", "src/cpp/ext/filters/census/measures.h", "src/cpp/ext/filters/census/rpc_encoding.h", + "src/cpp/ext/filters/census/server_filter.h", ], - language = "c++", external_deps = [ "absl-base", "absl-time", "opencensus-trace", "opencensus-stats", ], + language = "c++", deps = [ ":census", ":grpc++", |