Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Experimental pthread compatibility library

Browse Source 
This patch adds pthread compatibility by using libmthread.

To use this with a program using pthreads, you have to replace
  #include <pthread>
with
  #define _MTHREADIFY_PTHREADS
  #include <minix/mthreads>

This also changes the initialization function to be a constructor, which
is implicitly called before the call to main. This allows for
conformance with pthreads, while not paying a high price by checking on
each mthread_* call whether the library has been initialized or not.

As mthread_init is now a constructor, it also has been set as static, and
relevent calls removed from programs using it.

Change-Id: I2aa375db557958d2bee9a70d285aabb990c88f00
This commit is contained in:
Lionel Sambuc
2014-01-14 13:48:43 +01:00
parent 29b8e5ff06
commit d3d33afe9f
21 changed files with 306 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libmthread/mutex.c
View File

@@ -56,8 +56,6 @@ mthread_mutex_t *mutex;
mthread_thread_t t;
mthread_tcb_t *tcb;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
if (mutex == NULL)
return(EINVAL);
@@ -95,8 +93,6 @@ mthread_mutexattr_t *mattr; /* Mutex attribute */
struct __mthread_mutex *m;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
if (mutex == NULL)
return(EAGAIN);
else if (mattr != NULL)
@@ -127,8 +123,6 @@ mthread_mutex_t *mutex; /* Mutex that is to be locked */
struct __mthread_mutex *m;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
if (mutex == NULL)
return(EINVAL);
@@ -180,8 +174,6 @@ mthread_mutex_t *mutex; /* Mutex that is to be locked */
struct __mthread_mutex *m;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
if (mutex == NULL)
return(EINVAL);
@@ -210,8 +202,6 @@ mthread_mutex_t *mutex; /* Mutex that is to be unlocked */
struct __mthread_mutex *m;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
if (mutex == NULL)
return(EINVAL);
@@ -237,8 +227,6 @@ mthread_mutex_t *m;
/* Check to see if mutex is on the list of valid mutexes */
struct __mthread_mutex *loopitem;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
loopitem = vm_front;
while (loopitem != NULL) {
@@ -262,8 +250,6 @@ int mthread_mutex_verify(void)
int r = 1;
struct __mthread_mutex *loopitem;
MTHREAD_CHECK_INIT(); /* Make sure mthreads is initialized */
#ifdef MTHREAD_STRICT
loopitem = vm_front;
@@ -277,5 +263,3 @@ int mthread_mutex_verify(void)
return(r);
}
#endif