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 /src/core/lib/iomgr/fork_posix.cc | |
| parent | 5e1298f0a826777b0e5b844328b81216e9c37476 (diff) | |
C++ize gpr_thread as grpc_core::Thread, make it 2-phase init (construct/Start)
Diffstat (limited to 'src/core/lib/iomgr/fork_posix.cc')
| -rw-r--r-- | src/core/lib/iomgr/fork_posix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index c9a65c5702..e8ba65d1d3 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -27,7 +27,7 @@ #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/fork.h" -#include "src/core/lib/gpr/thd.h" +#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" @@ -51,7 +51,7 @@ void grpc_prefork() { grpc_timer_manager_set_threading(false); grpc_executor_set_threading(false); grpc_core::ExecCtx::Get()->Flush(); - if (!gpr_await_threads( + if (!grpc_core::Thread::AwaitAll( gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(3, GPR_TIMESPAN)))) { gpr_log(GPR_ERROR, "gRPC thread still active! Cannot fork!"); |