From 58a62755fc6546a117b7b8f3a0a344f85b2ea5f9 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 13 Feb 2018 14:40:39 -0800 Subject: Remove support for detached threads. All threads must be joined. --- test/core/handshake/client_ssl.cc | 5 +---- test/core/handshake/server_ssl_common.cc | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'test/core/handshake') diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index fe2ab251e3..2581eb525c 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -230,12 +230,9 @@ static bool client_ssl_test(char* server_alpn_preferred) { GPR_ASSERT(server_socket > 0 && port > 0); // Launch the TLS server thread. - gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_id thdid; - gpr_thd_options_set_joinable(&thdopt); server_args args = {server_socket, server_alpn_preferred}; - GPR_ASSERT(gpr_thd_new(&thdid, "grpc_client_ssl_test", server_thread, &args, - &thdopt)); + GPR_ASSERT(gpr_thd_new(&thdid, "grpc_client_ssl_test", server_thread, &args)); // Load key pair and establish client SSL credentials. grpc_ssl_pem_key_cert_pair pem_key_cert_pair; diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index d202a7cfd6..a2d389954f 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -138,11 +138,8 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, gpr_event_init(&client_handshake_complete); // Launch the gRPC server thread. - gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_id thdid; - gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT( - gpr_thd_new(&thdid, "grpc_ssl_test", server_thread, &port, &thdopt)); + GPR_ASSERT(gpr_thd_new(&thdid, "grpc_ssl_test", server_thread, &port)); SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); -- cgit v1.2.3