We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] removes incomplete pthread-based lock support

remove-pthread-spinlock.patch (text/plain), 4.29 KB, created by binarycrusader on 2014-07-02 01:15:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: binarycrusader

Created: 2014-07-02 01:15:10 UTC

Size: 4.29 KB

patch

obsolete

># HG changeset patch
># User Shawn Walker <binarycrusader@gmail.com>
># Date 1404263672 25200
>#      Tue Jul 01 18:14:32 2014 -0700
># Node ID f26df49113b61ec18f6cc65bb45629692c693b63
># Parent  8ca9ce569f65d3c4c5ff3e7867ad71e88640f5d5
>2618 incomplete pthread-based lock support should be removed
>
>diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
>--- a/cmake/sdlchecks.cmake
>+++ b/cmake/sdlchecks.cmake
>@@ -755,13 +755,6 @@ macro(CheckPTHREAD)
> 
>       check_c_source_compiles("
>           #include <pthread.h>
>-          int main(int argc, char** argv) {
>-              pthread_spin_trylock(NULL);
>-              return 0;
>-          }" HAVE_PTHREAD_SPINLOCK)
>-
>-      check_c_source_compiles("
>-          #include <pthread.h>
>           #include <pthread_np.h>
>           int main(int argc, char** argv) { return 0; }" HAVE_PTHREAD_NP_H)
>       check_function_exists(pthread_setname_np HAVE_PTHREAD_setNAME_NP)
>diff --git a/configure.in b/configure.in
>--- a/configure.in
>+++ b/configure.in
>@@ -2384,15 +2384,6 @@ AC_HELP_STRING([--enable-pthread-sem], [
>                 AC_MSG_RESULT($have_sem_timedwait)
>             fi
> 
>-            AC_MSG_CHECKING(for pthread_spin_trylock)
>-            AC_TRY_LINK_FUNC(pthread_spin_trylock, [
>-              has_pthread_spin_trylock=yes
>-              AC_DEFINE(HAVE_PTHREAD_SPINLOCK, 1, [ ])
>-            ],[
>-              has_pthread_spin_trylock=no
>-            ])
>-            AC_MSG_RESULT($has_pthread_spin_trylock)
>-
>             AC_CHECK_HEADER(pthread_np.h, have_pthread_np_h=yes, have_pthread_np_h=no, [ #include <pthread.h> ])
>             if test x$have_pthread_np_h = xyes; then
>                 AC_DEFINE(HAVE_PTHREAD_NP_H, 1, [ ])
>diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
>--- a/include/SDL_config.h.cmake
>+++ b/include/SDL_config.h.cmake
>@@ -46,7 +46,6 @@
> 
> #cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@
> #cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@
>-#cmakedefine HAVE_PTHREAD_SPINLOCK @HAVE_PTHREAD_SPINLOCK@
> 
> #cmakedefine HAVE_DXGI_H @HAVE_DXGI_H@
> 
>diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
>--- a/include/SDL_config.h.in
>+++ b/include/SDL_config.h.in
>@@ -49,7 +49,6 @@
> #endif
> #undef HAVE_GCC_ATOMICS
> #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET
>-#undef HAVE_PTHREAD_SPINLOCK
> 
> #undef HAVE_DXGI_H
> 
>diff --git a/premake/Linux/SDL_config_premake.h b/premake/Linux/SDL_config_premake.h
>--- a/premake/Linux/SDL_config_premake.h
>+++ b/premake/Linux/SDL_config_premake.h
>@@ -50,7 +50,6 @@
> #endif
> #define HAVE_GCC_ATOMICS 1
> /* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
>-#define HAVE_PTHREAD_SPINLOCK 1
> 
> /* Comment this if you want to build without any C library requirements */
> #define HAVE_LIBC 1
>diff --git a/premake/config/SDL_config_cygwin.template.h b/premake/config/SDL_config_cygwin.template.h
>--- a/premake/config/SDL_config_cygwin.template.h
>+++ b/premake/config/SDL_config_cygwin.template.h
>@@ -46,7 +46,6 @@
> #define SIZEOF_VOIDP 4
> #define HAVE_GCC_ATOMICS 1
> /* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
>-#define HAVE_PTHREAD_SPINLOCK 1
> 
> /* Comment this if you want to build without any C library requirements */
> #define HAVE_LIBC 0
>diff --git a/premake/config/SDL_config_linux.template.h b/premake/config/SDL_config_linux.template.h
>--- a/premake/config/SDL_config_linux.template.h
>+++ b/premake/config/SDL_config_linux.template.h
>@@ -50,7 +50,6 @@
> #endif
> #define HAVE_GCC_ATOMICS 1
> /* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
>-#define HAVE_PTHREAD_SPINLOCK 1
> 
> /* Comment this if you want to build without any C library requirements */
> #define HAVE_LIBC 1
>diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
>--- a/src/atomic/SDL_spinlock.c
>+++ b/src/atomic/SDL_spinlock.c
>@@ -86,10 +86,6 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
>     /* Maybe used for PowerPC, but the Intel asm or gcc atomics are favored. */
>     return OSAtomicCompareAndSwap32Barrier(0, 1, lock);
> 
>-#elif HAVE_PTHREAD_SPINLOCK
>-    /* pthread instructions */
>-    return (pthread_spin_trylock(lock) == 0);
>-
> #else
> #error Please implement for your platform.
>     return SDL_FALSE;
>@@ -115,9 +111,6 @@ SDL_AtomicUnlock(SDL_SpinLock *lock)
> #elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
>     __sync_lock_release(lock);
> 
>-#elif HAVE_PTHREAD_SPINLOCK
>-    pthread_spin_unlock(lock);
>-
> #else
>     *lock = 0;
> #endif

Actions: View | Diff

Attachments on bug 2618: 1716 | 1718 | 1720 | 1723

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.