[tor-commits] [tor/master] Use raw_assert in tor_gettimeofday
nickm at torproject.org
nickm at torproject.org
Wed Jun 20 20:17:15 UTC 2018
commit 8865972a0b18a2fdcf42b55149989d0705c85577
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Jun 20 10:42:06 2018 -0400
Use raw_assert in tor_gettimeofday
We don't want to actually be calling logs when gettimeofday() fails,
since we need gettimeofday() to log.
---
src/common/compat_time.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index ed0a1550f..5c7067461 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -99,10 +99,9 @@ tor_gettimeofday, (struct timeval *timeval))
#elif defined(HAVE_GETTIMEOFDAY)
if (gettimeofday(timeval, NULL)) {
/* LCOV_EXCL_START */
- log_err(LD_GENERAL,"gettimeofday failed.");
/* If gettimeofday dies, we have either given a bad timezone (we didn't),
or segfaulted.*/
- exit(1); // exit ok: gettimeofday failed.
+ raw_assert_unreached_msg("gettimeofday failed");
/* LCOV_EXCL_STOP */
}
#elif defined(HAVE_FTIME)
@@ -900,4 +899,3 @@ monotime_msec_to_approx_coarse_stamp_units(uint64_t msec)
return (msec * STAMP_TICKS_PER_SECOND) / 1000;
}
#endif
-
More information about the tor-commits
mailing list