[Minios-devel] [UNIKRAFT/MUSL PATCH 04/19] Add patch to use pthread header from pthread-embedded library

[Gaulthier Gain <gaulthier.gain@xxxxxxxxx>]

wip: Remove the pthread header used by musl and use the one of the
pthread-embedded library.

Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
---
 .../0005-use-pthread_h-from-pthread-embedded.patch | 261 +++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 patches/0005-use-pthread_h-from-pthread-embedded.patch

diff --git a/patches/0005-use-pthread_h-from-pthread-embedded.patch 
b/patches/0005-use-pthread_h-from-pthread-embedded.patch
new file mode 100644
index 0000000..bf0a2a0
--- /dev/null
+++ b/patches/0005-use-pthread_h-from-pthread-embedded.patch
@@ -0,0 +1,261 @@
+From 5f4f8935269bade4c95db64c2ece826e610f5e46 Mon Sep 17 00:00:00 2001
+From: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
+Date: Thu, 29 Aug 2019 19:10:30 +0200
+Subject: [MUSL] [PATCH] Use pthread.h from pthread-embedded library
+
+Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
+---
+ include/pthread.h | 227 ------------------------------------------------------
+ include/signal.h  |   2 +-
+ 2 files changed, 1 insertion(+), 228 deletions(-)
+ delete mode 100644 include/pthread.h
+
+diff --git a/include/pthread.h b/include/pthread.h
+deleted file mode 100644
+index bba9587..0000000
+--- a/include/pthread.h
++++ /dev/null
+@@ -1,227 +0,0 @@
+-#ifndef _PTHREAD_H
+-#define _PTHREAD_H
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#include <features.h>
+-
+-#define __NEED_time_t
+-#define __NEED_clockid_t
+-#define __NEED_struct_timespec
+-#define __NEED_sigset_t
+-#define __NEED_pthread_t
+-#define __NEED_pthread_attr_t
+-#define __NEED_pthread_mutexattr_t
+-#define __NEED_pthread_condattr_t
+-#define __NEED_pthread_rwlockattr_t
+-#define __NEED_pthread_barrierattr_t
+-#define __NEED_pthread_mutex_t
+-#define __NEED_pthread_cond_t
+-#define __NEED_pthread_rwlock_t
+-#define __NEED_pthread_barrier_t
+-#define __NEED_pthread_spinlock_t
+-#define __NEED_pthread_key_t
+-#define __NEED_pthread_once_t
+-#define __NEED_size_t
+-
+-#include <bits/alltypes.h>
+-
+-#include <sched.h>
+-#include <time.h>
+-
+-#define PTHREAD_CREATE_JOINABLE 0
+-#define PTHREAD_CREATE_DETACHED 1
+-
+-#define PTHREAD_MUTEX_NORMAL 0
+-#define PTHREAD_MUTEX_DEFAULT 0
+-#define PTHREAD_MUTEX_RECURSIVE 1
+-#define PTHREAD_MUTEX_ERRORCHECK 2
+-
+-#define PTHREAD_MUTEX_STALLED 0
+-#define PTHREAD_MUTEX_ROBUST 1
+-
+-#define PTHREAD_PRIO_NONE 0
+-#define PTHREAD_PRIO_INHERIT 1
+-#define PTHREAD_PRIO_PROTECT 2
+-
+-#define PTHREAD_INHERIT_SCHED 0
+-#define PTHREAD_EXPLICIT_SCHED 1
+-
+-#define PTHREAD_SCOPE_SYSTEM 0
+-#define PTHREAD_SCOPE_PROCESS 1
+-
+-#define PTHREAD_PROCESS_PRIVATE 0
+-#define PTHREAD_PROCESS_SHARED 1
+-
+-
+-#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
+-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
+-#define PTHREAD_COND_INITIALIZER {{{0}}}
+-#define PTHREAD_ONCE_INIT 0
+-
+-
+-#define PTHREAD_CANCEL_ENABLE 0
+-#define PTHREAD_CANCEL_DISABLE 1
+-#define PTHREAD_CANCEL_MASKED 2
+-
+-#define PTHREAD_CANCEL_DEFERRED 0
+-#define PTHREAD_CANCEL_ASYNCHRONOUS 1
+-
+-#define PTHREAD_CANCELED ((void *)-1)
+-
+-
+-#define PTHREAD_BARRIER_SERIAL_THREAD (-1)
+-
+-
+-int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, 
void *(*)(void *), void *__restrict);
+-int pthread_detach(pthread_t);
+-_Noreturn void pthread_exit(void *);
+-int pthread_join(pthread_t, void **);
+-
+-pthread_t pthread_self(void);
+-
+-int pthread_equal(pthread_t, pthread_t);
+-#ifndef __cplusplus
+-#define pthread_equal(x,y) ((x)==(y))
+-#endif
+-
+-int pthread_setcancelstate(int, int *);
+-int pthread_setcanceltype(int, int *);
+-void pthread_testcancel(void);
+-int pthread_cancel(pthread_t);
+-
+-int pthread_getschedparam(pthread_t, int *__restrict, struct sched_param 
*__restrict);
+-int pthread_setschedparam(pthread_t, int, const struct sched_param *);
+-int pthread_setschedprio(pthread_t, int);
+-
+-int pthread_once(pthread_once_t *, void (*)(void));
+-
+-int pthread_mutex_init(pthread_mutex_t *__restrict, const pthread_mutexattr_t 
*__restrict);
+-int pthread_mutex_lock(pthread_mutex_t *);
+-int pthread_mutex_unlock(pthread_mutex_t *);
+-int pthread_mutex_trylock(pthread_mutex_t *);
+-int pthread_mutex_timedlock(pthread_mutex_t *__restrict, const struct 
timespec *__restrict);
+-int pthread_mutex_destroy(pthread_mutex_t *);
+-int pthread_mutex_consistent(pthread_mutex_t *);
+-
+-int pthread_mutex_getprioceiling(const pthread_mutex_t *__restrict, int 
*__restrict);
+-int pthread_mutex_setprioceiling(pthread_mutex_t *__restrict, int, int 
*__restrict);
+-
+-int pthread_cond_init(pthread_cond_t *__restrict, const pthread_condattr_t 
*__restrict);
+-int pthread_cond_destroy(pthread_cond_t *);
+-int pthread_cond_wait(pthread_cond_t *__restrict, pthread_mutex_t 
*__restrict);
+-int pthread_cond_timedwait(pthread_cond_t *__restrict, pthread_mutex_t 
*__restrict, const struct timespec *__restrict);
+-int pthread_cond_broadcast(pthread_cond_t *);
+-int pthread_cond_signal(pthread_cond_t *);
+-
+-int pthread_rwlock_init(pthread_rwlock_t *__restrict, const 
pthread_rwlockattr_t *__restrict);
+-int pthread_rwlock_destroy(pthread_rwlock_t *);
+-int pthread_rwlock_rdlock(pthread_rwlock_t *);
+-int pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+-int pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct 
timespec *__restrict);
+-int pthread_rwlock_wrlock(pthread_rwlock_t *);
+-int pthread_rwlock_trywrlock(pthread_rwlock_t *);
+-int pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct 
timespec *__restrict);
+-int pthread_rwlock_unlock(pthread_rwlock_t *);
+-
+-int pthread_spin_init(pthread_spinlock_t *, int);
+-int pthread_spin_destroy(pthread_spinlock_t *);
+-int pthread_spin_lock(pthread_spinlock_t *);
+-int pthread_spin_trylock(pthread_spinlock_t *);
+-int pthread_spin_unlock(pthread_spinlock_t *);
+-
+-int pthread_barrier_init(pthread_barrier_t *__restrict, const 
pthread_barrierattr_t *__restrict, unsigned);
+-int pthread_barrier_destroy(pthread_barrier_t *);
+-int pthread_barrier_wait(pthread_barrier_t *);
+-
+-int pthread_key_create(pthread_key_t *, void (*)(void *));
+-int pthread_key_delete(pthread_key_t);
+-void *pthread_getspecific(pthread_key_t);
+-int pthread_setspecific(pthread_key_t, const void *);
+-
+-int pthread_attr_init(pthread_attr_t *);
+-int pthread_attr_destroy(pthread_attr_t *);
+-
+-int pthread_attr_getguardsize(const pthread_attr_t *__restrict, size_t 
*__restrict);
+-int pthread_attr_setguardsize(pthread_attr_t *, size_t);
+-int pthread_attr_getstacksize(const pthread_attr_t *__restrict, size_t 
*__restrict);
+-int pthread_attr_setstacksize(pthread_attr_t *, size_t);
+-int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
+-int pthread_attr_setdetachstate(pthread_attr_t *, int);
+-int pthread_attr_getstack(const pthread_attr_t *__restrict, void 
**__restrict, size_t *__restrict);
+-int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
+-int pthread_attr_getscope(const pthread_attr_t *__restrict, int *__restrict);
+-int pthread_attr_setscope(pthread_attr_t *, int);
+-int pthread_attr_getschedpolicy(const pthread_attr_t *__restrict, int 
*__restrict);
+-int pthread_attr_setschedpolicy(pthread_attr_t *, int);
+-int pthread_attr_getschedparam(const pthread_attr_t *__restrict, struct 
sched_param *__restrict);
+-int pthread_attr_setschedparam(pthread_attr_t *__restrict, const struct 
sched_param *__restrict);
+-int pthread_attr_getinheritsched(const pthread_attr_t *__restrict, int 
*__restrict);
+-int pthread_attr_setinheritsched(pthread_attr_t *, int);
+-
+-int pthread_mutexattr_destroy(pthread_mutexattr_t *);
+-int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict, 
int *__restrict);
+-int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict, int 
*__restrict);
+-int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict, int 
*__restrict);
+-int pthread_mutexattr_getrobust(const pthread_mutexattr_t *__restrict, int 
*__restrict);
+-int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict, int 
*__restrict);
+-int pthread_mutexattr_init(pthread_mutexattr_t *);
+-int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int);
+-int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
+-int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
+-int pthread_mutexattr_setrobust(pthread_mutexattr_t *, int);
+-int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+-
+-int pthread_condattr_init(pthread_condattr_t *);
+-int pthread_condattr_destroy(pthread_condattr_t *);
+-int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+-int pthread_condattr_setpshared(pthread_condattr_t *, int);
+-int pthread_condattr_getclock(const pthread_condattr_t *__restrict, clockid_t 
*__restrict);
+-int pthread_condattr_getpshared(const pthread_condattr_t *__restrict, int 
*__restrict);
+-
+-int pthread_rwlockattr_init(pthread_rwlockattr_t *);
+-int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+-int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+-int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *__restrict, int 
*__restrict);
+-
+-int pthread_barrierattr_destroy(pthread_barrierattr_t *);
+-int pthread_barrierattr_getpshared(const pthread_barrierattr_t *__restrict, 
int *__restrict);
+-int pthread_barrierattr_init(pthread_barrierattr_t *);
+-int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
+-
+-int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
+-
+-int pthread_getconcurrency(void);
+-int pthread_setconcurrency(int);
+-
+-int pthread_getcpuclockid(pthread_t, clockid_t *);
+-
+-struct __ptcb {
+-      void (*__f)(void *);
+-      void *__x;
+-      struct __ptcb *__next;
+-};
+-
+-void _pthread_cleanup_push(struct __ptcb *, void (*)(void *), void *);
+-void _pthread_cleanup_pop(struct __ptcb *, int);
+-
+-#define pthread_cleanup_push(f, x) do { struct __ptcb __cb; 
_pthread_cleanup_push(&__cb, f, x);
+-#define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
+-
+-#ifdef _GNU_SOURCE
+-struct cpu_set_t;
+-int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *);
+-int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *);
+-int pthread_getattr_np(pthread_t, pthread_attr_t *);
+-int pthread_setname_np(pthread_t, const char *);
+-int pthread_getattr_default_np(pthread_attr_t *);
+-int pthread_setattr_default_np(const pthread_attr_t *);
+-int pthread_tryjoin_np(pthread_t, void **);
+-int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
+-#endif
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-#endif
+diff --git a/include/signal.h b/include/signal.h
+index 2c8b3d5..fd2f350 100644
+--- a/include/signal.h
++++ b/include/signal.h
+@@ -46,7 +46,7 @@ typedef struct sigaltstack stack_t;
+ #endif
+ 
+ #include <bits/signal.h>
+-
++#include <pthread.h>
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+  || defined(_BSD_SOURCE)
+-- 
+2.11.0
+
-- 
2.11.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel