#include <sys/time.h>
#include <pthread.h>
+#include <stdio.h>
#include <string.h>
#ifdef HAVE_ERRNO_H
#include <config.h>
+#ifdef HAVE_MONOTONIC_CLOCK
/* Whether we have a "monotonic" clock; i.e. a clock not affected by
* changes in system time.
* This is initialized once in check_monotonic_clock below.
* https://bugs.freedesktop.org/show_bug.cgi?id=18121
*/
static dbus_bool_t have_monotonic_clock = 0;
+#endif
-typedef struct {
+struct DBusRMutex {
pthread_mutex_t lock; /**< the lock */
-} DBusMutexPThread;
+};
-typedef struct {
+struct DBusCMutex {
+ pthread_mutex_t lock; /**< the lock */
+};
+
+struct DBusCondVar {
pthread_cond_t cond; /**< the condition */
-} DBusCondVarPThread;
+};
#define DBUS_MUTEX(m) ((DBusMutex*) m)
#define DBUS_MUTEX_PTHREAD(m) ((DBusMutexPThread*) m)
#define PTHREAD_CHECK(func_name, result_or_call) do { \
int tmp = (result_or_call); \
if (tmp != 0) { \
- _dbus_warn_check_failed ("pthread function %s failed with %d %s in %s\n", \
+ _dbus_warn_check_failed ("pthread function %s failed with %d %s in %s", \
func_name, tmp, strerror(tmp), _DBUS_FUNCTION_NAME); \
} \
} while (0)
#endif /* !DBUS_DISABLE_ASSERT */
-static DBusMutex *
-_dbus_pthread_cmutex_new (void)
+DBusCMutex *
+_dbus_platform_cmutex_new (void)
{
- DBusMutexPThread *pmutex;
+ DBusCMutex *pmutex;
int result;
- pmutex = dbus_new (DBusMutexPThread, 1);
+ pmutex = dbus_new (DBusCMutex, 1);
if (pmutex == NULL)
return NULL;
PTHREAD_CHECK ("pthread_mutex_init", result);
}
- return DBUS_MUTEX (pmutex);
+ return pmutex;
}
-static DBusMutex *
-_dbus_pthread_rmutex_new (void)
+DBusRMutex *
+_dbus_platform_rmutex_new (void)
{
- DBusMutexPThread *pmutex;
+ DBusRMutex *pmutex;
pthread_mutexattr_t mutexattr;
int result;
- pmutex = dbus_new (DBusMutexPThread, 1);
+ pmutex = dbus_new (DBusRMutex, 1);
if (pmutex == NULL)
return NULL;
PTHREAD_CHECK ("pthread_mutex_init", result);
}
- return DBUS_MUTEX (pmutex);
+ return pmutex;
}
-static void
-_dbus_pthread_mutex_free (DBusMutex *mutex)
+void
+_dbus_platform_cmutex_free (DBusCMutex *mutex)
{
- DBusMutexPThread *pmutex = DBUS_MUTEX_PTHREAD (mutex);
+ PTHREAD_CHECK ("pthread_mutex_destroy", pthread_mutex_destroy (&mutex->lock));
+ dbus_free (mutex);
+}
- PTHREAD_CHECK ("pthread_mutex_destroy", pthread_mutex_destroy (&pmutex->lock));
- dbus_free (pmutex);
+void
+_dbus_platform_rmutex_free (DBusRMutex *mutex)
+{
+ PTHREAD_CHECK ("pthread_mutex_destroy", pthread_mutex_destroy (&mutex->lock));
+ dbus_free (mutex);
}
-static dbus_bool_t
-_dbus_pthread_mutex_lock (DBusMutex *mutex)
+void
+_dbus_platform_cmutex_lock (DBusCMutex *mutex)
{
- DBusMutexPThread *pmutex = DBUS_MUTEX_PTHREAD (mutex);
+ PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&mutex->lock));
+}
- PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&pmutex->lock));
- return TRUE;
+void
+_dbus_platform_rmutex_lock (DBusRMutex *mutex)
+{
+ PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&mutex->lock));
}
-static dbus_bool_t
-_dbus_pthread_mutex_unlock (DBusMutex *mutex)
+void
+_dbus_platform_cmutex_unlock (DBusCMutex *mutex)
{
- DBusMutexPThread *pmutex = DBUS_MUTEX_PTHREAD (mutex);
+ PTHREAD_CHECK ("pthread_mutex_unlock", pthread_mutex_unlock (&mutex->lock));
+}
- PTHREAD_CHECK ("pthread_mutex_unlock", pthread_mutex_unlock (&pmutex->lock));
- return TRUE;
+void
+_dbus_platform_rmutex_unlock (DBusRMutex *mutex)
+{
+ PTHREAD_CHECK ("pthread_mutex_unlock", pthread_mutex_unlock (&mutex->lock));
}
-static DBusCondVar *
-_dbus_pthread_condvar_new (void)
+DBusCondVar *
+_dbus_platform_condvar_new (void)
{
- DBusCondVarPThread *pcond;
+ DBusCondVar *pcond;
pthread_condattr_t attr;
int result;
- pcond = dbus_new (DBusCondVarPThread, 1);
+ pcond = dbus_new (DBusCondVar, 1);
if (pcond == NULL)
return NULL;
PTHREAD_CHECK ("pthread_cond_init", result);
}
- return DBUS_COND_VAR (pcond);
+ return pcond;
}
-static void
-_dbus_pthread_condvar_free (DBusCondVar *cond)
-{
- DBusCondVarPThread *pcond = DBUS_COND_VAR_PTHREAD (cond);
-
- PTHREAD_CHECK ("pthread_cond_destroy", pthread_cond_destroy (&pcond->cond));
-
- dbus_free (pcond);
+void
+_dbus_platform_condvar_free (DBusCondVar *cond)
+{
+ PTHREAD_CHECK ("pthread_cond_destroy", pthread_cond_destroy (&cond->cond));
+ dbus_free (cond);
}
-static void
-_dbus_pthread_condvar_wait (DBusCondVar *cond,
- DBusMutex *mutex)
+void
+_dbus_platform_condvar_wait (DBusCondVar *cond,
+ DBusCMutex *mutex)
{
- DBusMutexPThread *pmutex = DBUS_MUTEX_PTHREAD (mutex);
- DBusCondVarPThread *pcond = DBUS_COND_VAR_PTHREAD (cond);
-
- PTHREAD_CHECK ("pthread_cond_wait", pthread_cond_wait (&pcond->cond, &pmutex->lock));
+ PTHREAD_CHECK ("pthread_cond_wait", pthread_cond_wait (&cond->cond, &mutex->lock));
}
-static dbus_bool_t
-_dbus_pthread_condvar_wait_timeout (DBusCondVar *cond,
- DBusMutex *mutex,
- int timeout_milliseconds)
+dbus_bool_t
+_dbus_platform_condvar_wait_timeout (DBusCondVar *cond,
+ DBusCMutex *mutex,
+ int timeout_milliseconds)
{
- DBusMutexPThread *pmutex = DBUS_MUTEX_PTHREAD (mutex);
- DBusCondVarPThread *pcond = DBUS_COND_VAR_PTHREAD (cond);
struct timeval time_now;
struct timespec end_time;
int result;
end_time.tv_nsec -= 1000*1000*1000;
}
- result = pthread_cond_timedwait (&pcond->cond, &pmutex->lock, &end_time);
+ result = pthread_cond_timedwait (&cond->cond, &mutex->lock, &end_time);
if (result != ETIMEDOUT)
{
return result != ETIMEDOUT;
}
-static void
-_dbus_pthread_condvar_wake_one (DBusCondVar *cond)
+void
+_dbus_platform_condvar_wake_one (DBusCondVar *cond)
{
- DBusCondVarPThread *pcond = DBUS_COND_VAR_PTHREAD (cond);
-
- PTHREAD_CHECK ("pthread_cond_signal", pthread_cond_signal (&pcond->cond));
+ PTHREAD_CHECK ("pthread_cond_signal", pthread_cond_signal (&cond->cond));
}
static void
-_dbus_pthread_condvar_wake_all (DBusCondVar *cond)
-{
- DBusCondVarPThread *pcond = DBUS_COND_VAR_PTHREAD (cond);
-
- PTHREAD_CHECK ("pthread_cond_broadcast", pthread_cond_broadcast (&pcond->cond));
-}
-
-static const DBusThreadFunctions pthread_functions =
-{
- DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK |
- DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK |
- DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK |
- DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK |
- DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK |
- DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK |
- DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK |
- DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK |
- DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
- DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
- DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
- DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK |
- DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK|
- DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK,
- _dbus_pthread_cmutex_new,
- _dbus_pthread_mutex_free,
- _dbus_pthread_mutex_lock,
- _dbus_pthread_mutex_unlock,
- _dbus_pthread_condvar_new,
- _dbus_pthread_condvar_free,
- _dbus_pthread_condvar_wait,
- _dbus_pthread_condvar_wait_timeout,
- _dbus_pthread_condvar_wake_one,
- _dbus_pthread_condvar_wake_all,
- _dbus_pthread_rmutex_new,
- _dbus_pthread_mutex_free,
- (void (*) (DBusMutex *)) _dbus_pthread_mutex_lock,
- (void (*) (DBusMutex *)) _dbus_pthread_mutex_unlock
-};
-
-static void
check_monotonic_clock (void)
{
#ifdef HAVE_MONOTONIC_CLOCK
dbus_bool_t
_dbus_threads_init_platform_specific (void)
{
+ /* These have static variables, and we need to handle both the case
+ * where dbus_threads_init() has been called and when it hasn't;
+ * so initialize them before any threads are allowed to enter.
+ */
check_monotonic_clock ();
- return dbus_threads_init (&pthread_functions);
+ (void) _dbus_check_setuid ();
+
+ return TRUE;
+}
+
+static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void
+_dbus_threads_lock_platform_specific (void)
+{
+ pthread_mutex_lock (&init_mutex);
+}
+
+void
+_dbus_threads_unlock_platform_specific (void)
+{
+ pthread_mutex_unlock (&init_mutex);
+}
+
+#ifdef DBUS_ENABLE_VERBOSE_MODE
+/*
+ * If we can identify the current process and/or thread, print them to stderr followed by a colon.
+ */
+void
+_dbus_print_thread (void)
+{
+#ifdef __linux__
+ /* we know a pthread_t is numeric on Linux */
+ fprintf (stderr, "%lu: 0x%lx: ", _dbus_pid_for_log (), (unsigned long) pthread_self ());
+#else
+ /* in principle pthread_t isn't required to be printable */
+ fprintf (stderr, "%lu: ", _dbus_pid_for_log ());
+#endif
}
+#endif