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

fix(clang): revert clang on thread.

Browse Source
This commit is contained in:
damien DELPY 2025-03-21 16:15:25 +01:00
parent 93ad044bb1
commit 9e02e4ef67
No known key found for this signature in database
2 changed files with 145 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/thread/thread.c
View File

@ -1,12 +1,12 @@
#include <string.h> #include <string.h>
#ifndef USE_PTHREAD #ifndef USE_PTHREAD
#include "thread.h"
#include "debug.h" #include "debug.h"
#include "pthread.h" #include "pthread.h"
#include "thread.h" #include <sys/queue.h>
#include <bits/pthreadtypes.h> #include <bits/pthreadtypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/queue.h>
#include <ucontext.h> #include <ucontext.h>
#include <valgrind/valgrind.h> #include <valgrind/valgrind.h>
@ -19,8 +19,7 @@
#endif #endif
struct context_entry { struct context_entry {
TAILQ_ENTRY(context_entry) TAILQ_ENTRY(context_entry) link;
link;
ucontext_t context; ucontext_t context;
thread_t id; thread_t id;
void *retvalue; void *retvalue;
@ -32,8 +31,7 @@ static TAILQ_HEAD(context_head, context_entry) head = TAILQ_HEAD_INITIALIZER(hea
static struct context_entry *running = 0; static struct context_entry *running = 0;
static unsigned long long counter = 0; static unsigned long long counter = 0;
int thread_yield(void) int thread_yield(void) {
{
TRACE("thread_yield"); TRACE("thread_yield");
if (counter <= 1) { if (counter <= 1) {
return 0; return 0;
@ -53,7 +51,8 @@ int thread_yield(void)
if (first->id == running->id) { if (first->id == running->id) {
return 0; return 0;
} }
} while ((first->status & FINISHED) || ((first->status & WAITING) && !(((struct context_entry*)first->retvalue)->status & FINISHED))); } while ((first->status & FINISHED) ||
((first->status & WAITING) && !(((struct context_entry *)first->retvalue)->status & FINISHED)));
TRACE("PICKING %p", first); TRACE("PICKING %p", first);
struct context_entry *old_runner = running; struct context_entry *old_runner = running;
running = first; running = first;
@ -61,22 +60,19 @@ int thread_yield(void)
return 0; return 0;
} }
thread_t thread_self(void) thread_t thread_self(void) {
{
if (running == NULL) { if (running == NULL) {
return 0; return 0;
} }
return running->id; return running->id;
} }
void thread_function_wrapper(void* (*func)(void*), void* funcarg) void thread_function_wrapper(void *(*func)(void *), void *funcarg) {
{
TRACE("Wrapper for %p\n", func); TRACE("Wrapper for %p\n", func);
thread_exit(func(funcarg)); thread_exit(func(funcarg));
} }
int thread_create(thread_t* newthread, void* (*func)(void*), void* funcarg) int thread_create(thread_t *newthread, void *(*func)(void *), void *funcarg) {
{
TRACE("Create a new thread that execute function %p", func); TRACE("Create a new thread that execute function %p", func);
struct context_entry *new_entry = malloc(sizeof(*new_entry)); struct context_entry *new_entry = malloc(sizeof(*new_entry));
if (counter == 0) { if (counter == 0) {
@ -96,7 +92,8 @@ int thread_create(thread_t* newthread, void* (*func)(void*), void* funcarg)
new_entry->context.uc_stack.ss_size = STACK_SIZE; new_entry->context.uc_stack.ss_size = STACK_SIZE;
new_entry->valgrind_id = VALGRIND_STACK_REGISTER( new_entry->valgrind_id = VALGRIND_STACK_REGISTER(
new_entry->context.uc_stack.ss_sp, new_entry->context.uc_stack.ss_sp,
new_entry->context.uc_stack.ss_sp + new_entry->context.uc_stack.ss_size); new_entry->context.uc_stack.ss_sp + new_entry->context.uc_stack.ss_size
);
new_entry->id = new_entry; new_entry->id = new_entry;
new_entry->status = ALLOCATED; new_entry->status = ALLOCATED;
new_entry->retvalue = 0; new_entry->retvalue = 0;
@ -107,17 +104,14 @@ int thread_create(thread_t* newthread, void* (*func)(void*), void* funcarg)
return 0; return 0;
} }
void print_entry(struct context_entry* entry) void print_entry(struct context_entry *entry) {
{
TRACE("CONTEXT (%p, %p, %d);", entry, entry->id, (entry->status & FINISHED) > 0); TRACE("CONTEXT (%p, %p, %d);", entry, entry->id, (entry->status & FINISHED) > 0);
} }
int thread_join(thread_t thread, void** retval) int thread_join(thread_t thread, void **retval) {
{
TRACE("Join thread %p", thread); TRACE("Join thread %p", thread);
struct context_entry *entry; struct context_entry *entry;
TAILQ_FOREACH(entry, &head, link) TAILQ_FOREACH(entry, &head, link) {
{
if (entry->id != thread) { if (entry->id != thread) {
continue; continue;
} }
@ -156,8 +150,7 @@ int thread_join(thread_t thread, void** retval)
return -1; return -1;
} }
void thread_exit(void* retval) void thread_exit(void *retval) {
{
TRACE("Exit thread %p", running); TRACE("Exit thread %p", running);
if (running == 0) if (running == 0)
exit(0); exit(0);
@ -167,20 +160,16 @@ void thread_exit(void* retval)
exit(0); exit(0);
} }
int thread_mutex_init(thread_mutex_t* mutex) int thread_mutex_init(thread_mutex_t *mutex) {
{
return pthread_mutex_init((pthread_mutex_t *) mutex, NULL); return pthread_mutex_init((pthread_mutex_t *) mutex, NULL);
} }
int thread_mutex_destroy(thread_mutex_t* mutex) int thread_mutex_destroy(thread_mutex_t *mutex) {
{
return pthread_mutex_destroy((pthread_mutex_t *) mutex); return pthread_mutex_destroy((pthread_mutex_t *) mutex);
} }
int thread_mutex_lock(thread_mutex_t* mutex) int thread_mutex_lock(thread_mutex_t *mutex) {
{
return pthread_mutex_lock((pthread_mutex_t * )mutex); return pthread_mutex_lock((pthread_mutex_t * )mutex);
} }
int thread_mutex_unlock(thread_mutex_t* mutex) int thread_mutex_unlock(thread_mutex_t *mutex) {
{
return pthread_mutex_unlock((pthread_mutex_t *)mutex); return pthread_mutex_unlock((pthread_mutex_t *)mutex);
} }

6
src/thread/thread.h
View File

@ -40,9 +40,7 @@ extern int thread_join(thread_t thread, void** retval);
extern void thread_exit(void *retval) __attribute__ ((__noreturn__)); extern void thread_exit(void *retval) __attribute__ ((__noreturn__));
/* Interface possible pour les mutex */ /* Interface possible pour les mutex */
typedef struct thread_mutex { typedef struct thread_mutex { int dummy; } thread_mutex_t;
int dummy;
} thread_mutex_t;
int thread_mutex_init(thread_mutex_t *mutex); int thread_mutex_init(thread_mutex_t *mutex);
int thread_mutex_destroy(thread_mutex_t *mutex); int thread_mutex_destroy(thread_mutex_t *mutex);
int thread_mutex_lock(thread_mutex_t *mutex); int thread_mutex_lock(thread_mutex_t *mutex);
@ -51,8 +49,8 @@ int thread_mutex_unlock(thread_mutex_t* mutex);
#else /* USE_PTHREAD */ #else /* USE_PTHREAD */
/* Si on compile avec -DUSE_PTHREAD, ce sont les pthreads qui sont utilisés */ /* Si on compile avec -DUSE_PTHREAD, ce sont les pthreads qui sont utilisés */
#include <pthread.h>
#include <sched.h> #include <sched.h>
#include <pthread.h>
#define thread_t pthread_t #define thread_t pthread_t
#define thread_self pthread_self #define thread_self pthread_self
#define thread_create(th, func, arg) pthread_create(th, NULL, func, arg) #define thread_create(th, func, arg) pthread_create(th, NULL, func, arg)