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

waitN: Fix index bug when there are handles before UEvents in the array

Browse Source
This commit is contained in:
fincs 2018-12-14 17:44:35 +01:00 committed by fincs
parent 3c9a84fe68
commit 2e76b2b150
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,8 @@ typedef struct {
UEvent* parent_event;
UTimer* parent_timer;
};
size_t idx;
size_t* idx_out;
s32 idx;
s32* idx_out;
} WaiterNode;
struct Waitable {

8
nx/source/kernel/uevent.c
View File

@ -36,10 +36,8 @@ void _ueventTryAutoClear(UEvent* e)
mutexUnlock(&e->waitable.mutex);
}
bool _ueventAddListener(UEvent* e, WaiterNode* w, size_t idx, size_t* idx_out, Handle thread)
bool _ueventAddListener(UEvent* e, WaiterNode* w, s32 idx, s32* idx_out, Handle thread)
{
_waiterNodeCreate(w, WaiterNodeType_Event, &e->waitable, thread, idx, idx_out);
mutexLock(&e->waitable.mutex);
bool signalled = e->signal;
@ -47,8 +45,10 @@ bool _ueventAddListener(UEvent* e, WaiterNode* w, size_t idx, size_t* idx_out, H
if (signalled) {
if (e->auto_clear)
e->signal = false;
} else
} else {
_waiterNodeCreate(w, WaiterNodeType_Event, &e->waitable, thread, idx, idx_out);
_waiterNodeAddToWaitable(w, &e->waitable);
}
mutexUnlock(&e->waitable.mutex);
return !signalled;

2
nx/source/kernel/uevent.h
View File

@ -3,4 +3,4 @@
#include "kernel/uevent.h"
void _ueventTryAutoClear(UEvent* e);
bool _ueventAddListener(UEvent* e, WaiterNode* w, size_t idx, size_t* idx_out, Handle thread);
bool _ueventAddListener(UEvent* e, WaiterNode* w, s32 idx, s32* idx_out, Handle thread);

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

@ -75,7 +75,7 @@ u64 _utimerGetNextTick(UTimer* t)
return ret;
}
void _utimerAddListener(UTimer* t, WaiterNode* w, size_t idx, size_t* idx_out, Handle thread)
void _utimerAddListener(UTimer* t, WaiterNode* w, s32 idx, s32* idx_out, Handle thread)
{
_waiterNodeCreate(w, WaiterNodeType_Timer, &t->waitable, thread, idx, idx_out);

2
nx/source/kernel/utimer.h
View File

@ -4,4 +4,4 @@
void _utimerRecalculate(UTimer* t, u64 old_tick);
u64 _utimerGetNextTick(UTimer* t);
void _utimerAddListener(UTimer* t, WaiterNode* w, size_t idx, size_t* idx_out, Handle thread);
void _utimerAddListener(UTimer* t, WaiterNode* w, s32 idx, s32* idx_out, Handle thread);

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

@ -26,8 +26,8 @@ static Result waitImpl(s32* idx_out, Waiter* objects, size_t num_objects, u64 ti
Handle handles[num_objects];
u64 cur_tick = armGetSystemTick();
size_t triggered_idx = -1;
size_t num_waiters = 0;
s32 triggered_idx = -1;
u64 waiters_added = 0;
WaiterNode waiters[num_objects];
u64 end_tick = UINT64_MAX;
@ -67,16 +67,16 @@ static Result waitImpl(s32* idx_out, Waiter* objects, size_t num_objects, u64 ti
// Always add a listener on the timer,
// If the timer is started/stopped we want to detect that.
_utimerAddListener(
obj->timer, &waiters[num_waiters], num_waiters, &triggered_idx,
obj->timer, &waiters[i], i, &triggered_idx,
own_thread_handle);
num_waiters++;
waiters_added |= 1ULL << i;
break;
case WaiterType_UEvent:
// Try to add a listener to the event, if it hasn't already signalled.
added = _ueventAddListener(
obj->event, &waiters[num_waiters], num_waiters, &triggered_idx,
obj->event, &waiters[i], i, &triggered_idx,
own_thread_handle);
// If the event already happened, we're done.
@ -87,7 +87,7 @@ static Result waitImpl(s32* idx_out, Waiter* objects, size_t num_objects, u64 ti
}
// If the event hasn't signalled, we added a listener.
num_waiters++;
waiters_added |= 1ULL << i;
break;
case WaiterType_Handle:
@ -138,8 +138,9 @@ static Result waitImpl(s32* idx_out, Waiter* objects, size_t num_objects, u64 ti
clean_up:
// Remove listeners.
for (i = 0; i < num_waiters; i ++)
_waiterNodeFree(&waiters[i]);
for (i = 0; i < num_objects; i ++)
if (waiters_added & (1ULL << i))
_waiterNodeFree(&waiters[i]);
return rc;
}

4
nx/source/kernel/wait.h
View File

@ -21,7 +21,7 @@ static inline void _waitableSignalAllListeners(Waitable* ww)
// Try to swap -1 => idx on the waiter thread.
// If another waitable signals simultaneously only one will win the race and insert its own idx.
size_t minus_one = -1;
s32 minus_one = -1;
bool sent_idx = __atomic_compare_exchange_n(
w->idx_out, &minus_one, w->idx, true, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
@ -32,7 +32,7 @@ static inline void _waitableSignalAllListeners(Waitable* ww)
static inline void _waiterNodeCreate(
WaiterNode* w, WaiterNodeType type, Waitable* parent, Handle thread,
size_t idx, size_t* idx_out)
s32 idx, s32* idx_out)
{
w->type = type;
w->parent = parent;