diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 15:14:57 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 17:36:43 +0000 |
| commit | 2503a877f21838e66e873f839a5b6fd0c38abfab (patch) | |
| tree | 966ae9d7757aa58e7bff4aaa4b9b45b5f6668329 /fnet | |
| parent | 5ac0d0b71749c7555167c3c3906ff6843bf178f0 (diff) | |
Use vespalib::duration for timeouts
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/tests/connect/connect_test.cpp | 3 | ||||
| -rw-r--r-- | fnet/src/tests/frt/rpc/detach_return_invoke.cpp | 1 | ||||
| -rw-r--r-- | fnet/src/tests/sync_execute/sync_execute.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/fnet/src/tests/connect/connect_test.cpp b/fnet/src/tests/connect/connect_test.cpp index 2b4a2bbe9f0..50722e7d16e 100644 --- a/fnet/src/tests/connect/connect_test.cpp +++ b/fnet/src/tests/connect/connect_test.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/time_bomb.h> #include <vespa/fnet/transport.h> #include <vespa/fnet/transport_thread.h> #include <vespa/fnet/simplepacketstreamer.h> @@ -13,7 +14,7 @@ using namespace vespalib; -int short_time = 20; // ms +constexpr vespalib::duration short_time = 20ms; struct BlockingHostResolver : public AsyncResolver::HostResolver { AsyncResolver::SimpleHostResolver resolver; diff --git a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp index 68bd58d2f82..8d65c65f768 100644 --- a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp +++ b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp @@ -5,6 +5,7 @@ #include <vespa/fnet/frt/rpcrequest.h> #include <vespa/fnet/frt/invoker.h> #include <vespa/vespalib/util/stringfmt.h> +#include <thread> struct Receptor : public FRT_IRequestWait { diff --git a/fnet/src/tests/sync_execute/sync_execute.cpp b/fnet/src/tests/sync_execute/sync_execute.cpp index 55a898496ae..d577b5b7e92 100644 --- a/fnet/src/tests/sync_execute/sync_execute.cpp +++ b/fnet/src/tests/sync_execute/sync_execute.cpp @@ -1,5 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/util/gate.h> #include <vespa/fnet/transport.h> #include <vespa/fnet/iexecutable.h> #include <vespa/fastos/thread.h> |