Merge remote-tracking branch 'upstream/master' into gdc_metadata_server

2 files changed, 21 insertions, 41 deletions

diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index afac414e09..5ae9a9a791 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -29,7 +29,6 @@ grpc_cc_test(
 
 grpc_cc_library(
     name = "helpers",
-    testonly = 1,
     srcs = ["helpers.cc"],
     hdrs = [
         "fullstack_context_mutators.h",
@@ -47,70 +46,64 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_closure",
+    testonly = 1,
     srcs = ["bm_closure.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-# TODO(https://github.com/grpc/grpc/pull/16882): make this a test target
-# right now it OOMs
 grpc_cc_binary(
     name = "bm_arena",
-    testonly = 1,
     srcs = ["bm_arena.cc"],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_channel",
+    testonly = 1,
     srcs = ["bm_channel.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-# TODO(https://github.com/grpc/grpc/pull/16882): make this a test target
-# right now it fails UBSAN
 grpc_cc_binary(
     name = "bm_call_create",
-    testonly = 1,
     srcs = ["bm_call_create.cc"],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_cq",
+    testonly = 1,
     srcs = ["bm_cq.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_cq_multiple_threads",
+    testonly = 1,
     srcs = ["bm_cq_multiple_threads.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_error",
+    testonly = 1,
     srcs = ["bm_error.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
 grpc_cc_library(
     name = "fullstack_streaming_ping_pong_h",
-    testonly = 1,
     hdrs = [
         "fullstack_streaming_ping_pong.h",
     ],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_streaming_ping_pong",
+    testonly = 1,
     srcs = [
         "bm_fullstack_streaming_ping_pong.cc",
     ],
@@ -119,15 +112,15 @@ grpc_cc_test(
 
 grpc_cc_library(
     name = "fullstack_streaming_pump_h",
-    testonly = 1,
     hdrs = [
         "fullstack_streaming_pump.h",
     ],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_streaming_pump",
+    testonly = 1,
     srcs = [
         "bm_fullstack_streaming_pump.cc",
     ],
@@ -136,52 +129,39 @@ grpc_cc_test(
 
 grpc_cc_binary(
     name = "bm_fullstack_trickle",
-    testonly = 1,
     srcs = ["bm_fullstack_trickle.cc"],
     deps = [":helpers"],
 )
 
 grpc_cc_library(
     name = "fullstack_unary_ping_pong_h",
-    testonly = 1,
     hdrs = [
         "fullstack_unary_ping_pong.h",
     ],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_unary_ping_pong",
+    testonly = 1,
     srcs = [
         "bm_fullstack_unary_ping_pong.cc",
     ],
     deps = [":fullstack_unary_ping_pong_h"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_metadata",
+    testonly = 1,
     srcs = ["bm_metadata.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_chttp2_hpack",
+    testonly = 1,
     srcs = ["bm_chttp2_hpack.cc"],
     deps = [":helpers"],
-    uses_polling = False,
-)
-
-grpc_cc_test(
-    name = "bm_chttp2_transport",
-    srcs = ["bm_chttp2_transport.cc"],
-    deps = [":helpers"],
-)
-
-grpc_cc_test(
-    name = "bm_pollset",
-    srcs = ["bm_pollset.cc"],
-    deps = [":helpers"],
 )
 
 grpc_cc_binary(
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index a0157c66c2..8d12606434 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -526,7 +526,7 @@ static void BM_IsolatedFilter(benchmark::State& state) {
 
   grpc_core::ExecCtx exec_ctx;
   size_t channel_size = grpc_channel_stack_size(
-      filters.size() == 0 ? nullptr : filters.data(), filters.size());
+      filters.size() == 0 ? nullptr : &filters[0], filters.size());
   grpc_channel_stack* channel_stack =
       static_cast<grpc_channel_stack*>(gpr_zalloc(channel_size));
   GPR_ASSERT(GRPC_LOG_IF_ERROR(