vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jul 3 14:05:01 2018 +0200| [ba20ab77200ff5eafb67a842d7a521daae1e7c43] | committer: Steve Lhomme
threads: convert variables in seconds to ticks using vlc_tick_from_sec() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba20ab77200ff5eafb67a842d7a521daae1e7c43 --- src/android/thread.c | 2 +- src/misc/threads.c | 2 +- src/os2/thread.c | 2 +- src/posix/thread.c | 2 +- src/win32/thread.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/android/thread.c b/src/android/thread.c index c14a119af1..bdd97af3d7 100644 --- a/src/android/thread.c +++ b/src/android/thread.c @@ -417,7 +417,7 @@ vlc_tick_t vlc_tick_now (void) abort (); static_assert(INT64_C(1000000) == CLOCK_FREQ, "CLOCK_FREQ mismatch"); - return (INT64_C(1000000) * ts.tv_sec) + (ts.tv_nsec / 1000); + return vlc_tick_from_sec( ts.tv_sec ) + (ts.tv_nsec / 1000); } /* cpu */ diff --git a/src/misc/threads.c b/src/misc/threads.c index 5f2238147c..de648d51b6 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -218,7 +218,7 @@ int vlc_cond_timedwait_daytime(vlc_cond_t *cond, vlc_mutex_t *mutex, struct timespec ts; timespec_get(&ts, TIME_UTC); - deadline -= ts.tv_sec * CLOCK_FREQ; + deadline -= vlc_tick_from_sec( ts.tv_sec ); deadline -= ts.tv_nsec / (1000000000 / CLOCK_FREQ); return vlc_cond_wait_delay(cond, mutex, deadline); diff --git a/src/os2/thread.c b/src/os2/thread.c index 3a0716ef3f..8884497dea 100644 --- a/src/os2/thread.c +++ b/src/os2/thread.c @@ -910,7 +910,7 @@ vlc_tick_t vlc_tick_now (void) /* We need to split the division to avoid 63-bits overflow */ lldiv_t d = lldiv (Q2LL(counter), freq); - return (d.quot * CLOCK_FREQ) + ((d.rem * CLOCK_FREQ) / freq); + return vlc_tick_from_sec( d.quot ) + ((d.rem * CLOCK_FREQ) / freq); } #undef vlc_tick_wait diff --git a/src/posix/thread.c b/src/posix/thread.c index ca3b5ec485..a33ee412db 100644 --- a/src/posix/thread.c +++ b/src/posix/thread.c @@ -586,7 +586,7 @@ vlc_tick_t vlc_tick_now (void) abort (); static_assert(INT64_C(1000000) == CLOCK_FREQ, "CLOCK_FREQ mismatch"); - return (INT64_C(1000000) * ts.tv_sec) + (ts.tv_nsec / 1000); + return vlc_tick_from_sec( ts.tv_sec ) + (ts.tv_nsec / 1000); } #undef vlc_tick_wait diff --git a/src/win32/thread.c b/src/win32/thread.c index 63932f9646..95cc6f7b3d 100644 --- a/src/win32/thread.c +++ b/src/win32/thread.c @@ -743,7 +743,7 @@ static vlc_tick_t mdate_perf (void) /* We need to split the division to avoid 63-bits overflow */ lldiv_t d = lldiv (counter.QuadPart, clk.perf.freq.QuadPart); - return (d.quot * CLOCK_FREQ) + ((d.rem * CLOCK_FREQ) / clk.perf.freq.QuadPart); + return vlc_tick_from_sec( d.quot ) + ((d.rem * CLOCK_FREQ) / clk.perf.freq.QuadPart); } static vlc_tick_t mdate_wall (void) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
