Aquosa: priority inheritance can be disabled

[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 c40e85633f3218728d10677b223c99b203b68311..8b03c8d488cf8b41f1dd3a08fb7e266d43aa587e 100644 (file)
--- a/src_aquosa/fosa_mutexes_and_condvars.c
+++ b/src_aquosa/fosa_mutexes_and_condvars.c
@@ -58,8 +58,13 @@
 // FOSA(Frescor Operating System Adaptation layer)
 //================================================
 
+#include "fosa_time.h"
 #include "fosa_mutexes_and_condvars.h"
 
+#ifdef OMK_FOR_USER            /* If compiled by OMK, use the config */
+#include "fosa_config.h"
+#endif
+
 /*******************************************************
  * Mutexes with priority/bandwidth inheritance
  ******************************************************/
@@ -87,9 +92,10 @@ int fosa_mutex_init(fosa_mutex_t *mutex, int prioceiling)
        if ((error = pthread_mutexattr_init(&attr)) != 0)
                return error;
 
+#ifndef CONFIG_NO_PRIO_INHERIT /* Valgrind doesn't support this attribute */
        if ((error = pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) != 0)
                return error;
-
+#endif
        return pthread_mutex_init(mutex, &attr);
 }
 
@@ -310,7 +316,11 @@ int fosa_cond_wait(fosa_cond_t *cond, fosa_mutex_t *mutex)
  **/
 int fosa_cond_timedwait(fosa_cond_t *cond,
        fosa_mutex_t *mutex,
-       const struct timespec *abstime)
+       const fosa_abs_time_t *abstime)
 {
-       return pthread_cond_timedwait(cond, mutex, abstime);
+       struct timespec abstime_tspec;
+
+       abstime_tspec = fosa_abs_time_to_timespec(*abstime);
+
+       return pthread_cond_timedwait(cond, mutex, &abstime_tspec);
 }