threads: Switch mutexes and conds to futex-based implementation

Author: kamilaboba123

include/sys/interrupt.h

@@ -24,9 +24,8 @@
 extern "C" {
 #endif
 
-
-extern int interrupt(unsigned int n, int (*f)(unsigned int, void *), void *arg, handle_t cond, handle_t *handle);
-
+/* number, handler func, func argument, cond handle, result resource handle */
+#define interrupt(n, f, arg, c, h) __interrupt((n), (f), (arg), (c), (h))
 
 #ifdef __cplusplus
 }

include/sys/threads.h

@@ -28,6 +28,26 @@
 extern "C" {
 #endif
 
+extern int __mutexUnlock(handle_t m);
+#define mutexUnlock(m) __mutexUnlock((m))
+
+extern int __mutexTry(handle_t m);
+#define mutexTry(m) __mutexTry((m))
+
+#define phMutexLock(m) mutexLock((m))
+
+extern void _uresource_init(void);
+
+extern int __resourceDestroy(handle_t r);
+#define resourceDestroy(r) __resourceDestroy((r))
+
+extern int __condBroadcast(handle_t h);
+#define condBroadcast(h) __condBroadcast((h))
+
+extern int __condSignal(handle_t h);
+#define condSignal(h) __condSignal((h))
+
+#define phCondWait(c, m, t) condWait((c), (m), (t))
 
 typedef struct {
 	handle_t mutex;
@@ -73,8 +93,7 @@ extern int threadJoin(int tid, time_t timeout);
 extern int beginthreadex(void (*start)(void *), unsigned int priority, void *stack, unsigned int stacksz, void *arg, handle_t *id);
 
 
-__attribute__((noreturn))
-extern void endthread(void);
+__attribute__((noreturn)) extern void endthread(void);
 
 
 static inline int beginthread(void (*start)(void *), unsigned int priority, void *stack, unsigned int stacksz, void *arg)
@@ -89,33 +108,22 @@ extern int threadsinfo(int n, threadinfo_t *info);
 extern int priority(int priority);
 
 
-extern int phMutexCreate(handle_t *h, const struct lockAttr *attr);
-
-
 extern int mutexCreate(handle_t *h);
 
 
 static inline int mutexCreateWithAttr(handle_t *h, const struct lockAttr *attr)
 {
-	return phMutexCreate(h, attr);
+	(void)attr;
+	return mutexCreate(h);
 }
 
 
-extern int phMutexLock(handle_t h);
-
-
 extern int mutexLock(handle_t h);
 
 
 extern int mutexLock2(handle_t h1, handle_t h2);
 
 
-extern int mutexTry(handle_t h);
-
-
-extern int mutexUnlock(handle_t h);
-
-
 extern int semaphoreCreate(semaphore_t *s, unsigned int v);
 
 
@@ -128,33 +136,19 @@ extern int semaphoreUp(semaphore_t *s);
 extern int semaphoreDone(semaphore_t *s);
 
 
-extern int phCondCreate(handle_t *h, const struct condAttr *attr);
-
-
 extern int condCreate(handle_t *h);
 
 
 static inline int condCreateWithAttr(handle_t *h, const struct condAttr *attr)
 {
-	return phCondCreate(h, attr);
+	(void)attr;
+	return condCreate(h);
 }
 
 
 extern int condWait(handle_t h, handle_t m, time_t timeout);
 
 
-extern int phCondWait(handle_t h, handle_t m, time_t timeout);
-
-
-extern int condSignal(handle_t h);
-
-
-extern int condBroadcast(handle_t h);
-
-
-extern int resourceDestroy(handle_t h);
-
-
 extern int signalHandle(void (*handler)(void), unsigned mask, unsigned mmask);
 
 

misc/init.c

@@ -22,12 +22,14 @@ extern void _errno_init(void);
 extern void _atexit_init(void);
 extern void _init_array(void);
 extern void _pthread_init(void);
+extern void _uresource_init(void);
 
 
 void _libc_init(void)
 {
 	_atexit_init();
 	_errno_init();
+	_uresource_init();
 	_malloc_init();
 	_env_init();
 	_signals_init();