From 32632baf6d4a9c9d03fb8b17a7a9a4a2aa339999 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Mar 2012 00:12:40 +0000 Subject: [PATCH] Use pthread_setconcurrency() in wxThread::SetConcurrency(). Use POSIX function if available instead of only using Solaris-specific thr_setconcurrency() which is not found in modern Linux systems any more. Closes #2115. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 106 +++++++++++++++++++++++++++++++++++++++++ configure.in | 8 +++- docs/changes.txt | 1 + setup.h.in | 3 ++ src/unix/threadpsx.cpp | 19 +++++--- 5 files changed, 129 insertions(+), 8 deletions(-) diff --git a/configure b/configure index b91aa76595..3f4ae9b284 100755 --- a/configure +++ b/configure @@ -42935,6 +42935,102 @@ echo "${ECHO_T}${flag}" >&6; } if test "$wxUSE_THREADS" = "yes" ; then +for ac_func in pthread_setconcurrency +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_SET_CONCURRENCY 1 +_ACEOF + +else + + for ac_func in thr_setconcurrency do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -43024,6 +43120,16 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_THR_SETCONCURRENCY 1 +_ACEOF + +else + { echo "$as_me:$LINENO: WARNING: Setting thread concurrency will not work properly" >&5 +echo "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;} +fi +done + fi done diff --git a/configure.in b/configure.in index 613a505c6c..4e654c5c28 100644 --- a/configure.in +++ b/configure.in @@ -4977,7 +4977,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then dnl do other tests only if we are using threads if test "$wxUSE_THREADS" = "yes" ; then - AC_CHECK_FUNCS(thr_setconcurrency) + AC_CHECK_FUNCS(pthread_setconcurrency, + AC_DEFINE(HAVE_PTHREAD_SET_CONCURRENCY), + [ + AC_CHECK_FUNCS(thr_setconcurrency, + AC_DEFINE(HAVE_THR_SETCONCURRENCY), + AC_MSG_WARN(Setting thread concurrency will not work properly)) + ]) dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so dnl wouldn't be found by it diff --git a/docs/changes.txt b/docs/changes.txt index 4f65b5b05c..c6691168a9 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -522,6 +522,7 @@ OSX: Univ: - Fix regression with read-only wxComboBox appearance (Jason Erb). +- Implement wxThread::SetConcurrency() for POSIX systems (Igor Korot). diff --git a/setup.h.in b/setup.h.in index 97fcb89a6a..c324fe185a 100644 --- a/setup.h.in +++ b/setup.h.in @@ -1117,6 +1117,9 @@ /* Define if you have thr_setconcurrency function */ #undef HAVE_THR_SETCONCURRENCY +/* Define if you have pthread_setconcurrency function */ +#undef HAVE_PTHREAD_SET_CONCURRENCY + /* Define if you have the uname function. */ #undef HAVE_UNAME diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index 1e555050f1..1d77856e80 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -1127,18 +1127,23 @@ wxThreadIdType wxThread::GetCurrentId() bool wxThread::SetConcurrency(size_t level) { -#ifdef HAVE_THR_SETCONCURRENCY +#ifdef HAVE_PTHREAD_SET_CONCURRENCY + int rc = pthread_setconcurrency( level ); +#elif defined(HAVE_THR_SETCONCURRENCY) int rc = thr_setconcurrency(level); +#else // !HAVE_THR_SETCONCURRENCY + // ok only for the default value + int rc = level == 0 ? 0 : -1; +#endif // HAVE_THR_SETCONCURRENCY/!HAVE_THR_SETCONCURRENCY + if ( rc != 0 ) { - wxLogSysError(rc, wxT("thr_setconcurrency() failed")); + wxLogSysError(rc, _("Failed to set thread concurrency level to %lu"), + static_cast(level)); + return false; } - return rc == 0; -#else // !HAVE_THR_SETCONCURRENCY - // ok only for the default value - return level == 0; -#endif // HAVE_THR_SETCONCURRENCY/!HAVE_THR_SETCONCURRENCY + return true; } // ----------------------------------------------------------------------------- -- 2.45.2