Skip to content

Fix jitter timer close registration and ensure proper cleanup #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miniusercoder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix jitter timer close registration and ensure proper cleanup #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/core/rng/rng_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ err_t rngTimerRead(void* buf, size_t* read, size_t count)
static volatile bool_t _tm_ctr_loop; /*< счетчик запущен? */
static volatile tm_ticks_t _tm_ctr_ticks; /*< текущее показание */
static volatile tm_ticks_t _tm_ctr_ticks2; /*< предыдущее показание */
static bool_t _tm_ctr_close_registered; /*< закрытие зарегистрировано? */

#ifdef OS_WIN

Expand Down Expand Up @@ -221,11 +222,12 @@ static bool_t tmCtrStart()
if (!tmCtrCreate())
return FALSE;
// зарегистрировать закрытие
if (!utilOnExit(tmCtrClose))
if (!_tm_ctr_close_registered && !utilOnExit(tmCtrClose))
{
tmCtrClose();
return FALSE;
}
_tm_ctr_close_registered = TRUE;
return TRUE;
}

Expand Down Expand Up @@ -345,5 +347,6 @@ err_t rngJitterRead(void* buf, size_t* read, size_t count)
}
CLEAN3(ticks, t, w);
*read = count;
tmCtrClose();
return ERR_OK;
}