mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

UTimer: use an actual 'started' flag instead of a magic tick value

Browse Source
This commit is contained in:
fincs 2018-12-15 16:22:04 +01:00 committed by fincs
parent 8d813ee666
commit 33dad9b893
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/include/switch/kernel/utimer.h
View File

@ -16,7 +16,8 @@ typedef enum {
struct UTimer { struct UTimer {
Waitable waitable; Waitable waitable;
TimerType type; TimerType type : 8;
bool started : 1;
u64 next_tick; u64 next_tick;
u64 interval; u64 interval;
}; };

28
nx/source/kernel/utimer.c
View File

@ -5,8 +5,6 @@
#include "kernel/utimer.h" #include "kernel/utimer.h"
#include "wait.h" #include "wait.h"
#define STOPPED 0
static bool _utimerBeginWait(Waitable* ww, WaiterNode* w, u64 cur_tick, u64* next_tick); static bool _utimerBeginWait(Waitable* ww, WaiterNode* w, u64 cur_tick, u64* next_tick);
static Result _utimerOnTimeout(Waitable* ww, u64 old_tick); static Result _utimerOnTimeout(Waitable* ww, u64 old_tick);
static Result _utimerOnSignal(Waitable* ww); static Result _utimerOnSignal(Waitable* ww);
@ -21,7 +19,8 @@ void utimerCreate(UTimer* t, u64 interval, TimerType type)
{ {
_waitableInitialize(&t->waitable, &g_utimerVt); _waitableInitialize(&t->waitable, &g_utimerVt);
t->next_tick = STOPPED; t->started = false;
t->next_tick = 0;
t->interval = armNsToTicks(interval); t->interval = armNsToTicks(interval);
t->type = type; t->type = type;
} }
@ -30,9 +29,9 @@ void utimerStart(UTimer* t)
{ {
mutexLock(&t->waitable.mutex); mutexLock(&t->waitable.mutex);
if (t->next_tick == STOPPED) { if (!t->started) {
u64 new_tick = armGetSystemTick() + t->interval; t->started = true;
t->next_tick = new_tick; t->next_tick = armGetSystemTick() + t->interval;
_waitableSignalAllListeners(&t->waitable); _waitableSignalAllListeners(&t->waitable);
} }
@ -43,8 +42,9 @@ void utimerStop(UTimer* t)
{ {
mutexLock(&t->waitable.mutex); mutexLock(&t->waitable.mutex);
if (t->next_tick != STOPPED) { if (!t->started) {
t->next_tick = STOPPED; t->started = false;
t->next_tick = 0;
_waitableSignalAllListeners(&t->waitable); _waitableSignalAllListeners(&t->waitable);
} }
@ -53,20 +53,18 @@ void utimerStop(UTimer* t)
static void _utimerRecalculate(UTimer* t, u64 old_tick) static void _utimerRecalculate(UTimer* t, u64 old_tick)
{ {
if (t->next_tick == old_tick) { if (t->started && t->next_tick == old_tick) {
u64 interval = t->interval; u64 interval = t->interval;
u64 new_tick = 0;
switch (t->type) { switch (t->type) {
case TimerType_OneShot: case TimerType_OneShot:
new_tick = STOPPED; t->started = false;
t->next_tick = 0;
break; break;
case TimerType_Repeating: case TimerType_Repeating:
new_tick = old_tick + ((armGetSystemTick() - old_tick + interval - 1)/interval)*interval; t->next_tick = old_tick + ((armGetSystemTick() - old_tick + interval - 1)/interval)*interval;
break; break;
} }
t->next_tick = new_tick;
} }
} }
@ -81,7 +79,7 @@ static bool _utimerBeginWait(Waitable* ww, WaiterNode* w, u64 cur_tick, u64* nex
bool do_wait = true; bool do_wait = true;
// Skip timer if stopped. // Skip timer if stopped.
if (timer_tick != STOPPED) { if (t->started) {
s64 diff = timer_tick - cur_tick; s64 diff = timer_tick - cur_tick;
// If the timer is already signalled, we're done. // If the timer is already signalled, we're done.