Merge branch 'cleaner-posix' into cleaner-posix2

BUILD

@@ -194,6 +194,7 @@ cc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.h",
  "src/core/client_config/subchannel.h",
  "src/core/client_config/subchannel_factory.h",
+ "src/core/client_config/subchannel_index.h",
  "src/core/client_config/uri_parser.h",
  "src/core/compression/algorithm_metadata.h",
  "src/core/compression/message_compress.h",
@@ -282,6 +283,7 @@ cc_library(
  "src/core/transport/transport.h",
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
+ "src/core/census/log.h",
  "src/core/census/rpc_metric_id.h",
  "src/core/httpcli/httpcli_security_connector.c",
  "src/core/security/base64.c",
@@ -331,6 +333,7 @@ cc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.c",
  "src/core/client_config/subchannel.c",
  "src/core/client_config/subchannel_factory.c",
+ "src/core/client_config/subchannel_index.c",
  "src/core/client_config/uri_parser.c",
  "src/core/compression/algorithm.c",
  "src/core/compression/message_compress.c",
@@ -434,6 +437,7 @@ cc_library(
  "src/core/transport/transport_op_string.c",
  "src/core/census/context.c",
  "src/core/census/initialize.c",
+ "src/core/census/log.c",
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
@@ -497,6 +501,7 @@ cc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.h",
  "src/core/client_config/subchannel.h",
  "src/core/client_config/subchannel_factory.h",
+ "src/core/client_config/subchannel_index.h",
  "src/core/client_config/uri_parser.h",
  "src/core/compression/algorithm_metadata.h",
  "src/core/compression/message_compress.h",
@@ -585,6 +590,7 @@ cc_library(
  "src/core/transport/transport.h",
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
+ "src/core/census/log.h",
  "src/core/census/rpc_metric_id.h",
  "src/core/surface/init_unsecure.c",
  "src/core/census/grpc_context.c",
@@ -614,6 +620,7 @@ cc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.c",
  "src/core/client_config/subchannel.c",
  "src/core/client_config/subchannel_factory.c",
+ "src/core/client_config/subchannel_index.c",
  "src/core/client_config/uri_parser.c",
  "src/core/compression/algorithm.c",
  "src/core/compression/message_compress.c",
@@ -717,6 +724,7 @@ cc_library(
  "src/core/transport/transport_op_string.c",
  "src/core/census/context.c",
  "src/core/census/initialize.c",
+ "src/core/census/log.c",
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
@@ -777,7 +785,6 @@ cc_library(
  "src/cpp/client/create_channel_internal.h",
  "src/cpp/common/create_auth_context.h",
  "src/cpp/server/dynamic_thread_pool.h",
- "src/cpp/server/fixed_size_thread_pool.h",
  "src/cpp/server/thread_pool_interface.h",
  "src/cpp/client/secure_credentials.cc",
  "src/cpp/common/auth_property_iterator.cc",
@@ -801,7 +808,6 @@ cc_library(
  "src/cpp/server/async_generic_service.cc",
  "src/cpp/server/create_default_thread_pool.cc",
  "src/cpp/server/dynamic_thread_pool.cc",
- "src/cpp/server/fixed_size_thread_pool.cc",
  "src/cpp/server/insecure_server_credentials.cc",
  "src/cpp/server/server.cc",
  "src/cpp/server/server_builder.cc",
@@ -908,7 +914,6 @@ cc_library(
  "src/cpp/client/create_channel_internal.h",
  "src/cpp/common/create_auth_context.h",
  "src/cpp/server/dynamic_thread_pool.h",
- "src/cpp/server/fixed_size_thread_pool.h",
  "src/cpp/server/thread_pool_interface.h",
  "src/cpp/common/insecure_create_auth_context.cc",
  "src/cpp/client/channel.cc",
@@ -927,7 +932,6 @@ cc_library(
  "src/cpp/server/async_generic_service.cc",
  "src/cpp/server/create_default_thread_pool.cc",
  "src/cpp/server/dynamic_thread_pool.cc",
- "src/cpp/server/fixed_size_thread_pool.cc",
  "src/cpp/server/insecure_server_credentials.cc",
  "src/cpp/server/server.cc",
  "src/cpp/server/server_builder.cc",
@@ -1295,6 +1299,7 @@ objc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.c",
  "src/core/client_config/subchannel.c",
  "src/core/client_config/subchannel_factory.c",
+ "src/core/client_config/subchannel_index.c",
  "src/core/client_config/uri_parser.c",
  "src/core/compression/algorithm.c",
  "src/core/compression/message_compress.c",
@@ -1398,6 +1403,7 @@ objc_library(
  "src/core/transport/transport_op_string.c",
  "src/core/census/context.c",
  "src/core/census/initialize.c",
+ "src/core/census/log.c",
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
@@ -1456,6 +1462,7 @@ objc_library(
  "src/core/client_config/resolvers/sockaddr_resolver.h",
  "src/core/client_config/subchannel.h",
  "src/core/client_config/subchannel_factory.h",
+ "src/core/client_config/subchannel_index.h",
  "src/core/client_config/uri_parser.h",
  "src/core/compression/algorithm_metadata.h",
  "src/core/compression/message_compress.h",
@@ -1544,6 +1551,7 @@ objc_library(
  "src/core/transport/transport.h",
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
+ "src/core/census/log.h",
  "src/core/census/rpc_metric_id.h",
  ],
  includes = [

Makefile

@@ -826,6 +826,7 @@ alloc_test: $(BINDIR)/$(CONFIG)/alloc_test
 alpn_test: $(BINDIR)/$(CONFIG)/alpn_test
 bin_encoder_test: $(BINDIR)/$(CONFIG)/bin_encoder_test
 census_context_test: $(BINDIR)/$(CONFIG)/census_context_test
+census_log_test: $(BINDIR)/$(CONFIG)/census_log_test
 channel_create_test: $(BINDIR)/$(CONFIG)/channel_create_test
 chttp2_hpack_encoder_test: $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test
 chttp2_status_conversion_test: $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test
@@ -1134,6 +1135,7 @@ buildtests_c: privatelibs_c \
  $(BINDIR)/$(CONFIG)/alpn_test \
  $(BINDIR)/$(CONFIG)/bin_encoder_test \
  $(BINDIR)/$(CONFIG)/census_context_test \
+ $(BINDIR)/$(CONFIG)/census_log_test \
  $(BINDIR)/$(CONFIG)/channel_create_test \
  $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test \
  $(BINDIR)/$(CONFIG)/chttp2_status_conversion_test \
@@ -1369,6 +1371,8 @@ test_c: buildtests_c
  $(Q) $(BINDIR)/$(CONFIG)/bin_encoder_test || ( echo test bin_encoder_test failed ; exit 1 )
  $(E) "[RUN] Testing census_context_test"
  $(Q) $(BINDIR)/$(CONFIG)/census_context_test || ( echo test census_context_test failed ; exit 1 )
+ $(E) "[RUN] Testing census_log_test"
+ $(Q) $(BINDIR)/$(CONFIG)/census_log_test || ( echo test census_log_test failed ; exit 1 )
  $(E) "[RUN] Testing channel_create_test"
  $(Q) $(BINDIR)/$(CONFIG)/channel_create_test || ( echo test channel_create_test failed ; exit 1 )
  $(E) "[RUN] Testing chttp2_hpack_encoder_test"
@@ -1597,6 +1601,8 @@ test_cxx: test_zookeeper buildtests_cxx
  $(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
  $(E) "[RUN] Testing mock_test"
  $(Q) $(BINDIR)/$(CONFIG)/mock_test || ( echo test mock_test failed ; exit 1 )
+ $(E) "[RUN] Testing qps_openloop_test"
+ $(Q) $(BINDIR)/$(CONFIG)/qps_openloop_test || ( echo test qps_openloop_test failed ; exit 1 )
  $(E) "[RUN] Testing qps_test"
  $(Q) $(BINDIR)/$(CONFIG)/qps_test || ( echo test qps_test failed ; exit 1 )
  $(E) "[RUN] Testing secure_auth_context_test"
@@ -2360,6 +2366,7 @@ LIBGRPC_SRC = \
  src/core/client_config/resolvers/sockaddr_resolver.c \
  src/core/client_config/subchannel.c \
  src/core/client_config/subchannel_factory.c \
+ src/core/client_config/subchannel_index.c \
  src/core/client_config/uri_parser.c \
  src/core/compression/algorithm.c \
  src/core/compression/message_compress.c \
@@ -2463,6 +2470,7 @@ LIBGRPC_SRC = \
  src/core/transport/transport_op_string.c \
  src/core/census/context.c \
  src/core/census/initialize.c \
+ src/core/census/log.c \
  src/core/census/operation.c \
  src/core/census/placeholders.c \
  src/core/census/tracing.c \
@@ -2645,6 +2653,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/client_config/resolvers/sockaddr_resolver.c \
  src/core/client_config/subchannel.c \
  src/core/client_config/subchannel_factory.c \
+ src/core/client_config/subchannel_index.c \
  src/core/client_config/uri_parser.c \
  src/core/compression/algorithm.c \
  src/core/compression/message_compress.c \
@@ -2748,6 +2757,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/transport/transport_op_string.c \
  src/core/census/context.c \
  src/core/census/initialize.c \
+ src/core/census/log.c \
  src/core/census/operation.c \
  src/core/census/placeholders.c \
  src/core/census/tracing.c \
@@ -2945,7 +2955,6 @@ LIBGRPC++_SRC = \
  src/cpp/server/async_generic_service.cc \
  src/cpp/server/create_default_thread_pool.cc \
  src/cpp/server/dynamic_thread_pool.cc \
- src/cpp/server/fixed_size_thread_pool.cc \
  src/cpp/server/insecure_server_credentials.cc \
  src/cpp/server/server.cc \
  src/cpp/server/server_builder.cc \
@@ -3225,7 +3234,6 @@ LIBGRPC++_UNSECURE_SRC = \
  src/cpp/server/async_generic_service.cc \
  src/cpp/server/create_default_thread_pool.cc \
  src/cpp/server/dynamic_thread_pool.cc \
- src/cpp/server/fixed_size_thread_pool.cc \
  src/cpp/server/insecure_server_credentials.cc \
  src/cpp/server/server.cc \
  src/cpp/server/server_builder.cc \
@@ -5831,6 +5839,38 @@ endif
 endif
 
 
+CENSUS_LOG_TEST_SRC = \
+ test/core/census/log_test.c \
+
+CENSUS_LOG_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CENSUS_LOG_TEST_SRC))))
+ifeq ($(NO_SECURE),true)
+
+# You can't build secure targets if you don't have OpenSSL.
+
+$(BINDIR)/$(CONFIG)/census_log_test: openssl_dep_error
+
+else
+
+
+
+$(BINDIR)/$(CONFIG)/census_log_test: $(CENSUS_LOG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+ $(E) "[LD] Linking $@"
+ $(Q) mkdir -p `dirname $@`
+ $(Q) $(LD) $(LDFLAGS) $(CENSUS_LOG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/census_log_test
+
+endif
+
+$(OBJDIR)/$(CONFIG)/test/core/census/log_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+
+deps_census_log_test: $(CENSUS_LOG_TEST_OBJS:.o=.dep)
+
+ifneq ($(NO_SECURE),true)
+ifneq ($(NO_DEPS),true)
+-include $(CENSUS_LOG_TEST_OBJS:.o=.dep)
+endif
+endif
+
+
 CHANNEL_CREATE_TEST_SRC = \
  test/core/surface/channel_create_test.c \
 

binding.gyp

@@ -605,6 +605,7 @@
  'src/core/client_config/resolvers/sockaddr_resolver.c',
  'src/core/client_config/subchannel.c',
  'src/core/client_config/subchannel_factory.c',
+ 'src/core/client_config/subchannel_index.c',
  'src/core/client_config/uri_parser.c',
  'src/core/compression/algorithm.c',
  'src/core/compression/message_compress.c',
@@ -708,6 +709,7 @@
  'src/core/transport/transport_op_string.c',
  'src/core/census/context.c',
  'src/core/census/initialize.c',
+ 'src/core/census/log.c',
  'src/core/census/operation.c',
  'src/core/census/placeholders.c',
  'src/core/census/tracing.c',

build.yaml

@@ -14,10 +14,12 @@ filegroups:
  - include/grpc/census.h
  headers:
  - src/core/census/aggregation.h
+ - src/core/census/log.h
  - src/core/census/rpc_metric_id.h
  src:
  - src/core/census/context.c
  - src/core/census/initialize.c
+ - src/core/census/log.c
  - src/core/census/operation.c
  - src/core/census/placeholders.c
  - src/core/census/tracing.c
@@ -172,7 +174,6 @@ filegroups:
  - src/cpp/client/create_channel_internal.h
  - src/cpp/common/create_auth_context.h
  - src/cpp/server/dynamic_thread_pool.h
- - src/cpp/server/fixed_size_thread_pool.h
  - src/cpp/server/thread_pool_interface.h
  src:
  - src/cpp/client/channel.cc
@@ -191,7 +192,6 @@ filegroups:
  - src/cpp/server/async_generic_service.cc
  - src/cpp/server/create_default_thread_pool.cc
  - src/cpp/server/dynamic_thread_pool.cc
- - src/cpp/server/fixed_size_thread_pool.cc
  - src/cpp/server/insecure_server_credentials.cc
  - src/cpp/server/server.cc
  - src/cpp/server/server_builder.cc
@@ -270,6 +270,7 @@ filegroups:
  - src/core/client_config/resolvers/sockaddr_resolver.h
  - src/core/client_config/subchannel.h
  - src/core/client_config/subchannel_factory.h
+ - src/core/client_config/subchannel_index.h
  - src/core/client_config/uri_parser.h
  - src/core/compression/algorithm_metadata.h
  - src/core/compression/message_compress.h
@@ -385,6 +386,7 @@ filegroups:
  - src/core/client_config/resolvers/sockaddr_resolver.c
  - src/core/client_config/subchannel.c
  - src/core/client_config/subchannel_factory.c
+ - src/core/client_config/subchannel_index.c
  - src/core/client_config/uri_parser.c
  - src/core/compression/algorithm.c
  - src/core/compression/message_compress.c
@@ -954,6 +956,16 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
+- name: census_log_test
+ build: test
+ language: c
+ src:
+ - test/core/census/log_test.c
+ deps:
+ - grpc_test_util
+ - grpc
+ - gpr_test_util
+ - gpr
 - name: channel_create_test
  build: test
  language: c
@@ -2300,7 +2312,6 @@ targets:
  - posix
 - name: qps_openloop_test
  build: test
- run: false
  language: c++
  src:
  - test/cpp/qps/qps_openloop_test.cc
@@ -2619,8 +2630,8 @@ configs:
  LDXX: clang++
  compile_the_world: true
  test_environ:
- ASAN_OPTIONS: suppressions=tools/asan_suppressions.txt:detect_leaks=1:color=always
- LSAN_OPTIONS: suppressions=tools/asan_suppressions.txt:report_objects=1
+ ASAN_OPTIONS: detect_leaks=1:color=always
+ LSAN_OPTIONS: suppressions=tools/lsan_suppressions.txt:report_objects=1
  timeout_multiplier: 1.5
  asan-noleaks:
  CC: clang

gRPC.podspec

@@ -198,6 +198,7 @@ Pod::Spec.new do |s|
  'src/core/client_config/resolvers/sockaddr_resolver.h',
  'src/core/client_config/subchannel.h',
  'src/core/client_config/subchannel_factory.h',
+ 'src/core/client_config/subchannel_index.h',
  'src/core/client_config/uri_parser.h',
  'src/core/compression/algorithm_metadata.h',
  'src/core/compression/message_compress.h',
@@ -286,6 +287,7 @@ Pod::Spec.new do |s|
  'src/core/transport/transport.h',
  'src/core/transport/transport_impl.h',
  'src/core/census/aggregation.h',
+ 'src/core/census/log.h',
  'src/core/census/rpc_metric_id.h',
  'include/grpc/grpc_security.h',
  'include/grpc/impl/codegen/byte_buffer.h',
@@ -348,6 +350,7 @@ Pod::Spec.new do |s|
  'src/core/client_config/resolvers/sockaddr_resolver.c',
  'src/core/client_config/subchannel.c',
  'src/core/client_config/subchannel_factory.c',
+ 'src/core/client_config/subchannel_index.c',
  'src/core/client_config/uri_parser.c',
  'src/core/compression/algorithm.c',
  'src/core/compression/message_compress.c',
@@ -451,6 +454,7 @@ Pod::Spec.new do |s|
  'src/core/transport/transport_op_string.c',
  'src/core/census/context.c',
  'src/core/census/initialize.c',
+ 'src/core/census/log.c',
  'src/core/census/operation.c',
  'src/core/census/placeholders.c',
  'src/core/census/tracing.c'
@@ -505,6 +509,7 @@ Pod::Spec.new do |s|
  'src/core/client_config/resolvers/sockaddr_resolver.h',
  'src/core/client_config/subchannel.h',
  'src/core/client_config/subchannel_factory.h',
+ 'src/core/client_config/subchannel_index.h',
  'src/core/client_config/uri_parser.h',
  'src/core/compression/algorithm_metadata.h',
  'src/core/compression/message_compress.h',
@@ -593,6 +598,7 @@ Pod::Spec.new do |s|
  'src/core/transport/transport.h',
  'src/core/transport/transport_impl.h',
  'src/core/census/aggregation.h',
+ 'src/core/census/log.h',
  'src/core/census/rpc_metric_id.h'
 
  ss.header_mappings_dir = '.'