diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-01-12 10:16:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 10:16:22 +0100 |
commit | c9ec2c0888271491eaf425721a72736392f85945 (patch) | |
tree | 8ee3fe7e6fe56bed7bbfa7c8537add5f24afe12a /test/cpp/thread_manager/thread_manager_test.cc | |
parent | b0b4555f4ca720e626f42855f2257bf598e1bf74 (diff) |
Revert "Stop using std::thread in C++ library since it can trigger exceptions"
Diffstat (limited to 'test/cpp/thread_manager/thread_manager_test.cc')
-rw-r--r-- | test/cpp/thread_manager/thread_manager_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index d3d31f9dd9..8282d46694 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -20,10 +20,10 @@ #include <memory> #include <string> +#include <gflags/gflags.h> #include <grpc++/grpc++.h> #include <grpc/support/log.h> #include <grpc/support/port_platform.h> -#include <grpc/support/thd.h> #include "src/cpp/thread_manager/thread_manager.h" #include "test/cpp/util/test_config.h" @@ -32,13 +32,13 @@ namespace grpc { class ThreadManagerTest final : public grpc::ThreadManager { public: ThreadManagerTest() - : ThreadManager(kMinPollers, kMaxPollers, gpr_thd_new, gpr_thd_join), + : ThreadManager(kMinPollers, kMaxPollers), num_do_work_(0), num_poll_for_work_(0), num_work_found_(0) {} grpc::ThreadManager::WorkStatus PollForWork(void** tag, bool* ok) override; - void DoWork(void* tag, bool ok, bool resources) override; + void DoWork(void* tag, bool ok) override; void PerformTest(); private: @@ -89,7 +89,7 @@ grpc::ThreadManager::WorkStatus ThreadManagerTest::PollForWork(void** tag, } } -void ThreadManagerTest::DoWork(void* tag, bool ok, bool resources) { +void ThreadManagerTest::DoWork(void* tag, bool ok) { gpr_atm_no_barrier_fetch_add(&num_do_work_, 1); SleepForMs(kDoWorkDurationMsec); // Simulate doing work by sleeping } |