Merge branch 'obsd-master'

1 files changed, 14 insertions, 0 deletions

diff --git a/tmux.c b/tmux.c
index b600702c..b9a676a2 100644
--- a/tmux.c
+++ b/tmux.c
@@ -237,6 +237,20 @@ setblocking(int fd, int state)
 	}
 }
 
+uint64_t
+get_timer(void)
+{
+	struct timespec	ts;
+
+	/*
+	 * We want a timestamp in milliseconds suitable for time measurement,
+	 * so prefer the monotonic clock.
+	 */
+	if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
+		clock_gettime(CLOCK_REALTIME, &ts);
+	return ((ts.tv_sec * 1000ULL) + (ts.tv_nsec / 1000000ULL));
+}
+
 const char *
 sig2name(int signo)
 {