diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-06-09 17:47:56 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-06-09 17:47:56 -0700 |
| commit | 9bfedd67e06c4bd4fa1855aabaf169461a3d6a54 (patch) | |
| tree | e48bf5a1c3539393508c02b2b6e41052b4532411 /test/cpp/qps/server_async.cc | |
| parent | 97f1454fc5ccdfc57e2f1296a52f1f83037cfd78 (diff) | |
| parent | a561ea66aeb460c6f33cfabff396d5ef2b748791 (diff) | |
Merge remote-tracking branch 'upstream/master' into you-complete-me-csharp
Diffstat (limited to 'test/cpp/qps/server_async.cc')
| -rw-r--r-- | test/cpp/qps/server_async.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 977dfc2372..4b0678bb2c 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -101,10 +101,11 @@ class AsyncQpsServerTest : public Server { ServerRpcContext *ctx = detag(got_tag); // The tag is a pointer to an RPC context to invoke bool still_going = ctx->RunNextState(ok); - std::lock_guard<std::mutex> g(shutdown_mutex_); + std::unique_lock<std::mutex> g(shutdown_mutex_); if (!shutdown_) { // this RPC context is done, so refresh it if (!still_going) { + g.unlock(); ctx->Reset(); } } else { |