Mercurial > hg > xmms-sid
changeset 534:6817f2a03b21
Removed some crud.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 21 Feb 2007 00:01:05 +0000 |
| parents | 9ca430524698 |
| children | d609d0ece252 |
| files | src/xmms-sid.h |
| diffstat | 1 files changed, 13 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.h Tue Feb 20 23:38:03 2007 +0000 +++ b/src/xmms-sid.h Wed Feb 21 00:01:05 2007 +0000 @@ -117,31 +117,20 @@ /* Macros for mutexes and threads. These exist to be able to * easily change from pthreads to glib threads, etc, if necessary. */ -#ifdef AUDACIOUS_PLUGIN -# define XS_THREAD_T GThread * -# define XS_THREAD_EXIT(M) g_thread_exit(M) -# define XS_THREAD_JOIN(M) g_thread_join(M) -# define XS_MPP(M) M ## _mutex -# define XS_MUTEX(M) GStaticMutex XS_MPP(M) = G_STATIC_MUTEX_INIT -# define XS_MUTEX_H(M) extern GstaticMutex XS_MPP(M) -# define XS_MUTEX_LOCK(M) g_static_mutex_lock(&XS_MPP(M)) -# define XS_MUTEX_UNLOCK(M) g_static_mutex_unlock(&XS_MPP(M)) +#define XS_THREAD_T pthread_t +#define XS_THREAD_EXIT(M) pthread_exit(M) +#define XS_THREAD_JOIN(M) pthread_join(M, NULL) +#define XS_MPP(M) M ## _mutex +#if XS_MUTEX_DEBUG +# define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; int M ## _qq; +# define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M); extern int M ## _qq +# define XS_MUTEX_LOCK(M) { M ## _qq = pthread_mutex_lock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_LOCK(" #M ") == %i\n", M ## _qq); } +# define XS_MUTEX_UNLOCK(M) { M ## _qq = pthread_mutex_unlock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_UNLOCK(" #M ") == %i\n", M ## _qq); } #else -# define XS_THREAD_T pthread_t -# define XS_THREAD_EXIT(M) pthread_exit(M) -# define XS_THREAD_JOIN(M) pthread_join(M, NULL) -# define XS_MPP(M) M ## _mutex -# if XS_MUTEX_DEBUG -# define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; int M ## _qq; -# define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M); extern int M ## _qq -# define XS_MUTEX_LOCK(M) { M ## _qq = pthread_mutex_lock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_LOCK(" #M ") == %i\n", M ## _qq); } -# define XS_MUTEX_UNLOCK(M) { M ## _qq = pthread_mutex_unlock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_UNLOCK(" #M ") == %i\n", M ## _qq); } -# else -# define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_MUTEX_INITIALIZER -# define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M) -# define XS_MUTEX_LOCK(M) pthread_mutex_lock(&XS_MPP(M)) -# define XS_MUTEX_UNLOCK(M) pthread_mutex_unlock(&XS_MPP(M)) -# endif +# define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_MUTEX_INITIALIZER +# define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M) +# define XS_MUTEX_LOCK(M) pthread_mutex_lock(&XS_MPP(M)) +# define XS_MUTEX_UNLOCK(M) pthread_mutex_unlock(&XS_MPP(M)) #endif /* Shorthands for linked lists