Module: wine Branch: master Commit: 4aa98e030e352f020f401b3173ecd1a241e57ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa98e030e352f020f401b3173...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Mar 26 13:26:57 2009 +0100
include: Get rid of the definitions for the pthread emulation.
---
configure | 214 ------------------------------------------------ configure.ac | 4 - include/config.h.in | 6 -- include/wine/pthread.h | 51 ------------ loader/pthread.c | 6 ++ 5 files changed, 6 insertions(+), 275 deletions(-)
diff --git a/configure b/configure index 3bf72df..a97f33e 100755 --- a/configure +++ b/configure @@ -15227,220 +15227,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 -$as_echo_n "checking for pthread_rwlock_t... " >&6; } -if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlock_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlock_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlock_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlock_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; } -if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCK_T 1 -_ACEOF - - -fi -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlockattr_t" >&5 -$as_echo_n "checking for pthread_rwlockattr_t... " >&6; } -if test "${ac_cv_type_pthread_rwlockattr_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlockattr_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlockattr_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlockattr_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo=""$as_me:$LINENO: $ac_try_echo"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlockattr_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlockattr_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlockattr_t" >&6; } -if test "x$ac_cv_type_pthread_rwlockattr_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCKATTR_T 1 -_ACEOF - - -fi - - ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $LIBPTHREAD"
diff --git a/configure.ac b/configure.ac index 6a60c9e..c13abc4 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,10 +1151,6 @@ then AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi
-dnl **** Check for pthread_rwlock_t **** -AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE -#include <pthread.h>]) - dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ pthread_attr_get_np \ diff --git a/include/config.h.in b/include/config.h.in index 047e90c..9e93513 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -594,12 +594,6 @@ /* Define to 1 if you have the <pthread_np.h> header file. */ #undef HAVE_PTHREAD_NP_H
-/* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ -#undef HAVE_PTHREAD_RWLOCKATTR_T - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H
diff --git a/include/wine/pthread.h b/include/wine/pthread.h index a8d5ba3..561c22c 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -30,57 +30,6 @@ struct sigset_t; typedef struct sigset_t sigset_t; #endif
-#ifdef HAVE_PTHREAD_H - -#define _GNU_SOURCE -#include <pthread.h> -#ifdef HAVE_PTHREAD_NP_H -#include <pthread_np.h> -#endif - -#ifndef HAVE_PTHREAD_RWLOCK_T -typedef void *pthread_rwlock_t; -#endif -#ifndef HAVE_PTHREAD_RWLOCKATTR_T -typedef void *pthread_rwlockattr_t; -#endif - -struct wine_pthread_callbacks -{ - void * (*ptr_get_thread_data)(void); - void (*ptr_set_thread_data)(void *data); - pthread_t (*ptr_pthread_self)(void); - int (*ptr_pthread_equal)(pthread_t thread1, pthread_t thread2); - int (*ptr_pthread_create)(pthread_t* thread, const pthread_attr_t* attr, - void* (*start_routine)(void *), void* arg); - int (*ptr_pthread_cancel)(pthread_t thread); - int (*ptr_pthread_join)(pthread_t thread, void **value_ptr); - int (*ptr_pthread_detach)(pthread_t thread); - void (*ptr_pthread_exit)(void *retval, char *currentframe); - int (*ptr_pthread_mutex_init)(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr); - int (*ptr_pthread_mutex_lock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_trylock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_unlock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_destroy)(pthread_mutex_t *mutex); - int (*ptr_pthread_rwlock_init)(pthread_rwlock_t *rwlock, - const pthread_rwlockattr_t *rwlock_attr); - int (*ptr_pthread_rwlock_destroy)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_rdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_tryrdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_wrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_trywrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_unlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_cond_init)(pthread_cond_t *cond, const pthread_condattr_t *cond_attr); - int (*ptr_pthread_cond_destroy)(pthread_cond_t *cond); - int (*ptr_pthread_cond_signal)(pthread_cond_t *cond); - int (*ptr_pthread_cond_broadcast)(pthread_cond_t *cond); - int (*ptr_pthread_cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex); - int (*ptr_pthread_cond_timedwait)(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime); -}; - -#endif /* HAVE_PTHREAD_H */ - /* thread information used to creating and exiting threads */ struct wine_pthread_thread_info { diff --git a/loader/pthread.c b/loader/pthread.c index 4c0c892..e4e0831 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,6 +39,12 @@ #include <sys/ucontext.h> #include <sys/thr.h> #endif +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif +#ifdef HAVE_PTHREAD_NP_H +#include <pthread_np.h> +#endif
#include "wine/library.h" #include "wine/pthread.h"