First fixes in order to comply with the Phase-2 API

[frescor/fosa.git] / src_aquosa / fosa_mutexes_and_condvars.c

diff --git a/src_aquosa/fosa_mutexes_and_condvars.c b/src_aquosa/fosa_mutexes_and_condvars.c
index efe1701ea87fbaa150fdf0d8655dd0a5cf83d18a..05ac5e64b7f1ca97cd36b3c74a6c67591b6f7871 100644 (file)
--- a/src_aquosa/fosa_mutexes_and_condvars.c
+++ b/src_aquosa/fosa_mutexes_and_condvars.c
@@ -66,49 +66,48 @@
  ******************************************************/
 
 
-int fosa_mutex_init(frsh_mutex_t *mutex, int prioceiling)
+int fosa_mutex_init(fosa_mutex_t *mutex, int prioceiling)
 {
-       pthread_mutexattr_t mutex_attr;
+       //pthread_mutexattr_t mutex_attr;
 
        /* prioceiling serves as a flag */
-       if (prioceiling) {
-               /* We use priority inheritance as the default protocol */
-               pthread_mutexattr_init(&mutex_attr);
+       /* if (prioceiling) {
+                       pthread_mutexattr_init(&mutex_attr);
                pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT);
                
                return pthread_mutex_init(mutex, &mutex_attr);
-       } else
+       } else */
                return pthread_mutex_init(mutex, NULL);
 }
 
-int fosa_mutex_destroy(frsh_mutex_t *mutex)
+int fosa_mutex_destroy(fosa_mutex_t *mutex)
 {
        return pthread_mutex_destroy(mutex);
 }
 
-int fosa_mutex_set_prioceiling(frsh_mutex_t *mutex,
+int fosa_mutex_set_prioceiling(fosa_mutex_t *mutex,
        int new_ceiling,
        int *old_ceiling)
 {
        return -1;
 }
 
-int fosa_mutex_get_prioceiling(const frsh_mutex_t *mutex, int *ceiling)
+int fosa_mutex_get_prioceiling(const fosa_mutex_t *mutex, int *ceiling)
 {
        return -1;
 }
 
-int fosa_mutex_lock(frsh_mutex_t *mutex)
+int fosa_mutex_lock(fosa_mutex_t *mutex)
 {
        return pthread_mutex_lock(mutex);
 }
 
-int fosa_mutex_trylock(frsh_mutex_t *mutex)
+int fosa_mutex_trylock(fosa_mutex_t *mutex)
 {
        return pthread_mutex_trylock(mutex);
 }
 
-int fosa_mutex_unlock(frsh_mutex_t *mutex)
+int fosa_mutex_unlock(fosa_mutex_t *mutex)
 {
        return pthread_mutex_unlock(mutex);
 }
@@ -137,13 +136,13 @@ int fosa_cond_broadcast(fosa_cond_t *cond)
        return pthread_cond_broadcast(cond);
 }
 
-int fosa_cond_wait(fosa_cond_t *cond, frsh_mutex_t *mutex)
+int fosa_cond_wait(fosa_cond_t *cond, fosa_mutex_t *mutex)
 {
        return pthread_cond_wait(cond, mutex);
 }
 
 int fosa_cond_timedwait(fosa_cond_t *cond,
-       frsh_mutex_t *mutex,
+       fosa_mutex_t *mutex,
        const struct timespec *abstime)
 {
        return pthread_cond_timedwait(cond, mutex, abstime);