archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 44925: [Backport #9492]

Browse source 
* configure.in: check if pthread_setname_np is available.

	* thread_pthread.c: pthread_setname_np is not available on old
	  Darwins.  [ruby-core:60524] [Bug #9492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-21 23:32:34 +00:00
parent 02cc3d942a
commit 1976e3ffd9
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Feb 22 01:35:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: check if pthread_setname_np is available.
* thread_pthread.c: pthread_setname_np is not available on old
Darwins. [ruby-core:60524] [Bug #9492]
Sat Feb 22 00:21:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Feb 22 00:21:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to * parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to

2
configure.in
View file

@ -2448,7 +2448,7 @@ if test x"$enable_pthread" = xyes; then
pthread_get_stackaddr_np pthread_get_stacksize_np \ pthread_get_stackaddr_np pthread_get_stacksize_np \
thr_stksegment pthread_stackseg_np pthread_getthrds_np \ thr_stksegment pthread_stackseg_np pthread_getthrds_np \
pthread_cond_init pthread_condattr_setclock pthread_condattr_init \ pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
pthread_sigmask) pthread_sigmask pthread_setname_np)
if test "${host_os}" = "nacl"; then if test "${host_os}" = "nacl"; then
ac_cv_func_pthread_attr_init=no ac_cv_func_pthread_attr_init=no
else else

2
thread_pthread.c
View file

@ -1423,7 +1423,7 @@ timer_thread_sleep(rb_global_vm_lock_t* unused)
#if defined(__linux__) && defined(PR_SET_NAME) #if defined(__linux__) && defined(PR_SET_NAME)
# define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name) # define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name)
#elif defined(__APPLE__) #elif defined(HAVE_PTHREAD_SETNAME_NP)
/* pthread_setname_np() on Darwin does not have target thread argument */ /* pthread_setname_np() on Darwin does not have target thread argument */
# define SET_THREAD_NAME(name) pthread_setname_np(name) # define SET_THREAD_NAME(name) pthread_setname_np(name)
#else #else

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1" #define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-22" #define RUBY_RELEASE_DATE "2014-02-22"
#define RUBY_PATCHLEVEL 49 #define RUBY_PATCHLEVEL 50
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2