diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-02 13:11:57 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-02 13:11:57 +0000 |
commit | c1ea203b51e7f9f23e02ca59bbb11aa8a3c818c1 (patch) | |
tree | e6ff4eadcaec118484b3f7b613e7045df94d735e /vespalog/src/test/threads | |
parent | 719cf8af520257638d050be199a31b724622125d (diff) |
Remove fastos as runtime dependency
Diffstat (limited to 'vespalog/src/test/threads')
-rw-r--r-- | vespalog/src/test/threads/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalog/src/test/threads/testthreads.cpp | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vespalog/src/test/threads/CMakeLists.txt b/vespalog/src/test/threads/CMakeLists.txt index e1b3d77d468..8b326cb3b0e 100644 --- a/vespalog/src/test/threads/CMakeLists.txt +++ b/vespalog/src/test/threads/CMakeLists.txt @@ -4,5 +4,6 @@ vespa_add_executable(vespalog_threads_test_app TEST testthreads.cpp DEPENDS vespalog + fastos ) vespa_add_test(NAME vespalog_threads_test_app COMMAND vespalog_threads_test_app vespa.log ENVIRONMENT "VESPA_LOG_TARGET=file:vespa.log") diff --git a/vespalog/src/test/threads/testthreads.cpp b/vespalog/src/test/threads/testthreads.cpp index dc469018a5f..1723f35e432 100644 --- a/vespalog/src/test/threads/testthreads.cpp +++ b/vespalog/src/test/threads/testthreads.cpp @@ -4,11 +4,14 @@ #include <vespa/fastos/thread.h> #include <vespa/log/bufferedlogger.h> #include <iostream> +#include <thread> +#include <chrono> #include <fcntl.h> #include <unistd.h> #include <sys/stat.h> using std::string; +using namespace std::chrono_literals; LOG_SETUP(".threadtest"); @@ -42,7 +45,7 @@ FileThread::Run(FastOS_ThreadInterface *, void *) fprintf(stderr, "open failed: %s\n", strerror(errno)); exit(1); } - FastOS_Thread::Sleep(5); + std::this_thread::sleep_for(5ms); struct stat buf; fstat(fd, &buf); if (buf.st_size != 0) { @@ -106,7 +109,7 @@ ThreadTester::Main() // buffering. (To avoid test taking a minute) while (start.MilliSecsToNow() < 15 * 1000) { unlink(_argv[1]); - FastOS_Thread::Sleep(1); + std::this_thread::sleep_for(1ms); } // Then set to use logbuffer and continue for (int i = 0; i < numLoggers; i++) { @@ -115,7 +118,7 @@ ThreadTester::Main() start.SetNow(); while (start.MilliSecsToNow() < 15 * 1000) { unlink(_argv[1]); - FastOS_Thread::Sleep(1); + std::this_thread::sleep_for(1ms); } for (int i = 0; i < numLoggers; i++) { |