mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-05 10:52:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed typos

Browse Source
This commit is contained in:
Juan Antonio Hernández Cánovas 2018-08-24 12:49:54 +02:00
parent fac799648e
commit e3a4e26875
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/kernel/barrier.h
View File

@ -5,9 +5,9 @@
* @copyright libnx Authors * @copyright libnx Authors
*/ */
#pragma once #pragma once
#include "../types.h"
#include "condvar.h" #include "condvar.h"
#include "mutex.h" #include "mutex.h"
#include "thread.h"
#include "../runtime/util/list.h" #include "../runtime/util/list.h"
typedef struct barrier { typedef struct barrier {

9
nx/include/switch/runtime/util/list.h
View File

@ -5,13 +5,14 @@
* @copyright libnx Authors * @copyright libnx Authors
*/ */
#pragma once #pragma once
#include "../types.h" #include "../../types.h"
#include "../kernel/condvar.h" #include "../../kernel/condvar.h"
#include "../kernel/mutex.h" #include "../../kernel/rwlock.h"
#include "../../kernel/thread.h"
typedef struct node { typedef struct node {
void* item; void* item;
Node* next; struct node* next;
} Node; } Node;
typedef struct list { typedef struct list {

26
nx/source/kernel/barrier.c
View File

@ -6,8 +6,8 @@ void barrierInit(Barrier* b) {
if(b->isInited) { if(b->isInited) {
return; return;
} }
listInit(b->threads_registered); listInit(&b->threads_registered);
listInit(b->threads_waiting); listInit(&b->threads_waiting);
b->isInited = true; b->isInited = true;
mutexUnlock(&b->mutex); mutexUnlock(&b->mutex);
} }
@ -17,39 +17,39 @@ void barrierFree(Barrier* b) {
if(!b->isInited) { if(!b->isInited) {
return; return;
} }
listFree(b->threads_registered); listFree(&b->threads_registered);
listFree(b->threads_waiting); listFree(&b->threads_waiting);
b->isInited = false; b->isInited = false;
mutexUnlock(&b->mutex); mutexUnlock(&b->mutex);
} }
void barrierRegister(Barrier* b, Thread* thread) { void barrierRegister(Barrier* b, Thread* thread) {
if(listIsInserted(b->threads_registered, (void*)thread)) { if(listIsInserted(&b->threads_registered, (void*)thread)) {
return; return;
} }
listInsertLast(b->threads_registered, (void*)thread); listInsertLast(&b->threads_registered, (void*)thread);
} }
void barrierUnregister(Barrier* b, Thread* thread) { void barrierUnregister(Barrier* b, Thread* thread) {
listDelete(b->threads_registered, (void*)thread); listDelete(&b->threads_registered, (void*)thread);
} }
void barrierWait(Barrier* b, Thread* thread) { void barrierWait(Barrier* b, Thread* thread) {
if(!listIsInserted(b->threads_registered)) { if(!listIsInserted(&b->threads_registered, thread)) {
return; return;
} }
mutexLock(&b->mutex); mutexLock(&b->mutex);
if(listGetNumNodes(b->threads_registered) == listGetNumNodes(b->threads_waiting)+1) { if(listGetNumNodes(&b->threads_registered) == listGetNumNodes(&b->threads_waiting)+1) {
while(listGetNumNodes(b->threads_waiting) > 0) { while(listGetNumNodes(&b->threads_waiting) > 0) {
Thread* current_thread = listGetItem(b->threads_waiting, 0); Thread* current_thread = listGetItem(&b->threads_waiting, 0);
threadResume(current_thread); threadResume(current_thread);
listDelete(b->threads_waiting, current_thread); listDelete(&b->threads_waiting, current_thread);
} }
mutexUnlock(&b->mutex); mutexUnlock(&b->mutex);
} }
else { else {
listInsertLast(b->threads_waiting, thread); listInsertLast(&b->threads_waiting, thread);
mutexUnlock(&b->mutex); mutexUnlock(&b->mutex);
threadPause((void*)thread); threadPause((void*)thread);
} }