summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-01 14:28:42 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-01 14:28:42 +0000
commit72af26207b6e4600e540ec0158cde30df86f7864 (patch)
treee23ec616c972383427c66cc0ef062df2a53a65f6
parenteecacaa024d59dc7cd7c9ff37a017478082b0a89 (diff)
* thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if
PR_SET_NAME is available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 78c9be9628..514cf4b220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 1 23:21:58 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if
+ PR_SET_NAME is available.
+
Thu Dec 1 22:31:16 2011 Tanaka Akira <akr@fsij.org>
* io.c (linux_get_maxfd): change local variable name.
diff --git a/thread_pthread.c b/thread_pthread.c
index 0da4aee67f..1688d3d0df 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1130,7 +1130,7 @@ thread_timer(void *p)
if (TT_DEBUG) WRITE_CONST(2, "start timer thread\n");
-#ifdef __linux__
+#if defined(__linux__) && defined(PR_SET_NAME)
prctl(PR_SET_NAME, "ruby-timer-thr");
#endif