TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #153 from ksergey/clock_tweak 

Added CLOCK_MONOTONIC trick
This commit is contained in:
Gabi Melman 2015-12-22 09:47:44 +02:00
parent 01f3d6f5f0 9e8c8c1113
commit e3c3f91c11
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/spdlog/details/os.h
View File

@ -35,6 +35,20 @@ namespace details
namespace os
{
#if defined __linux__ && defined SPDLOG_CLOCK_MONOTONIC
inline uint64_t clock_offset()
{
timespec ts_realtime;
::clock_gettime(CLOCK_REALTIME, &ts_realtime);
timespec ts_monotonic;
::clock_gettime(CLOCK_MONOTONIC, &ts_monotonic);
const uint64_t realtime = ts_realtime.tv_sec * 1000000000 + ts_realtime.tv_nsec;
const uint64_t monotonic = ts_monotonic.tv_sec * 1000000000 + ts_monotonic.tv_nsec;
return realtime - monotonic;
}
#endif
inline spdlog::log_clock::time_point now()
{
@ -45,6 +59,14 @@ inline spdlog::log_clock::time_point now()
std::chrono::duration_cast<typename log_clock::duration>(
std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
#elif defined __linux__ && defined SPDLOG_CLOCK_MONOTONIC
static const auto offset = std::chrono::nanoseconds(clock_offset());
timespec ts;
::clock_gettime(CLOCK_MONOTONIC, &ts);
return std::chrono::time_point<log_clock, typename log_clock::duration>(
std::chrono::duration_cast<typename log_clock::duration>(
offset + std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
#else
return log_clock::now();
#endif
@ -151,7 +173,7 @@ inline bool file_exists(const std::string& filename)
#elif __linux__
struct stat buffer;
return (stat (filename.c_str(), &buffer) == 0);
#else
#else
auto *file = fopen(filename.c_str(), "r");
if (file != nullptr)
{

8
include/spdlog/tweakme.h
View File

@ -17,6 +17,14 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Under Linux, the much faster CLOCK_MONOTONIC clock can be used.
// This clock is more accurate than CLOCK_REALTIME_COARSE and faster than regular clock.
// Uncomment to use it instead of the regular clock.
// #define SPDLOG_CLOCK_MONOTONIC
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Uncomment if date/time logging is not needed.
// This will prevent spdlog from quering the clock on each log call.