nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make the monotonic{_coarse,}_get() functions mockable."

Browse Source 
This reverts commit 2999f0b33f.
This commit is contained in:
Nick Mathewson 2016-07-21 10:30:21 +02:00
parent 2999f0b33f
commit 72a1f0180d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/compat_time.c
View File

@ -220,8 +220,8 @@ monotime_init_internal(void)
/** /**
* Set "out" to the most recent monotonic time value * Set "out" to the most recent monotonic time value
*/ */
MOCK_IMPL(void, void
monotime_get,(monotime_t *out)) monotime_get(monotime_t *out)
{ {
out->abstime_ = mach_absolute_time(); out->abstime_ = mach_absolute_time();
} }
@ -251,16 +251,16 @@ monotime_init_internal(void)
/* no action needed. */ /* no action needed. */
} }
MOCK_IMPL(void, void
monotime_get,(monotime_t *out)) monotime_get(monotime_t *out)
{ {
int r = clock_gettime(CLOCK_MONOTONIC, &out->ts_); int r = clock_gettime(CLOCK_MONOTONIC, &out->ts_);
tor_assert(r == 0); tor_assert(r == 0);
} }
#ifdef CLOCK_MONOTONIC_COARSE #ifdef CLOCK_MONOTONIC_COARSE
MOCK_IMPL(void, void
monotime_coarse_get,(monotime_coarse_t *out)) monotime_coarse_get(monotime_coarse_t *out)
{ {
int r = clock_gettime(CLOCK_MONOTONIC_COARSE, &out->ts_); int r = clock_gettime(CLOCK_MONOTONIC_COARSE, &out->ts_);
tor_assert(r == 0); tor_assert(r == 0);
@ -316,8 +316,8 @@ monotime_init_internal(void)
// FreeLibrary(h) ? // FreeLibrary(h) ?
} }
MOCK_IMPL(void, void
monotime_get,(monotime_t *out)) monotime_get(monotime_t *out)
{ {
if (BUG(monotime_initialized == 0)) { if (BUG(monotime_initialized == 0)) {
monotime_init(); monotime_init();
@ -337,8 +337,8 @@ monotime_get,(monotime_t *out))
LeaveCriticalSection(&monotime_lock); LeaveCriticalSection(&monotime_lock);
} }
MOCK_IMPL(void, void
monotime_coarse_get,(monotime_coarse_t *out)) monotime_coarse_get(monotime_coarse_t *out)
{ {
if (GetTickCount64_fn) { if (GetTickCount64_fn) {
out->tick_count_ = (int64_t)GetTickCount64_fn(); out->tick_count_ = (int64_t)GetTickCount64_fn();
@ -396,8 +396,8 @@ monotime_init_internal(void)
tor_mutex_init(&monotime_lock); tor_mutex_init(&monotime_lock);
} }
MOCK_IMPL(void, void
monotime_get,(monotime_t *out)) monotime_get(monotime_t *out)
{ {
if (BUG(monotime_initialized == 0)) { if (BUG(monotime_initialized == 0)) {
monotime_init(); monotime_init();

4
src/common/compat_time.h
View File

@ -72,7 +72,7 @@ void monotime_init(void);
/** /**
* Set <b>out</b> to the current time. * Set <b>out</b> to the current time.
*/ */
MOCK_DECL(void, monotime_get, (monotime_t *out)); void monotime_get(monotime_t *out);
/** /**
* Return the number of nanoseconds between <b>start</b> and <b>end</b>. * Return the number of nanoseconds between <b>start</b> and <b>end</b>.
*/ */
@ -102,7 +102,7 @@ uint64_t monotime_absolute_msec(void);
/** /**
* Set <b>out</b> to the current coarse time. * Set <b>out</b> to the current coarse time.
*/ */
MOCK_DECL(void, monotime_coarse_get, (monotime_coarse_t *out)); void monotime_coarse_get(monotime_coarse_t *out);
uint64_t monotime_coarse_absolute_nsec(void); uint64_t monotime_coarse_absolute_nsec(void);
uint64_t monotime_coarse_absolute_usec(void); uint64_t monotime_coarse_absolute_usec(void);
uint64_t monotime_coarse_absolute_msec(void); uint64_t monotime_coarse_absolute_msec(void);