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 | |
parent | 719cf8af520257638d050be199a31b724622125d (diff) |
Remove fastos as runtime dependency
Diffstat (limited to 'vespalog')
-rw-r--r-- | vespalog/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalog/src/test/threads/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalog/src/test/threads/testthreads.cpp | 9 | ||||
-rw-r--r-- | vespalog/src/vespa/log/CMakeLists.txt | 2 | ||||
-rw-r--r-- | vespalog/src/vespa/log/log.cpp | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/vespalog/CMakeLists.txt b/vespalog/CMakeLists.txt index 9e642a8c0b5..6aa9aac5133 100644 --- a/vespalog/CMakeLists.txt +++ b/vespalog/CMakeLists.txt @@ -2,7 +2,6 @@ vespa_define_module( DEPENDS vespadefaults - fastos LIBS src/vespa/log 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++) { diff --git a/vespalog/src/vespa/log/CMakeLists.txt b/vespalog/src/vespa/log/CMakeLists.txt index 67e751b62d2..dccd17934d3 100644 --- a/vespalog/src/vespa/log/CMakeLists.txt +++ b/vespalog/src/vespa/log/CMakeLists.txt @@ -15,8 +15,6 @@ vespa_add_library(vespalog log-assert.cpp reject-filter.cpp INSTALL lib64 - DEPENDS - fastos ) add_custom_command( diff --git a/vespalog/src/vespa/log/log.cpp b/vespalog/src/vespa/log/log.cpp index 193f4230502..ccd91ec0362 100644 --- a/vespalog/src/vespa/log/log.cpp +++ b/vespalog/src/vespa/log/log.cpp @@ -13,7 +13,6 @@ LOG_SETUP_INDIRECT(".log", "$Id$"); #include "bufferedlogger.h" #include <vespa/defaults.h> -#include <vespa/fastos/thread.h> #include <cassert> #include <cstdarg> #include <unistd.h> @@ -267,7 +266,7 @@ void Logger::doLogCore(uint64_t timestamp, LogLevel level, // threads, only showing the least significant bits will hopefully // distinguish between all threads in your application. Alter later if // found to be too inaccurate. - int32_t tid = (fakePid ? -1 : FastOS_Thread::GetCurrentThreadId() % 0xffff); + int32_t tid = (fakePid ? -1 : pthread_self() % 0xffff); if (_target->makeHumanReadable()) { time_t secs = static_cast<time_t>(timestamp / 1000000); |