c/helos1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

smp: return value for Condiction_Wait

Browse Source
This commit is contained in:
Edgaru089 2021-11-11 15:26:57 +08:00
parent c476663ff9
commit 240e01d69c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
smp/condiction.c
View File

@ -13,6 +13,7 @@ smp_Condition *smp_Condition_Create() {
} }
void smp_Condition_Destroy(smp_Condition *c) { void smp_Condition_Destroy(smp_Condition *c) {
smp_Condition_NotifyAll(c, (void *)UINTPTR_MAX);
vector_Destroy(c->threads); vector_Destroy(c->threads);
kFree(c); kFree(c);
} }
@ -26,6 +27,7 @@ void *smp_Condition_Wait(smp_Condition *c) {
INTERRUPT_RESTORE; INTERRUPT_RESTORE;
smp_thread_Yield(); smp_thread_Yield();
return t->waitData;
return 0; return 0;
} }
@ -40,17 +42,13 @@ bool smp_Condition_NotifyOne(smp_Condition *c, void *data) {
__smp_Thread *last = *(__smp_Thread **)vector_At(c->threads, size - 1); __smp_Thread *last = *(__smp_Thread **)vector_At(c->threads, size - 1);
last->waitCondition = NULL; last->waitCondition = NULL;
last->waitData = data;
vector_Resize(c->threads, size - 1); vector_Resize(c->threads, size - 1);
INTERRUPT_RESTORE; INTERRUPT_RESTORE;
return true; return true;
} }
// NotifyAll unblocks all waiting threads.
//
// The data is (for now) not sent.
//
// Returns the number of threads unblocked.
int smp_Condition_NotifyAll(smp_Condition *c, void *data) { int smp_Condition_NotifyAll(smp_Condition *c, void *data) {
INTERRUPT_DISABLE; INTERRUPT_DISABLE;
@ -63,6 +61,7 @@ int smp_Condition_NotifyAll(smp_Condition *c, void *data) {
for (uintptr_t i = 0; i < size; i++) { for (uintptr_t i = 0; i < size; i++) {
__smp_Thread *t = *(__smp_Thread **)vector_At(c->threads, i); __smp_Thread *t = *(__smp_Thread **)vector_At(c->threads, i);
t->waitCondition = NULL; t->waitCondition = NULL;
t->waitData = data;
} }
vector_Clear(c->threads); vector_Clear(c->threads);

1
smp/internal.h
View File

@ -18,6 +18,7 @@ typedef struct {
uint64_t lastTick; uint64_t lastTick;
uint64_t sleepUntil; uint64_t sleepUntil;
smp_Condition *waitCondition; smp_Condition *waitCondition;
void * waitData;
// Last-saved thread state after preemptive context switch // Last-saved thread state after preemptive context switch
smp_thread_State state; smp_thread_State state;