5 files changed, 108 insertions, 40 deletions

diff --git a/config.mak.in b/config.mak.in
index ccb84aee8..d962dda20 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -17,7 +17,7 @@ CC=@CC@
 CCAUX=@CC@
 
 CONFDEFS?=@HAVE_MKSTEMP@ @HAVE_SSE2@ @HAVE_BSWAP32@ @HAVE_BYTESWAP_H@ @HAVE_SYS_TIME_H@ @HAVE_FSEEKO@ @HAVE_INTTYPES@ @HAVE_MKSTEMP64@ \
-@HAVE_FILE64@ @HAVE_PREAD_PWRITE@
+@HAVE_FILE64@ @HAVE_PREAD_PWRITE@ @RECURSIVE_MUTEXATTR@
 
 ACCFLAGS?=@GCFLAGS@
 
diff --git a/configure.ac b/configure.ac
index 44b725256..5da03cab1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,25 +460,36 @@ AC_SUBST(HAVE_PREAD_PWRITE)
 SYNC="nosync"
 PTHREAD_LIBS=""
 
-# if you haven't got pread/pwrite, we can't use multithreading
-if test "x$HAVE_PREAD_PWRITE" != "x"; then
+AC_ARG_ENABLE([threading], AC_HELP_STRING([--disable-threading],
+    [disable support for multithreaded rendering]))
 
-  case `uname` in
-    MINGW*)
-      AC_MSG_WARN([disabling support for pthreads......])
-    ;;
-    *)
-      AC_CHECK_LIB(pthread, pthread_create, [
-        SYNC=posync;
-        PTHREAD_LIBS="-lpthread"
-      ])
-    ;;
-  esac
 
