From 28f863d2eebc0d120960743b890664f03dfbce73 Mon Sep 17 00:00:00 2001 From: cheloha Date: Fri, 27 Mar 2020 16:22:26 +0000 Subject: [PATCH] btrace(8): simplify builtin_nsecs(); ok mpi@ --- usr.sbin/btrace/btrace.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/usr.sbin/btrace/btrace.c b/usr.sbin/btrace/btrace.c index 556c37e81a6..7a1e0d0de2d 100644 --- a/usr.sbin/btrace/btrace.c +++ b/usr.sbin/btrace/btrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: btrace.c,v 1.11 2020/03/23 15:36:30 mpi Exp $ */ +/* $OpenBSD: btrace.c,v 1.12 2020/03/27 16:22:26 cheloha Exp $ */ /* * Copyright (c) 2019 - 2020 Martin Pieuchot @@ -595,17 +595,14 @@ TIMESPEC_TO_NSEC(struct timespec *ts) uint64_t builtin_nsecs(struct dt_evt *dtev) { - uint64_t nsecs; + struct timespec ts; if (dtev == NULL) { - struct timeval tv; + clock_gettime(CLOCK_REALTIME, &ts); + return TIMESPEC_TO_NSEC(&ts); + } - gettimeofday(&tv, NULL); - nsecs = (tv.tv_sec * 1000000000L + tv.tv_usec * 1000); - } else - nsecs = TIMESPEC_TO_NSEC(&dtev->dtev_tsp); - - return nsecs; + return TIMESPEC_TO_NSEC(&dtev->dtev_tsp); } #include