Small changes and bugfixes in signal handling, mutexes and condition variables.

[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 b940b988a11f5386d8af3ad36198d028b4441614..397b18c3a45b68c8eef659ad793822162b856de1 100644 (file)
--- a/src_aquosa/fosa_mutexes_and_condvars.c
+++ b/src_aquosa/fosa_mutexes_and_condvars.c
@@ -59,8 +59,13 @@
 //================================================
 
 #include "fosa_time.h"
+#include "fosa_configuration_parameters.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
  ******************************************************/
@@ -82,14 +87,19 @@
  **/
 int fosa_mutex_init(fosa_mutex_t *mutex, int prioceiling)
 {
-       int error;
+       int ret;
        pthread_mutexattr_t attr;
 
-       if ((error = pthread_mutexattr_init(&attr)) != 0)
-               return error;
+       ret = pthread_mutexattr_init(&attr);
+       if (ret) return errno;
+
+#ifndef CONFIG_NO_PRIO_INHERIT /* Valgrind doesn't support this attribute */
+       ret = pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
+       if (ret) return errno;
+#endif
 
-       if ((error = pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) != 0)
-               return error;
+       ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+       if (ret) return errno;
 
        return pthread_mutex_init(mutex, &attr);
 }
@@ -123,7 +133,7 @@ int fosa_mutex_set_prioceiling(fosa_mutex_t *mutex,
                               int new_ceiling,
                               int *old_ceiling)
 {
-       return -EINVAL;
+       return FOSA_EINVAL;
 }
 
 /**
@@ -137,7 +147,7 @@ int fosa_mutex_set_prioceiling(fosa_mutex_t *mutex,
  **/
 int fosa_mutex_get_prioceiling(const fosa_mutex_t *mutex, int *ceiling)
 {
-       return -EINVAL;
+       return FOSA_EINVAL;
 }
 
 /**
@@ -219,7 +229,16 @@ int fosa_mutex_unlock(fosa_mutex_t *mutex)
  **/
 int fosa_cond_init(fosa_cond_t *cond)
 {
-       return pthread_cond_init(cond, NULL);
+       int ret;
+       pthread_condattr_t attr;
+
+       ret = pthread_condattr_init(&attr);
+       if (ret) return errno;
+
+       ret = pthread_condattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+       if (ret) return errno;
+
+       return pthread_cond_init(cond, &attr);
 }
 
 /**
@@ -316,6 +335,6 @@ int fosa_cond_timedwait(fosa_cond_t *cond,
        struct timespec abstime_tspec;
 
        abstime_tspec = fosa_abs_time_to_timespec(*abstime);
-
        return pthread_cond_timedwait(cond, mutex, &abstime_tspec);
 }
+