Mercurial > hg > xmms-sid
comparison src/xmms-sid.h @ 534:6817f2a03b21
Removed some crud.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 21 Feb 2007 00:01:05 +0000 |
parents | 9ca430524698 |
children | 70fe31fe2bf5 |
comparison
equal
deleted
inserted
replaced
533:9ca430524698 | 534:6817f2a03b21 |
---|---|
115 | 115 |
116 | 116 |
117 /* Macros for mutexes and threads. These exist to be able to | 117 /* Macros for mutexes and threads. These exist to be able to |
118 * easily change from pthreads to glib threads, etc, if necessary. | 118 * easily change from pthreads to glib threads, etc, if necessary. |
119 */ | 119 */ |
120 #ifdef AUDACIOUS_PLUGIN | 120 #define XS_THREAD_T pthread_t |
121 # define XS_THREAD_T GThread * | 121 #define XS_THREAD_EXIT(M) pthread_exit(M) |
122 # define XS_THREAD_EXIT(M) g_thread_exit(M) | 122 #define XS_THREAD_JOIN(M) pthread_join(M, NULL) |
123 # define XS_THREAD_JOIN(M) g_thread_join(M) | 123 #define XS_MPP(M) M ## _mutex |
124 # define XS_MPP(M) M ## _mutex | 124 #if XS_MUTEX_DEBUG |
125 # define XS_MUTEX(M) GStaticMutex XS_MPP(M) = G_STATIC_MUTEX_INIT | 125 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; int M ## _qq; |
126 # define XS_MUTEX_H(M) extern GstaticMutex XS_MPP(M) | 126 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M); extern int M ## _qq |
127 # define XS_MUTEX_LOCK(M) g_static_mutex_lock(&XS_MPP(M)) | 127 # 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); } |
128 # define XS_MUTEX_UNLOCK(M) g_static_mutex_unlock(&XS_MPP(M)) | 128 # 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); } |
129 #else | 129 #else |
130 # define XS_THREAD_T pthread_t | 130 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_MUTEX_INITIALIZER |
131 # define XS_THREAD_EXIT(M) pthread_exit(M) | 131 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M) |
132 # define XS_THREAD_JOIN(M) pthread_join(M, NULL) | 132 # define XS_MUTEX_LOCK(M) pthread_mutex_lock(&XS_MPP(M)) |
133 # define XS_MPP(M) M ## _mutex | 133 # define XS_MUTEX_UNLOCK(M) pthread_mutex_unlock(&XS_MPP(M)) |
134 # if XS_MUTEX_DEBUG | |
135 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; int M ## _qq; | |
136 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M); extern int M ## _qq | |
137 # 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); } | |
138 # 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); } | |
139 # else | |
140 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_MUTEX_INITIALIZER | |
141 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M) | |
142 # define XS_MUTEX_LOCK(M) pthread_mutex_lock(&XS_MPP(M)) | |
143 # define XS_MUTEX_UNLOCK(M) pthread_mutex_unlock(&XS_MPP(M)) | |
144 # endif | |
145 #endif | 134 #endif |
146 | 135 |
147 /* Shorthands for linked lists | 136 /* Shorthands for linked lists |
148 */ | 137 */ |
149 #define LPREV (pNode->pPrev) | 138 #define LPREV (pNode->pPrev) |