diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-01 14:36:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-01 14:36:42 +0000 |
commit | 62b511d9e6c8da18415c0ac0fd03ea7e63d3e088 (patch) | |
tree | dcef9295c94b97e46b8157c9153920454cea9439 /thread.c | |
parent | c56d9aaabf8f4886e1ba69d24024727ab905aed4 (diff) | |
download | ruby-62b511d9e6c8da18415c0ac0fd03ea7e63d3e088.tar.gz |
thread.c: reset name
* thread.c (rb_thread_setname): allow to reset thread name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -2774,18 +2774,23 @@ rb_thread_getname(VALUE thread) static VALUE rb_thread_setname(VALUE thread, VALUE name) { + const char *s = ""; rb_thread_t *th; GetThreadPtr(thread, th); - StringValueCStr(name); - th->name = rb_str_new_frozen(name); + if (!NIL_P(name)) { + StringValueCStr(name); + name = rb_str_new_frozen(name); + s = RSTRING_PTR(name); + } + th->name = name; #if defined(HAVE_PTHREAD_SETNAME_NP) # if defined(__linux__) - pthread_setname_np(th->thread_id, RSTRING_PTR(name)); + pthread_setname_np(th->thread_id, s); # elif defined(__NetBSD__) - pthread_setname_np(th->thread_id, RSTRING_PTR(name), "%s"); + pthread_setname_np(th->thread_id, s, "%s"); # endif #elif defined(HAVE_PTHREAD_SET_NAME_NP) /* FreeBSD */ - pthread_set_name_np(th->thread_id, RSTRING_PTR(name)); + pthread_set_name_np(th->thread_id, s); #endif return name; } |