diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-07-28 15:47:32 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-07-28 15:47:32 -0700 |
| commit | fb193a1e2fd0093103101b2551dd3e7b9af8833d (patch) | |
| tree | b1d7ba010e35797e7c02c0056c89a517cb66b8bc /test/cpp/microbenchmarks | |
| parent | 020dbf2ef5d01f22791e20182ec0509767264ffe (diff) | |
| parent | 433f7bce2d5a6683e9d60a147b528bb9be98baff (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into flow-control-v3
Diffstat (limited to 'test/cpp/microbenchmarks')
| -rw-r--r-- | test/cpp/microbenchmarks/bm_cq.cc | 2 | ||||
| -rw-r--r-- | test/cpp/microbenchmarks/bm_pollset.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 6bb6ad8018..18308a2e16 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -69,7 +69,7 @@ BENCHMARK(BM_CreateDestroyCore); static void DoneWithCompletionOnStack(grpc_exec_ctx* exec_ctx, void* arg, grpc_cq_completion* completion) {} -class DummyTag final : public internal::CompletionQueueTag { +class DummyTag final : public CompletionQueueTag { public: bool FinalizeResult(void** tag, bool* status) override { return true; } }; diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index 683f4703c2..1fc1f2f83b 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -149,7 +149,7 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset_add_fd(&exec_ctx, ps, fd); grpc_exec_ctx_flush(&exec_ctx); } - grpc_fd_orphan(&exec_ctx, fd, NULL, NULL, "xxx"); + grpc_fd_orphan(&exec_ctx, fd, NULL, NULL, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -247,7 +247,8 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { while (!done) { GRPC_ERROR_UNREF(grpc_pollset_work(&exec_ctx, ps, NULL, now, deadline)); } - grpc_fd_orphan(&exec_ctx, wakeup, NULL, NULL, "done"); + grpc_fd_orphan(&exec_ctx, wakeup, NULL, NULL, false /* already_closed */, + "done"); wakeup_fd.read_fd = 0; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, |