Skip to content

Commit 17ad6f4

Browse files
committed
merge revision(s) 44925: [Backport ruby#9492]
* 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 ruby#9492] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent de3abc8 commit 17ad6f4

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Sat Feb 22 01:35:02 2014 Nobuyoshi Nakada <[email protected]>
2+
3+
* configure.in: check if pthread_setname_np is available.
4+
5+
* thread_pthread.c: pthread_setname_np is not available on old
6+
Darwins. [ruby-core:60524] [Bug #9492]
7+
18
Sat Feb 22 00:21:50 2014 Nobuyoshi Nakada <[email protected]>
29

310
* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,7 @@ if test x"$enable_pthread" = xyes; then
24482448
pthread_get_stackaddr_np pthread_get_stacksize_np \
24492449
thr_stksegment pthread_stackseg_np pthread_getthrds_np \
24502450
pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
2451-
pthread_sigmask)
2451+
pthread_sigmask pthread_setname_np)
24522452
if test "${host_os}" = "nacl"; then
24532453
ac_cv_func_pthread_attr_init=no
24542454
else

thread_pthread.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,7 @@ timer_thread_sleep(rb_global_vm_lock_t* unused)
14231423

14241424
#if defined(__linux__) && defined(PR_SET_NAME)
14251425
# define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name)
1426-
#elif defined(__APPLE__)
1426+
#elif defined(HAVE_PTHREAD_SETNAME_NP)
14271427
/* pthread_setname_np() on Darwin does not have target thread argument */
14281428
# define SET_THREAD_NAME(name) pthread_setname_np(name)
14291429
#else

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.1"
22
#define RUBY_RELEASE_DATE "2014-02-22"
3-
#define RUBY_PATCHLEVEL 49
3+
#define RUBY_PATCHLEVEL 50
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2

0 commit comments

Comments
 (0)