diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-11-15 16:48:19 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-11-15 16:48:19 -0800 |
| commit | df817f3e1a78c2760798f27d2c285936d818f656 (patch) | |
| tree | c7cb8b1c3057b7d1d7d00b0e606a804d63d35846 /test/cpp/microbenchmarks/bm_error.cc | |
| parent | 1037216ca165a9da963d41af575c55ca1b677311 (diff) | |
| parent | ff2edb3eba20b30f232ded7769cab8cd20ff5009 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into surfacing-error-details
Diffstat (limited to 'test/cpp/microbenchmarks/bm_error.cc')
| -rw-r--r-- | test/cpp/microbenchmarks/bm_error.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index 0c7976b855..66f9fe3704 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -251,7 +251,11 @@ static void BM_ErrorGetStatus(benchmark::State& state) { grpc_status_code status; grpc_slice slice; grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), +<<<<<<< HEAD &status, &slice, NULL, NULL); +======= + &status, &slice, nullptr); +>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009 } grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); @@ -265,7 +269,11 @@ static void BM_ErrorGetStatusCode(benchmark::State& state) { while (state.KeepRunning()) { grpc_status_code status; grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), +<<<<<<< HEAD &status, NULL, NULL, NULL); +======= + &status, nullptr, nullptr); +>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009 } grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); @@ -278,8 +286,13 @@ static void BM_ErrorHttpError(benchmark::State& state) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { grpc_http2_error_code error; +<<<<<<< HEAD grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), NULL, NULL, &error, NULL); +======= + grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), + nullptr, nullptr, &error); +>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009 } grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); |