mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #143 from rongjiecomputer/kernel

Browse source 
Remove dependency of windows.h in kernel_timeout.h
This commit is contained in:
Xiaoyi Zhang 2018-07-18 15:02:13 -04:00 committed by GitHub
commit 44aa275286
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
absl/synchronization/internal/kernel_timeout.h
View file

@ -25,9 +25,6 @@
#ifndef ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_ #ifndef ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_
#define ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_ #define ABSL_SYNCHRONIZATION_INTERNAL_KERNEL_TIMEOUT_H_
#ifdef _WIN32
#include <intsafe.h>
#endif
#include <time.h> #include <time.h>
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
@ -117,9 +114,14 @@ class KernelTimeout {
// Windows. Callers should recognize that the return value is a // Windows. Callers should recognize that the return value is a
// relative duration (it should be recomputed by calling this method // relative duration (it should be recomputed by calling this method
// in the case of a spurious wakeup). // in the case of a spurious wakeup).
DWORD InMillisecondsFromNow() const { // This header file may be included transitively by public header files,
// so we define our own DWORD and INFINITE instead of getting them from
// <intsafe.h> and <WinBase.h>.
typedef unsigned long DWord;
DWord InMillisecondsFromNow() const {
constexpr DWord kInfinite = std::numeric_limits<DWord>::max();
if (!has_timeout()) { if (!has_timeout()) {
return INFINITE; return kInfinite;
} }
// The use of absl::Now() to convert from absolute time to // The use of absl::Now() to convert from absolute time to
// relative time means that absl::Now() cannot use anything that // relative time means that absl::Now() cannot use anything that
@ -131,10 +133,10 @@ class KernelTimeout {
std::numeric_limits<int64_t>::max() - 999999u; std::numeric_limits<int64_t>::max() - 999999u;
uint64_t ms_from_now = uint64_t ms_from_now =
(std::min<uint64_t>(max_nanos, ns_ - now) + 999999u) / 1000000u; (std::min<uint64_t>(max_nanos, ns_ - now) + 999999u) / 1000000u;
if (ms_from_now > std::numeric_limits<DWORD>::max()) { if (ms_from_now > kInfinite) {
return INFINITE; return kInfinite;
} }
return static_cast<DWORD>(ms_from_now); return static_cast<DWord>(ms_from_now);
} }
return 0; return 0;
} }