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

wait: Bug-fixes and lock-free utimer stop/start

Browse Source
This commit is contained in:
plutooo 2018-10-28 16:28:03 +01:00 committed by fincs
parent 370d78453e
commit c6fc6a41e5
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,9 @@ struct UsermodeTimer
u64 interval; u64 interval;
}; };
void utimerCreate(UsermodeTimer* t, u64 interval); void utimerCreate(UsermodeTimer* t, u64 interval, bool start);
void utimerStart(UsermodeTimer* t);
void utimerStop(UsermodeTimer* t);
// Internal methods (do not use!): // Internal methods (do not use!):
void _utimerRecalculate(UsermodeTimer* t, u64 old_time); void _utimerRecalculate(UsermodeTimer* t, u64 old_time);

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

@ -3,10 +3,23 @@
#include "kernel/utimer.h" #include "kernel/utimer.h"
#include "arm/counter.h" #include "arm/counter.h"
void utimerCreate(UsermodeTimer* t, u64 interval) void utimerCreate(UsermodeTimer* t, u64 interval, bool start)
{ {
t->next_time = armGetSystemTick() + armNsToTick(interval); t->next_time = 0;
t->interval = armNsToTick(interval); t->interval = armNsToTick(interval);
if (start)
utimerStart(t);
}
void utimerStart(UsermodeTimer* t)
{
__sync_bool_compare_and_swap(&t->next_time, 0, armGetSystemTick() + armNsToTick(t->interval));
}
void utimerStop(UsermodeTimer* t)
{
while (__sync_bool_compare_and_swap(&t->next_time, t->next_time, 0));
} }
void _utimerRecalculate(UsermodeTimer* t, u64 old_time) void _utimerRecalculate(UsermodeTimer* t, u64 old_time)

32
nx/source/kernel/wait.c
View File

@ -21,7 +21,7 @@ Result waitN(s32* idx_out, WaitObject* objects, size_t num_objects, u64 timeout)
Handle handles[MAX_WAIT]; Handle handles[MAX_WAIT];
u64 cur_tick = armGetSystemTick(); u64 cur_tick = armGetSystemTick();
u64 end_time = (timeout == UINT64_MAX) ? UINT64_MAX : cur_tick + timeout; u64 end_time = timeout;
s32 end_time_idx = -1; s32 end_time_idx = -1;
size_t i; size_t i;
@ -33,12 +33,21 @@ Result waitN(s32* idx_out, WaitObject* objects, size_t num_objects, u64 timeout)
switch (obj->type) switch (obj->type)
{ {
case WaitObjectType_UsermodeTimer: case WaitObjectType_UsermodeTimer:
// Override the user-supplied timeout if timer would fire before that.
timer_tick = _utimerGetNextTime(obj->timer); timer_tick = _utimerGetNextTime(obj->timer);
if (timer_tick < end_time) // If the timer already signalled, we're done.
if (timer_tick < cur_tick)
{ {
end_time = timer_tick; *idx_out = i;
_utimerRecalculate(obj->timer, timer_tick);
_waiterFree(&waiter, objects);
return 0;
}
// Override the user-supplied timeout if timer would fire before that.
if ((timer_tick - cur_tick) < end_time)
{
end_time = timer_tick - cur_tick;
end_time_idx = i; end_time_idx = i;
} }
break; break;
@ -63,29 +72,24 @@ Result waitN(s32* idx_out, WaitObject* objects, size_t num_objects, u64 timeout)
handles[i] = (obj->type == WaitObjectType_Handle) ? obj->handle : dummy_handle; handles[i] = (obj->type == WaitObjectType_Handle) ? obj->handle : dummy_handle;
} }
// If the timer already signalled, we're done.
if (end_time < cur_tick)
{
*idx_out = end_time_idx;
_utimerRecalculate(objects[end_time_idx].timer, end_time);
_waiterFree(&waiter, objects);
return 0;
}
// Do the actual syscall. // Do the actual syscall.
Result rc; Result rc;
rc = svcWaitSynchronization(idx_out, handles, num_objects, end_time - cur_tick); rc = svcWaitSynchronization(idx_out, handles, num_objects, end_time);
// Timeout-error? // Timeout-error?
if (rc == 0xEA01) if (rc == 0xEA01)
{ {
// If the user-supplied timeout, we return the error back to them. // If the user-supplied timeout, we return the error back to them.
if (end_time_idx == -1) if (end_time_idx == -1)
{
_waiterFree(&waiter, objects);
return rc; return rc;
}
// If not, it means a timer was triggered. // If not, it means a timer was triggered.
*idx_out = end_time_idx; *idx_out = end_time_idx;
_utimerRecalculate(objects[end_time_idx].timer, end_time); _utimerRecalculate(objects[end_time_idx].timer, end_time + cur_tick);
_waiterFree(&waiter, objects); _waiterFree(&waiter, objects);
return 0; return 0;
} }