faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: add functions for converting new root delay/dispersion

Browse source
This commit is contained in:
Miroslav Lichvar 2021-11-15 10:25:35 +01:00
parent a652ce7d0e
commit 2e126ed2b5
3 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/unit/util.c
View file

@ -508,9 +508,18 @@ test_unit(void)
TEST_CHECK(UTI_DoubleToNtp32(65536.0) == htonl(0xffffffff)); TEST_CHECK(UTI_DoubleToNtp32(65536.0) == htonl(0xffffffff));
TEST_CHECK(UTI_DoubleToNtp32(65537.0) == htonl(0xffffffff)); TEST_CHECK(UTI_DoubleToNtp32(65537.0) == htonl(0xffffffff));
TEST_CHECK(UTI_DoubleToNtp32f28(-1.0) == htonl(0));
TEST_CHECK(UTI_DoubleToNtp32f28(0.0) == htonl(0));
TEST_CHECK(UTI_DoubleToNtp32f28(1e-9) == htonl(1));
TEST_CHECK(UTI_DoubleToNtp32f28(4e-9) == htonl(2));
TEST_CHECK(UTI_DoubleToNtp32f28(8.0) == htonl(0x80000000));
TEST_CHECK(UTI_DoubleToNtp32f28(16.0) == htonl(0xffffffff));
TEST_CHECK(UTI_DoubleToNtp32f28(16.1) == htonl(0xffffffff));
for (i = 0; i < 100000; i++) { for (i = 0; i < 100000; i++) {
UTI_GetRandomBytes(&ntp32_ts, sizeof (ntp32_ts)); UTI_GetRandomBytes(&ntp32_ts, sizeof (ntp32_ts));
TEST_CHECK(UTI_DoubleToNtp32(UTI_Ntp32ToDouble(ntp32_ts)) == ntp32_ts); TEST_CHECK(UTI_DoubleToNtp32(UTI_Ntp32ToDouble(ntp32_ts)) == ntp32_ts);
TEST_CHECK(UTI_DoubleToNtp32f28(UTI_Ntp32f28ToDouble(ntp32_ts)) == ntp32_ts);
} }
ts.tv_nsec = 0; ts.tv_nsec = 0;

31
util.c
View file

@ -637,6 +637,37 @@ UTI_DoubleToNtp32(double x)
/* ================================================== */ /* ================================================== */
double
UTI_Ntp32f28ToDouble(NTP_int32 x)
{
return ntohl(x) / (double)(1U << 28);
}
/* ================================================== */
NTP_int32
UTI_DoubleToNtp32f28(double x)
{
NTP_int32 r;
if (x >= 4294967295.0 / (1U << 28)) {
r = 0xffffffff;
} else if (x <= 0.0) {
r = 0;
} else {
x *= 1U << 28;
r = x;
/* Round up */
if (r < x)
r++;
}
return htonl(r);
}
/* ================================================== */
void void
UTI_ZeroNtp64(NTP_int64 *ts) UTI_ZeroNtp64(NTP_int64 *ts)
{ {

3
util.h
View file

@ -133,6 +133,9 @@ extern void UTI_GetNtp64Fuzz(NTP_int64 *ts, int precision);
extern double UTI_Ntp32ToDouble(NTP_int32 x); extern double UTI_Ntp32ToDouble(NTP_int32 x);
extern NTP_int32 UTI_DoubleToNtp32(double x); extern NTP_int32 UTI_DoubleToNtp32(double x);
extern double UTI_Ntp32f28ToDouble(NTP_int32 x);
extern NTP_int32 UTI_DoubleToNtp32f28(double x);
/* Zero an NTP timestamp */ /* Zero an NTP timestamp */
extern void UTI_ZeroNtp64(NTP_int64 *ts); extern void UTI_ZeroNtp64(NTP_int64 *ts);