Changeset 1109Tweet

Timestamp:

Dec 10, 2011, 4:53:21 PM (11 years ago)

Author:

sam

Message:

build: for now, assume anything with <pthread.h> uses the pthread API.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/thread/threadbase.h (modified) (16 diffs)

trunk/configure.ac

@@ -55 +55 @@
   [  --enable-experimental   experimental build (default no)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h fastmath.h)
+AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h fastmath.h pthread.h)
 
 if test "${enable_debug}" = "yes"; then

trunk/src/thread/threadbase.h

@@ -17 +17 @@
 #define __LOL_THREADBASE_H__
 
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
 #   include <pthread.h>
 #elif defined _WIN32
@@ -33 +33 @@
     MutexBase()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_init(&m_mutex, NULL);
 #elif defined _WIN32
@@ -42 +42 @@
     ~MutexBase()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_destroy(&m_mutex);
 #elif defined _WIN32
@@ -51 +51 @@
     void Lock()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_lock(&m_mutex);
 #elif defined _WIN32
@@ -60 +60 @@
     void Unlock()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_unlock(&m_mutex);
 #elif defined _WIN32
@@ -68 +68 @@
 
 private:
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
     pthread_mutex_t m_mutex;
 #elif defined _WIN32
@@ -81 +81 @@
     {
         m_start = m_count = 0;
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         m_poppers = m_pushers = 0;
         pthread_mutex_init(&m_mutex, NULL);
@@ -95 +95 @@
     ~QueueBase()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_cond_destroy(&m_empty_cond);
         pthread_cond_destroy(&m_full_cond);
@@ -108 +108 @@
     void Push(int value)
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_lock(&m_mutex);
         /* If queue is full, wait on the "full" cond var. */
@@ -124 +124 @@
         m_count++;
 
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         /* If there were poppers waiting, signal the "empty" cond var. */
         if (m_poppers)
@@ -137 +137 @@
     int Pop()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_mutex_lock(&m_mutex);
         /* Wait until there is something in the queue. Be careful, we
@@ -156 +156 @@
         m_count--;
 
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         /* If there were pushers waiting, signal the "full" cond var. */
         if (m_pushers)
@@ -173 +173 @@
     int m_values[CAPACITY];
     size_t m_start, m_count;
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
     size_t m_poppers, m_pushers;
     pthread_mutex_t m_mutex;
@@ -188 +188 @@
     ThreadBase(void *(*fn)(void *), void *data)
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         /* Set the joinable attribute for systems who don't play nice */
         pthread_attr_t attr;
@@ -202 +202 @@
     virtual ~ThreadBase()
     {
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
         pthread_join(m_thread, NULL);
 #elif defined _WIN32
@@ -210 +210 @@
 
 private:
-#if defined __linux__ || defined __native_client__
+#if defined HAVE_PTHREAD_H
     pthread_t m_thread;
 #elif defined _WIN32