+# if you haven't got pread/pwrite, we can't use multithreading
+if test "x$HAVE_PREAD_PWRITE" != "x"; then
+  if test "$enable_fontconfig" != "no"; then
+    case `uname` in
+      MINGW*)
+        AC_MSG_WARN([disabling support for pthreads......])
+      ;;
+      *)
+        AC_CHECK_LIB(pthread, pthread_create, [
+          SYNC=posync;
+          PTHREAD_LIBS="-lpthread"
+        ])
+        AC_TRY_COMPILE([#include <pthread.h>],
+             [static int k = PTHREAD_MUTEX_RECURSIVE;],
+             [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE"],
+             [AC_TRY_COMPILE([#include <pthread.h>],
+                [static int k = PTHREAD_MUTEX_RECURSIVE_NP;],
+                [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE_NP"])])
+      ;;
+    esac
+  fi
 fi
 
 AC_SUBST(SYNC)
 AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(RECURSIVE_MUTEXATTR)
 
 AC_PATH_X
 
diff --git a/gs/Makefile.in b/gs/Makefile.in
index c13462266..68f3dc598 100644
--- a/gs/Makefile.in
+++ b/gs/Makefile.in
@@ -142,7 +142,7 @@ GENOPT=
 # -DHAVE_SSE2
 #       use sse2 intrinsics
 
-CAPOPT= @HAVE_MKSTEMP@ @HAVE_FILE64@ @HAVE_FSEEKO@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@ @HAVE_LIBIDN@ @HAVE_SETLOCALE@ @HAVE_SSE2@ @HAVE_DBUS@ @HAVE_BSWAP32@ @HAVE_BYTESWAP_H@ @HAVE_STRERROR@ @HAVE_PREAD_PWRITE@
+CAPOPT= @HAVE_MKSTEMP@ @HAVE_FILE64@ @HAVE_FSEEKO@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@ @HAVE_LIBIDN@ @HAVE_SETLOCALE@ @HAVE_SSE2@ @HAVE_DBUS@ @HAVE_BSWAP32@ @HAVE_BYTESWAP_H@ @HAVE_STRERROR@ @HAVE_PREAD_PWRITE@ @RECURSIVE_MUTEXATTR@
 
 # Define the name of the executable file.
 
diff --git a/gs/base/gp_psync.c b/gs/base/gp_psync.c
index 60f697763..6ddf26653 100644
--- a/gs/base/gp_psync.c
+++ b/gs/base/gp_psync.c
@@ -128,13 +128,20 @@ gp_semaphore_signal(gp_semaphore * sema)
 /* Monitor supports enter/leave semantics */
 
 /*
- * We need PTHREAD_MUTEX_RECURSIVE behavior, but this isn't totally portable
- * so we implement it in a more portable fashion, keeping track of the
- * owner thread using 'pthread_self()'
+ * We need PTHREAD_MUTEX_RECURSIVE behavior, but this isn't
+ * supported on all pthread platforms, so if it's available
+ * we'll use it, otherwise we'll emulate it.
+ * GS_RECURSIVE_MUTEXATTR is set by the configure script
+ * on Unix-like machines to the attribute setting for
+ * PTHREAD_MUTEX_RECURSIVE - on linux this is usually
+ * PTHREAD_MUTEX_RECURSIVE_NP
  */
 typedef struct gp_pthread_recursive_s {
     pthread_mutex_t mutex;      /* actual mutex */
+#ifndef GS_RECURSIVE_MUTEXATTR
     pthread_t   self_id;        /* owner */
+    int lcount;
+#endif
 } gp_pthread_recursive_t;
 
 uint
@@ -148,12 +155,32 @@ gp_monitor_open(gp_monitor * mona)
 {
     pthread_mutex_t *mon;
     int scode;
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_t *attrp = NULL;
 
     if (!mona)
         return -1;              /* monitors are not movable */
-    mon = &((gp_pthread_recursive_t *)mona)->mutex;
+
+
+#ifdef GS_RECURSIVE_MUTEXATTR
+    attrp = &attr;
+    scode = pthread_mutexattr_init(attrp);
+    if (scode < 0) goto done;
+
+    scode = pthread_mutexattr_settype(attrp, GS_RECURSIVE_MUTEXATTR);
+    if (scode < 0) {
+        goto done;
+    }
+#else     
     ((gp_pthread_recursive_t *)mona)->self_id = 0;      /* Not valid unless mutex is locked */
-    scode = pthread_mutex_init(mon, NULL);
+    ((gp_pthread_recursive_t *)mona)->lcount = 0;
+#endif
+
+    mon = &((gp_pthread_recursive_t *)mona)->mutex;
+    scode = pthread_mutex_init(mon, attrp);
+    if (attrp)
+        (void)pthread_mutexattr_destroy(attrp);
+done:
     return SEM_ERROR_CODE(scode);
 }
 
@@ -173,29 +200,48 @@ gp_monitor_enter(gp_monitor * mona)
     pthread_mutex_t * const mon = (pthread_mutex_t *)mona;
     int scode;
 
+#ifdef GS_RECURSIVE_MUTEXATTR
+    scode = pthread_mutex_lock(mon);
+#else
     if ((scode = pthread_mutex_trylock(mon)) == 0) {
         ((gp_pthread_recursive_t *)mona)->self_id = pthread_self();
-        return SEM_ERROR_CODE(scode);
+        ((gp_pthread_recursive_t *)mona)->lcount++;
     } else {
-        if (pthread_equal(pthread_self(),((gp_pthread_recursive_t *)mona)->self_id))
-            return 0;
+        if (pthread_equal(pthread_self(),((gp_pthread_recursive_t *)mona)->self_id)) {
+            ((gp_pthread_recursive_t *)mona)->lcount++;
+            scode = 0;
+        }
         else {
             /* we were not the owner, wait */
             scode = pthread_mutex_lock(mon);
             ((gp_pthread_recursive_t *)mona)->self_id = pthread_self();
-            return SEM_ERROR_CODE(scode);
+            ((gp_pthread_recursive_t *)mona)->lcount++;
         }
     }
+#endif
+    return SEM_ERROR_CODE(scode);
 }
 
 int
 gp_monitor_leave(gp_monitor * mona)
 {
     pthread_mutex_t * const mon = (pthread_mutex_t *)mona;
-    int scode;
+    int scode = 0;
 
-    scode = pthread_mutex_unlock(mon);
-    ((gp_pthread_recursive_t *)mona)->self_id = 0;      /* Not valid unless mutex is locked */
+#ifdef GS_RECURSIVE_MUTEXATTR
+    scode = pthread_mutex_lock(mon);
+#else
+    if (pthread_equal(pthread_self(),((gp_pthread_recursive_t *)mona)->self_id)) {
+      if ((--((gp_pthread_recursive_t *)mona)->lcount) == 0) {
+          scode = pthread_mutex_unlock(mon);
+          ((gp_pthread_recursive_t *)mona)->self_id = 0;        /* Not valid unless mutex is locked */
+
+      }
+    }
+    else {
+        scode = -1 /* should be EPERM */;
+    }
+#endif
     return SEM_ERROR_CODE(scode);
 }
 
diff --git a/gs/configure.ac b/gs/configure.ac
index 5f64dd221..233129a90 100644
--- a/gs/configure.ac
+++ b/gs/configure.ac
@@ -498,26 +498,37 @@ AC_SUBST(HAVE_PREAD_PWRITE)
 
 SYNC="nosync"
 PTHREAD_LIBS=""
+RECURSIVE_MUTEXATTR=""
+
+AC_ARG_ENABLE([threading], AC_HELP_STRING([--disable-threading],
+    [disable support for multithreaded rendering]))
 
 # if you haven't got pread/pwrite, we can't use multithreading
 if test "x$HAVE_PREAD_PWRITE" != "x"; then
-
-  case `uname` in
-    MINGW*)
-      AC_MSG_WARN([disabling support for pthreads......])
-    ;;
-    *)
-      AC_CHECK_LIB(pthread, pthread_create, [
-        SYNC=posync;
-        PTHREAD_LIBS="-lpthread"
-      ])
-    ;;
-  esac
-
+  if test "$enable_fontconfig" != "no"; then
+    case `uname` in
+      MINGW*)
+        AC_MSG_WARN([disabling support for pthreads......])
+      ;;
+      *)
+        AC_CHECK_LIB(pthread, pthread_create, [
+          SYNC=posync;
+          PTHREAD_LIBS="-lpthread"
+        ])
+        AC_TRY_COMPILE([#include <pthread.h>],
+             [static int k = PTHREAD_MUTEX_RECURSIVE;],
+             [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE"],
+             [AC_TRY_COMPILE([#include <pthread.h>],
+                [static int k = PTHREAD_MUTEX_RECURSIVE_NP;],
+                [RECURSIVE_MUTEXATTR="-DGS_RECURSIVE_MUTEXATTR=PTHREAD_MUTEX_RECURSIVE_NP"])])
+      ;;
+    esac
+  fi
 fi
 
 AC_SUBST(SYNC)
 AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(RECURSIVE_MUTEXATTR)
 
 AC_MSG_CHECKING([for local trio library source])
 if test -f $srcdir/trio/trio.h; then