Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
sambuc
2016-01-21 23:42:40 +01:00
committed by sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228313 additions and 80017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mbone/dbeacon/patches/patch-dbeacon__posix.cpp
+18 -14
View File
@@ -1,45 +1,49 @@
$NetBSD: patch-dbeacon__posix.cpp,v 1.2 2015/01/13 20:25:13 he Exp $
$NetBSD: patch-dbeacon__posix.cpp,v 1.3 2015/07/01 09:22:20 he Exp $
Replace use of times() with gettimeofday(), since all we use it
for is to get a millisecond timestamp, and with a 32-bit unsigned
clock_t and 100Hz tick, times() wraps around every 500 days or so,
and the code then falls into an assert() in dbeacon.cpp.
Replace use of times() with clock_gettime(CLOCK_MONOTONIC), since
all we use it for is to get a millisecond timestamp, and with a
32-bit unsigned clock_t and 100Hz tick, times() wraps around every
500 days or so, and the code then falls into an assert() in
dbeacon.cpp.
Still retry a few times if gettimeofday() for some reason should
Still retry a few times if clock_gettime() for some reason should
decide to fail.
--- dbeacon_posix.cpp.orig 2007-06-09 11:35:57.000000000 +0000
+++ dbeacon_posix.cpp
@@ -25,6 +25,7 @@
@@ -23,8 +23,10 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/time.h>
+#include <time.h>
#include <netdb.h>
#include <unistd.h>
+#include <syslog.h>
#include <sys/uio.h>
#include <sys/times.h>
@@ -515,11 +516,24 @@ void address::set(const sockaddr *sa) {
@@ -515,11 +517,24 @@ void address::set(const sockaddr *sa) {
}
uint64_t get_timestamp() {
- struct tms tmp;
+ struct timeval tv;
+ struct timespec ts;
+ uint64_t timestamp;
+ int n = 0;
- uint64_t v = times(&tmp);
+ retry:
+ if (gettimeofday(&tv, 0) != 0) {
+ log(LOG_WARNING, "gettimeofday() failed: %m");
+ if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
+ log(LOG_WARNING, "clock_gettime(CLOCK_MONOTONIC) failed: %m");
+ if (++n < 5)
+ goto retry;
+ else
+ log(LOG_ERR,
+ "gettimeofday() failed after 5 retries: %m");
+ "clock_gettime(CLOCK_MONOTONIC) failed after 5 retries: %m");
+ }
+ timestamp = tv.tv_sec;
+ timestamp = ts.tv_sec;
+ timestamp *= 1000;
+ timestamp += tv.tv_usec / 1000;
+ timestamp += ts.tv_nsec / 1000000;
- return (v * 1000) / sysconf(_SC_CLK_TCK);
+ return timestamp;