From dfe27428f10723ceba099934ddcb0f07e9f3790b Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 3 Dec 2015 02:57:14 +0000 Subject: configure.in: split SET_THREAD_NAME * configure.in: separate SET_CURRENT_THREAD_NAME, which can set the name of current thread only, and SET_ANOTHER_THREAD_NAME, which can set the name of other threads. * thread.c (rb_thread_setname): use SET_ANOTHER_THREAD_NAME. OS X is not possible to set another thread name. * thread_pthread.c (native_set_thread_name, thread_timer): use SET_CURRENT_THREAD_NAME. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 24014c0597..134e024d0c 100644 --- a/configure.in +++ b/configure.in @@ -2890,6 +2890,7 @@ if test x"$enable_pthread" = xyes; then else AC_CHECK_FUNCS(pthread_attr_init) fi + set_current_thread_name= if test "$ac_cv_func_pthread_setname_np" = yes; then AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments], [rb_cv_func_pthread_setname_np_arguments= @@ -2915,11 +2916,19 @@ if test x"$enable_pthread" = xyes; then ] ) if test -n "${rb_cv_func_pthread_setname_np_arguments}"; then - AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}) + set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}" fi elif test "$ac_cv_func_pthread_set_name_np" = yes; then - AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), pthread_set_name_np(pthread_self(), name)) + set_current_thread_name="pthread_set_name_np(pthread_self(), name)" fi + AS_IF([test -n "$set_current_thread_name"], [ + AC_DEFINE_UNQUOTED(SET_CURRENT_THREAD_NAME(name), $set_current_thread_name) + AS_CASE([$set_current_thread_name], + [*'pthread_self()'*], [ + set_another_thread_name=`echo "$set_current_thread_name" | sed 's/pthread_self()/thid/'` + AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name) + ]) + ]) fi if test x"$ac_cv_header_ucontext_h" = xno; then -- cgit v1.2.3