Skip to content

Changed macro constants to constexpr variables #270 #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephanTLavavej merged 13 commits into from
Feb 8, 2020
Merged

Changed macro constants to constexpr variables #270 #487

Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0573ef
Update _MSVC_STL_UPDATE value to February 2020
JeanPhilippeKernel Feb 6, 2020
7e5b7b3
Updated macro constants to constexpr variables #270
JeanPhilippeKernel Feb 6, 2020
59b9474
Revert "Updated macro constants to constexpr variables #270"
JeanPhilippeKernel Feb 6, 2020
91167a0
Changed macro constants to constexpr variables #270
JeanPhilippeKernel Feb 6, 2020
44604c6
Merge branch 'master' of https://github.com/microsoft/STL into fix-ma…
JeanPhilippeKernel Feb 6, 2020
eecf828
updated variables to _Ugly naming convention
JeanPhilippeKernel Feb 7, 2020
c403c18
Update stl/src/xtime.cpp
JeanPhilippeKernel Feb 7, 2020
8551ae8
updated macro change
JeanPhilippeKernel Feb 7, 2020
fd3f8e8
removed unecesarry comment
JeanPhilippeKernel Feb 7, 2020
0dfcf9f
Merge branch 'master' of https://github.com/microsoft/STL into fix-ma…
JeanPhilippeKernel Feb 7, 2020
bde3b36
clang-format updated
JeanPhilippeKernel Feb 7, 2020
e483f6a
removed unnecessary parentheses
JeanPhilippeKernel Feb 7, 2020
1eee336
Update comments.
StephanTLavavej Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions stl/src/xtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
#include <time.h>
#include <xtimec.h>

#define NSEC_PER_SEC 1000000000L
#define NSEC_PER_MSEC 1000000L
#define NSEC_PER_USEC 1000L
#define MSEC_PER_SEC 1000
constexpr long _Nsec_per_sec = 1000000000L;
constexpr long _Nsec_per_msec = 1000000L;
constexpr long _Nsec_per_usec = 1000L;
constexpr int _Msec_per_sec = 1000;

static void xtime_normalize(xtime* xt) { // adjust so that 0 <= nsec < 1 000 000 000
while (xt->nsec < 0) { // normalize target time
xt->sec -= 1;
xt->nsec += NSEC_PER_SEC;
xt->nsec += _Nsec_per_sec;
}
while (NSEC_PER_SEC <= xt->nsec) { // normalize target time
while (_Nsec_per_sec <= xt->nsec) { // normalize target time
xt->sec += 1;
xt->nsec -= NSEC_PER_SEC;
xt->nsec -= _Nsec_per_sec;
}
}

Expand All @@ -30,7 +30,7 @@ static xtime xtime_diff(const xtime* xt,
xtime_normalize(&diff);
if (diff.nsec < now->nsec) { // avoid underflow
diff.sec -= now->sec + 1;
diff.nsec += NSEC_PER_SEC - now->nsec;
diff.nsec += _Nsec_per_sec - now->nsec;
} else { // no underflow
diff.sec -= now->sec;
diff.nsec -= now->nsec;
Expand All @@ -43,28 +43,27 @@ static xtime xtime_diff(const xtime* xt,
}


#define EPOCH 0x19DB1DED53E8000i64

#define NSEC100_PER_SEC (NSEC_PER_SEC / 100)
#define NSEC100_PER_MSEC (NSEC_PER_MSEC / 100)
constexpr long long _Epoch = 0x19DB1DED53E8000i64;
Comment thread
JeanPhilippeKernel marked this conversation as resolved.
Outdated
constexpr long _Nsec100_per_sec = _Nsec_per_sec / 100;
constexpr long _Nsec100_per_msec = _Nsec_per_msec / 100;

_EXTERN_C

long long _Xtime_get_ticks() { // get system time in 100-nanosecond intervals since the epoch
FILETIME ft;
__crtGetSystemTimePreciseAsFileTime(&ft);
return ((static_cast<long long>(ft.dwHighDateTime)) << 32) + static_cast<long long>(ft.dwLowDateTime) - EPOCH;
return ((static_cast<long long>(ft.dwHighDateTime)) << 32) + static_cast<long long>(ft.dwLowDateTime) - _Epoch;
}

static void sys_get_time(xtime* xt) { // get system time with nanosecond resolution
unsigned long long now = _Xtime_get_ticks();
xt->sec = static_cast<__time64_t>(now / NSEC100_PER_SEC);
xt->nsec = static_cast<long>(now % NSEC100_PER_SEC) * 100;
xt->sec = static_cast<__time64_t>(now / _Nsec100_per_sec);
xt->nsec = static_cast<long>(now % _Nsec100_per_sec) * 100;
}

long _Xtime_diff_to_millis2(const xtime* xt1, const xtime* xt2) { // convert time to milliseconds
xtime diff = xtime_diff(xt1, xt2);
return static_cast<long>(diff.sec * MSEC_PER_SEC + (diff.nsec + NSEC_PER_MSEC - 1) / NSEC_PER_MSEC);
return static_cast<long>(diff.sec * _Msec_per_sec + (diff.nsec + _Nsec_per_msec - 1) / _Nsec_per_msec);
}

long _Xtime_diff_to_millis(const xtime* xt) { // convert time to milliseconds
Expand Down