diff options
Diffstat (limited to 'test/core/iomgr/resolve_address_posix_test.cc')
| -rw-r--r-- | test/core/iomgr/resolve_address_posix_test.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 6a1564dd69..9d61c9818b 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/iomgr/resolve_address.h" +#include <new> #include <string.h> #include <sys/un.h> @@ -27,7 +28,7 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> -#include "src/core/lib/gpr/thd.h" +#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" @@ -38,7 +39,7 @@ static gpr_timespec test_deadline(void) { } typedef struct args_struct { - gpr_thd_id id; + grpc_core::Thread thd; gpr_event ev; grpc_resolved_addresses* addrs; gpr_atm done_atm; @@ -60,7 +61,9 @@ void args_init(args_struct* args) { void args_finish(args_struct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); - gpr_thd_join(args->id); + args->thd.Join(); + // Don't need to explicitly destruct args->thd since + // args is actually going to be destructed, not just freed grpc_resolved_addresses_destroy(args->addrs); grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); grpc_pollset_set_destroy(args->pollset_set); @@ -103,7 +106,8 @@ static void actually_poll(void* argsp) { static void poll_pollset_until_request_done(args_struct* args) { gpr_atm_rel_store(&args->done_atm, 0); - gpr_thd_new(&args->id, "grpc_poll_pollset", actually_poll, args); + new (&args->thd) grpc_core::Thread("grpc_poll_pollset", actually_poll, args); + args->thd.Start(); } static void must_succeed(void* argsp, grpc_error* err) { |