diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2017-10-12 10:59:48 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-10-13 13:13:56 (GMT) |
commit | e44b0cb2f0d6d0065faabd510efdcfc6359a8025 (patch) | |
tree | 44cb77d27a0ec8e7bf3643397f01f43f0ee52b94 /ProcessUNIX.c | |
parent | c551ff588b48cc4c286922779651890da0f3c22c (diff) | |
download | CMake-e44b0cb2f0d6d0065faabd510efdcfc6359a8025.zip CMake-e44b0cb2f0d6d0065faabd510efdcfc6359a8025.tar.gz CMake-e44b0cb2f0d6d0065faabd510efdcfc6359a8025.tar.bz2 |
KWSys 2017-10-12 (ef0ad34d)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit ef0ad34d280f0553fc4f6e7202a5e7d6241cdc9c (master).
Upstream Shortlog
-----------------
Rolf Eike Beer (2):
8717ac15 DynamicLoader: use std::string instead of strcpy() + strcat()
88d4dd4b CommandLineArguments: use std::string in GenerateHelp()
Wouter Klouwen (1):
749b7506 ProcessUNIX: Use monotonic clock in kwsysProcessTimeGetCurrent() for POSIX
Diffstat (limited to 'ProcessUNIX.c')
-rw-r--r-- | ProcessUNIX.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ProcessUNIX.c b/ProcessUNIX.c index 1431f30..e62ef34 100644 --- a/ProcessUNIX.c +++ b/ProcessUNIX.c @@ -2026,7 +2026,15 @@ static kwsysProcessTime kwsysProcessTimeGetCurrent(void) { kwsysProcessTime current; kwsysProcessTimeNative current_native; +#if KWSYS_C_HAS_CLOCK_GETTIME_MONOTONIC + struct timespec current_timespec; + clock_gettime(CLOCK_MONOTONIC, ¤t_timespec); + + current_native.tv_sec = current_timespec.tv_sec; + current_native.tv_usec = current_timespec.tv_nsec / 1000; +#else gettimeofday(¤t_native, 0); +#endif current.tv_sec = (long)current_native.tv_sec; current.tv_usec = (long)current_native.tv_usec; return current; |