Make ASAN pass

pull/8503/head
Craig Tiller 8 years ago
parent 63ec293d73
commit b4d883bfc2
  1. 20
      test/cpp/microbenchmarks/bm_fullstack.cc

@ -93,6 +93,15 @@ class FullstackFixture {
channel_ = CreateChannel(address, InsecureChannelCredentials()); channel_ = CreateChannel(address, InsecureChannelCredentials());
} }
virtual ~FullstackFixture() {
server_->Shutdown();
cq_->Shutdown();
void* tag;
bool ok;
while (cq_->Next(&tag, &ok)) {
}
}
ServerCompletionQueue* cq() { return cq_.get(); } ServerCompletionQueue* cq() { return cq_.get(); }
std::shared_ptr<Channel> channel() { return channel_; } std::shared_ptr<Channel> channel() { return channel_; }
@ -169,6 +178,15 @@ class EndpointPairFixture {
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
} }
virtual ~EndpointPairFixture() {
server_->Shutdown();
cq_->Shutdown();
void* tag;
bool ok;
while (cq_->Next(&tag, &ok)) {
}
}
ServerCompletionQueue* cq() { return cq_.get(); } ServerCompletionQueue* cq() { return cq_.get(); }
std::shared_ptr<Channel> channel() { return channel_; } std::shared_ptr<Channel> channel() { return channel_; }
@ -260,6 +278,8 @@ static void BM_UnaryPingPong(benchmark::State& state) {
service.RequestEcho(&senv->ctx, &senv->recv_request, &senv->response_writer, service.RequestEcho(&senv->ctx, &senv->recv_request, &senv->response_writer,
fixture.cq(), fixture.cq(), tag(slot)); fixture.cq(), fixture.cq(), tag(slot));
} }
server_env[0]->~ServerEnv();
server_env[1]->~ServerEnv();
} }
/******************************************************************************* /*******************************************************************************

Loading…
Cancel
Save