diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-16 22:59:03 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-19 22:39:58 -0800 |
| commit | da69355f30ca6863cc07c0aebffc5a14900de265 (patch) | |
| tree | 83c866fcf54b2c058d452312109175cbb2107865 /test/core/end2end/bad_server_response_test.cc | |
| parent | 5e1298f0a826777b0e5b844328b81216e9c37476 (diff) | |
C++ize gpr_thread as grpc_core::Thread, make it 2-phase init (construct/Start)
Diffstat (limited to 'test/core/end2end/bad_server_response_test.cc')
| -rw-r--r-- | test/core/end2end/bad_server_response_test.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index e7b2cafa35..0dbde3d788 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -31,7 +31,8 @@ #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/thd.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" @@ -253,17 +254,18 @@ static void actually_poll_server(void* arg) { gpr_free(pa); } -static gpr_thd_id poll_server_until_read_done(test_tcp_server* server, - - gpr_event* signal_when_done) { +static grpc_core::Thread* + poll_server_until_read_done(test_tcp_server* server, + gpr_event* signal_when_done) { gpr_atm_rel_store(&state.done_atm, 0); state.write_done = 0; - gpr_thd_id id; poll_args* pa = static_cast<poll_args*>(gpr_malloc(sizeof(*pa))); pa->server = server; pa->signal_when_done = signal_when_done; - gpr_thd_new(&id, "grpc_poll_server", actually_poll_server, pa); - return id; + auto* th = grpc_core::New<grpc_core::Thread>("grpc_poll_server", + actually_poll_server, pa); + th->Start(); + return th; } static void run_test(const char* response_payload, @@ -283,10 +285,11 @@ static void run_test(const char* response_payload, state.response_payload_length = response_payload_length; /* poll server until sending out the response */ - gpr_thd_id id = poll_server_until_read_done(&test_server, &ev); + grpc_core::UniquePtr<grpc_core::Thread> + thdptr(poll_server_until_read_done(&test_server, &ev)); start_rpc(server_port, expected_status, expected_detail); gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); - gpr_thd_join(id); + thdptr->Join(); /* clean up */ grpc_endpoint_shutdown(state.tcp, |