Skip to content

Make sure os_get_current_time_us wraps as 32bit boundary #17

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

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

Make sure os_get_current_time_us wraps as 32bit boundary #17

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
35 changes: 34 additions & 1 deletion src/rt-kernel/osal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
********************************************************************/

#include "osal.h"
#include "kern/types.h"
#include "kern/int.h"

extern const os_cfg_t os_cfg;

void * os_malloc (size_t size)
{
Expand Down Expand Up @@ -60,9 +64,38 @@ void os_usleep (uint32_t us)
task_delay (tick_from_ms (us / 1000));
}

/**
* \brief Extend kernel tick to 64 bits without wrap
*
* \return uint64_t number of ticks since start
*/
static uint64_t os_get_current_tick (void)
{
static volatile tick_t os_tick_last = 0u;
static volatile uint64_t os_tick_base = 0u;
tick_t tick;
tick_t last;
uint64_t base;

int_lock();
last = os_tick_last;
base = os_tick_base;
tick = tick_get();
if (tick < last)
{
base += 1ull + UINT32_MAX;
}
os_tick_last = tick;
os_tick_base = base;
int_unlock();

return base + tick;
}

uint32_t os_get_current_time_us (void)
{
return 1000 * tick_to_ms (tick_get());
uint64_t us = 10000000ull * os_get_current_tick() / os_cfg.ticks_per_second;
return (uint32_t)us;
}

os_sem_t * os_sem_create (size_t count)
Expand Down