diff options
| author |  Vijay Pai <vpai@google.com> | 2016-02-13 00:25:45 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-02-13 00:25:45 -0800 |
| commit | 8ca0faaf52b159236911bb309a029d73e9160e72 (patch) | |
| tree | 5048cef069b85ba1aed78bd68cc1b783faef87f0 /test/cpp/qps/driver.cc | |
| parent | 8eef7e3b580bfe52f46844ea3a6f1c07485c7cbe (diff) | |
use timeouts with proper fixture multipliers rather than raw,
since tsan slows things down a lot and may complicate issues such
as shutdown.
Diffstat (limited to 'test/cpp/qps/driver.cc')
| -rw-r--r-- | test/cpp/qps/driver.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 80f6ada409..e721966696 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -196,10 +196,7 @@ std::unique_ptr<ScenarioResult> RunScenario( // Trim to just what we need workers.resize(num_clients + num_servers); - gpr_timespec deadline = - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_seconds( - warmup_seconds + benchmark_seconds + 20, GPR_TIMESPAN)); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(20); // Start servers using runsc::ServerData; |