Bugfixes

test/cpp/microbenchmarks/bm_call_create.cc

@@ -58,6 +58,8 @@ extern "C" {
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 
+auto &force_library_initialization = Library::get();
+
 class BaseChannelFixture {
  public:
   BaseChannelFixture(grpc_channel *channel) : channel_(channel) {}

test/cpp/microbenchmarks/bm_chttp2_hpack.cc

@@ -45,6 +45,8 @@ extern "C" {
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 
+auto &force_library_initialization = Library::get();
+
 ////////////////////////////////////////////////////////////////////////////////
 // HPACK encoder
 //

test/cpp/microbenchmarks/bm_closure.cc

@@ -45,9 +45,7 @@ extern "C" {
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 
-#ifdef GPR_LOW_LEVEL_COUNTERS
-extern "C" gpr_atm gpr_mu_locks;
-#endif
+auto& force_library_initialization = Library::get();
 
 static void BM_NoOpExecCtx(benchmark::State& state) {
   TrackCounters track_counters;

test/cpp/microbenchmarks/bm_cq.cc

@@ -48,6 +48,8 @@ extern "C" {
 namespace grpc {
 namespace testing {
 
+auto& force_library_initialization = Library::get();
+
 static void BM_CreateDestroyCpp(benchmark::State& state) {
   TrackCounters track_counters;
   while (state.KeepRunning()) {

test/cpp/microbenchmarks/bm_error.cc

@@ -43,6 +43,8 @@ extern "C" {
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 
+auto& force_library_initialization = Library::get();
+
 class ErrorDeleter {
  public:
   void operator()(grpc_error* error) { GRPC_ERROR_UNREF(error); }

test/cpp/microbenchmarks/bm_metadata.cc

@@ -43,6 +43,8 @@ extern "C" {
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 
+auto& force_library_initialization = Library::get();
+
 static void BM_SliceFromStatic(benchmark::State& state) {
   TrackCounters track_counters;
   while (state.KeepRunning()) {