diff options
author | 2016-08-05 01:32:34 -0700 | |
---|---|---|
committer | 2016-08-05 01:32:34 -0700 | |
commit | 4f17395b81508ceedc824602e52876ae94d13c43 (patch) | |
tree | 2fe7ddb68b79c4bcc566263ecdc0e6103d1e4551 /test | |
parent | ffbfd01049fc2ae4e402539905ebcfa22c1094e8 (diff) |
Properly use unique_ptr rather than explicitly
deleting server context wrappers in QPS test
Diffstat (limited to 'test')
-rw-r--r-- | test/cpp/qps/server_async.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index dea8746331..082b4bc72f 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -108,14 +108,14 @@ class AsyncQpsServerTest : public Server { auto request_unary = std::bind(request_unary_function, &async_service_, _1, _2, _3, srv_cqs_[j].get(), srv_cqs_[j].get(), _4); - contexts_.push_front( + contexts_.emplace_back( new ServerRpcContextUnaryImpl(request_unary, process_rpc_bound)); } if (request_streaming_function) { auto request_streaming = std::bind(request_streaming_function, &async_service_, _1, _2, srv_cqs_[j].get(), srv_cqs_[j].get(), _3); - contexts_.push_front(new ServerRpcContextStreamingImpl( + contexts_.emplace_back(new ServerRpcContextStreamingImpl( request_streaming, process_rpc_bound)); } } @@ -146,10 +146,6 @@ class AsyncQpsServerTest : public Server { while ((*cq)->Next(&got_tag, &ok)) ; } - while (!contexts_.empty()) { - delete contexts_.front(); - contexts_.pop_front(); - } } private: @@ -336,7 +332,7 @@ class AsyncQpsServerTest : public Server { std::unique_ptr<grpc::Server> server_; std::vector<std::unique_ptr<grpc::ServerCompletionQueue>> srv_cqs_; ServiceType async_service_; - std::forward_list<ServerRpcContext *> contexts_; + std::vector<std::unique_ptr<ServerRpcContext>> contexts_; struct PerThreadShutdownState { mutable std::mutex mutex; |