Merge pull request #9186 from tkem/fix/ticker-read-us-race-cond

Fix ticker_read_us() race condition.
pull/9225/head
Martin Kojtal 2019-01-02 09:19:02 +00:00 committed by GitHub
commit b4f1c25767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions

View File

@ -416,13 +416,16 @@ timestamp_t ticker_read(const ticker_data_t *const ticker)
us_timestamp_t ticker_read_us(const ticker_data_t *const ticker)
{
us_timestamp_t ret;
initialize(ticker);
core_util_critical_section_enter();
update_present_time(ticker);
ret = ticker->queue->present_time;
core_util_critical_section_exit();
return ticker->queue->present_time;
return ret;
}
int ticker_get_next_timestamp(const ticker_data_t *const data, timestamp_t *timestamp)