From afd564ee3f7f2c42359e20d5083a214f82744812 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 2 Dec 2015 09:17:49 +0000 Subject: thread.c: rb_thread_setname on OS X * thread.c (rb_thread_setname): pthread_setname_np() on OS X takes the name only and sets the current thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/thread.c b/thread.c index 7ab3cea9c8..a14902235e 100644 --- a/thread.c +++ b/thread.c @@ -2774,13 +2774,17 @@ rb_thread_getname(VALUE thread) static VALUE rb_thread_setname(VALUE thread, VALUE name) { +#if defined(HAVE_PTHREAD_SETNAME_NP) || defined(HAVE_PTHREAD_SET_NAME_NP) const char *s = ""; +#endif rb_thread_t *th; GetThreadPtr(thread, th); if (!NIL_P(name)) { StringValueCStr(name); name = rb_str_new_frozen(name); +#if defined(HAVE_PTHREAD_SETNAME_NP) || defined(HAVE_PTHREAD_SET_NAME_NP) s = RSTRING_PTR(name); +#endif } th->name = name; #if defined(HAVE_PTHREAD_SETNAME_NP) @@ -2788,6 +2792,8 @@ rb_thread_setname(VALUE thread, VALUE name) pthread_setname_np(th->thread_id, s); # elif defined(__NetBSD__) pthread_setname_np(th->thread_id, s, "%s"); +# elif defined(__APPLE__) + pthread_setname_np(s); # endif #elif defined(HAVE_PTHREAD_SET_NAME_NP) /* FreeBSD */ pthread_set_name_np(th->thread_id, s); -- cgit v1.2.3