ndacremont/uthread
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: valgrind for deadlocking

Browse Source
This commit is contained in:
Alessandre Laguierce 2025-03-25 19:20:33 +01:00
parent f6b199d601
commit 16a02f00ab
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/thread/thread.c
View File

@ -182,7 +182,6 @@ int thread_join(thread_t thread, void** retval)
running->last_waited = malloc(sizeof(struct last_thread_t)); running->last_waited = malloc(sizeof(struct last_thread_t));
running->last_waited->ref = 0 ; running->last_waited->ref = 0 ;
entry->last_waited = running->last_waited; entry->last_waited = running->last_waited;
entry->last_waited->ref++;
running->last_waited->last_thread = entry; running->last_waited->last_thread = entry;
} }
running->last_waited->ref++; running->last_waited->ref++;
@ -207,6 +206,15 @@ int thread_join(thread_t thread, void** retval)
} while (!IS_FINISHED(entry)); } while (!IS_FINISHED(entry));
// Exit from waiting state // Exit from waiting state
running->status &= ~WAITING; running->status &= ~WAITING;
if (running->last_waited) {
// Release the last waited thread if no one use it anymore
DBG("Last waited ref : %d", running->last_waited->ref);
if (--running->last_waited->ref == 0) {
free(running->last_waited);
}
running->last_waited = NULL;
}
} }
// Save returned value if needed // Save returned value if needed
@ -229,16 +237,6 @@ void thread_exit(void* retval)
TRACE("Exit thread %p", running); TRACE("Exit thread %p", running);
print_entry(running); print_entry(running);
// free the memory of the last thread struct if no one use it anymore
if(running->last_waited) {
DBG("Last waited ref : %d", running->last_waited->ref);
if(--running->last_waited->ref == 0)
free(running->last_waited);
}
if (running == NULL) {
exit(0);
}
running->status |= FINISHED; running->status |= FINISHED;
if (IS_WAITED(running)) { if (IS_WAITED(running)) {
// If the thread was waited by another thread, we need to wake it up. // If the thread was waited by another thread, we need to wake it up.