Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: Fix pthread cancellation

Browse Source 
Install SIGCANCEL handler for all threads.

Remove unneeded atomic stores and loads. States are only changed within
the thread itself.

Define pthread_testcancel as a macro so it gets inlined inside
cancellation points
This commit is contained in:
Bananymous
2026-04-06 19:30:01 +03:00
parent 3fb903d991
commit 7fb27b16e8
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
userspace/libraries/LibC/include/pthread.h
View File

@@ -49,7 +49,7 @@ struct uthread
int errno_;
int cancel_type;
int cancel_state;
int canceled;
volatile int canceled;
// FIXME: make this dynamic
uintptr_t dtv[1 + 256];
};
@@ -219,6 +219,14 @@ void pthread_testcancel(void);
void pthread_cleanup_pop(int execute);
void pthread_cleanup_push(void (*routine)(void*), void* arg);
#define _pthread_testcancel() do { \
struct uthread* uthread = _get_uthread(); \
if (__builtin_expect(uthread->cancel_state == PTHREAD_CANCEL_ENABLE, 1)) \
if (__builtin_expect(uthread->canceled, 0)) \
pthread_exit(PTHREAD_CANCELED); \
} while (0)
#define pthread_testcancel() _pthread_testcancel()
__END_DECLS
#endif