diff options
author | 2016-02-24 15:40:07 -0800 | |
---|---|---|
committer | 2016-02-24 15:40:07 -0800 | |
commit | 0544d7fd662b1f8426653f386f93bd54174dcacc (patch) | |
tree | 25e98122945cfe20b2fc6070db447e7a21b54e98 /test/cpp/qps/client.h | |
parent | d14d1033879bbb3e8e757dfb39d78fba6d93e144 (diff) | |
parent | c68dc7031be1f0ec12445cd17e58f21a6080cde8 (diff) |
Merge github.com:grpc/grpc into 44
Diffstat (limited to 'test/cpp/qps/client.h')
-rw-r--r-- | test/cpp/qps/client.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index aecbae95f9..2dc83f0f29 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -112,12 +112,12 @@ class ClientRequestCreator<ByteBuffer> { class Client { public: - Client() : timer_(new Timer), interarrival_timer_() {} + Client() : timer_(new UsageTimer), interarrival_timer_() {} virtual ~Client() {} ClientStats Mark(bool reset) { Histogram latencies; - Timer::Result timer_result; + UsageTimer::Result timer_result; // avoid std::vector for old compilers that expect a copy constructor if (reset) { @@ -125,7 +125,7 @@ class Client { for (size_t i = 0; i < threads_.size(); i++) { threads_[i]->BeginSwap(&to_merge[i]); } - std::unique_ptr<Timer> timer(new Timer); + std::unique_ptr<UsageTimer> timer(new UsageTimer); timer_.swap(timer); for (size_t i = 0; i < threads_.size(); i++) { threads_[i]->EndSwap(); @@ -294,7 +294,7 @@ class Client { }; std::vector<std::unique_ptr<Thread>> threads_; - std::unique_ptr<Timer> timer_; + std::unique_ptr<UsageTimer> timer_; InterarrivalTimer interarrival_timer_; std::vector<gpr_timespec> next_time_; |