Use os_unfair_lock instead of (deprecated) OSSpinLock on mac os

git-svn-id: svn+ssh://svn.gecode.org/srv/gecode/svn/gecode/trunk@16767 64335634-5103-0410-b293-fc3d331e086d

Author: guidotack

changelog.in

@@ -81,6 +81,14 @@ by an array of variables), a new much faster implementation of
 extensional constraints using tuple sets, and support for tracing
 search engines.
 
+[ENTRY]
+Module: support
+What:   change
+Rank:   minor
+[DESCRIPTION]
+Replace deprecated OSSpinLock with os_unfair_lock on newer versions
+of macOS.
+
 [ENTRY]
 Module: search
 What:   bug

configure

@@ -6487,15 +6487,21 @@ $as_echo "#define GECODE_THREADS_PTHREADS 1" >>confdefs.h
      CFLAGS="-pthread${CFLAGS:+ }${CFLAGS}"
     CXXFLAGS="-pthread${CXXFLAGS:+ }${CXXFLAGS}"
      DLLFLAGS="-pthread${DLLFLAGS:+ }${DLLFLAGS}"
-     ac_fn_cxx_check_header_mongrel "$LINENO" "libkern/OSAtomic.h" "ac_cv_header_libkern_OSAtomic_h" "$ac_includes_default"
+     ac_fn_cxx_check_header_mongrel "$LINENO" "os/lock.h" "ac_cv_header_os_lock_h" "$ac_includes_default"
+if test "x$ac_cv_header_os_lock_h" = xyes; then :
+
+$as_echo "#define GECODE_THREADS_OSX_UNFAIR 1" >>confdefs.h
+
+else
+  ac_fn_cxx_check_header_mongrel "$LINENO" "libkern/OSAtomic.h" "ac_cv_header_libkern_OSAtomic_h" "$ac_includes_default"
 if test "x$ac_cv_header_libkern_OSAtomic_h" = xyes; then :
 
 $as_echo "#define GECODE_THREADS_OSX 1" >>confdefs.h
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spin locks" >&5
 $as_echo_n "checking for spin locks... " >&6; }
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -6523,6 +6529,9 @@ fi
 
 
 
+fi
+
+
 else
   ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
 if test "x$ac_cv_header_windows_h" = xyes; then :

gecode.m4

@@ -1467,17 +1467,19 @@ AC_DEFUN([AC_GECODE_THREADS],[
     [AC_DEFINE(GECODE_THREADS_PTHREADS,1,[Whether we have posix threads])
      AC_GECODE_ADD_TO_COMPILERFLAGS([-pthread])
      AC_GECODE_ADD_TO_DLLFLAGS([-pthread])
-     AC_CHECK_HEADER([libkern/OSAtomic.h],
-     [AC_DEFINE(GECODE_THREADS_OSX,1,[Whether we have Mac OS threads])],
-      AC_MSG_CHECKING([for spin locks])
-       AC_TRY_COMPILE([#include <pthread.h>],
-         [pthread_spinlock_t t;],
-         [AC_MSG_RESULT(yes)
-          AC_DEFINE(GECODE_THREADS_PTHREADS_SPINLOCK,1,Whether we have posix spinlocks)],
-  [AC_MSG_RESULT(no)]
-       )
-     )
-    ],
+     AC_CHECK_HEADER([os/lock.h],
+       [AC_DEFINE(GECODE_THREADS_OSX_UNFAIR,1,[Whether we have Mac OS threads (new version)])],
+        AC_CHECK_HEADER([libkern/OSAtomic.h],
+        [AC_DEFINE(GECODE_THREADS_OSX,1,[Whether we have Mac OS threads])],
+         AC_MSG_CHECKING([for spin locks])
+          AC_TRY_COMPILE([#include <pthread.h>],
+            [pthread_spinlock_t t;],
+            [AC_MSG_RESULT(yes)
+             AC_DEFINE(GECODE_THREADS_PTHREADS_SPINLOCK,1,Whether we have posix spinlocks)],
+            [AC_MSG_RESULT(no)]
+          )
+        )
+     )],
     [AC_CHECK_HEADER(windows.h,
       [AC_DEFINE(GECODE_THREADS_WINDOWS,1,[Whether we have windows threads])])]
     )

gecode/support/config.hpp.in

@@ -115,6 +115,9 @@
 /* Whether we have Mac OS threads */
 #undef GECODE_THREADS_OSX
 
+/* Whether we have Mac OS threads (new version) */
+#undef GECODE_THREADS_OSX_UNFAIR
+
 /* Whether we have posix threads */
 #undef GECODE_THREADS_PTHREADS
 

gecode/support/thread.hpp

@@ -68,6 +68,12 @@
 
 #endif
 
+#ifdef GECODE_THREADS_OSX_UNFAIR
+
+#include <os/lock.h>
+
+#endif
+
 #endif
 
 /**
@@ -136,7 +142,7 @@ namespace Gecode { namespace Support {
 
 #ifdef GECODE_THREADS_PTHREADS
 
-#if defined(GECODE_THREADS_OSX) || defined(GECODE_THREADS_PTHREADS_SPINLOCK)
+#if defined(GECODE_THREADS_OSX) || defined(GECODE_THREADS_OSX_UNFAIR) || defined(GECODE_THREADS_PTHREADS_SPINLOCK)
 
   /**
    * \brief A fast mutex for mutual exclausion among several threads
@@ -157,6 +163,9 @@ namespace Gecode { namespace Support {
 #ifdef GECODE_THREADS_OSX
     /// The OSX spin lock
     OSSpinLock lck;
+#elif defined(GECODE_THREADS_OSX_UNFAIR)
+    /// The OSX spin lock
+    os_unfair_lock lck;
 #else
     /// The Pthread spinlock
     pthread_spinlock_t p_s;

gecode/support/thread/pthreads.hpp

@@ -98,6 +98,30 @@ namespace Gecode { namespace Support {
 
 #endif
 
+#ifdef GECODE_THREADS_OSX_UNFAIR
+
+  /*
+   * FastMutex
+   */
+  forceinline
+  FastMutex::FastMutex(void) {}
+  forceinline void
+  FastMutex::acquire(void) {
+    os_unfair_lock_lock(&lck);
+  }
+  forceinline bool
+  FastMutex::tryacquire(void) {
+    return os_unfair_lock_trylock(&lck);
+  }
+  forceinline void
+  FastMutex::release(void) {
+    os_unfair_lock_unlock(&lck);
+  }
+  forceinline
+  FastMutex::~FastMutex(void) {}
+
+#endif
+
 #ifdef GECODE_THREADS_PTHREADS_SPINLOCK
 
   /*

gecode/support/thread/thread.hpp

@@ -75,7 +75,7 @@ namespace Gecode { namespace Support {
     Gecode::heap.rfree(p);
   }
 
-#if defined(GECODE_THREADS_OSX) || defined(GECODE_THREADS_PTHREADS_SPINLOCK)
+#if defined(GECODE_THREADS_OSX) || defined(GECODE_THREADS_OSX_UNFAIR) || defined(GECODE_THREADS_PTHREADS_SPINLOCK)
 
   /*
    * Fast mutexes