[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 9063124: Use pthread_setname_np to set thread name
From: |
Robert Pluim |
Subject: |
emacs-27 9063124: Use pthread_setname_np to set thread name |
Date: |
Mon, 6 Jan 2020 09:43:12 -0500 (EST) |
branch: emacs-27
commit 9063124b9125ed5e2ad87bbb8bd6224526723a92
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>
Use pthread_setname_np to set thread name
* configure.ac: Remove check for sys/prctl.h and prctl, check for
pthread_setname_np instead.
* systhread.c: Remove sys/prctl.h include.
(sys_thread_create) [HAVE_PTHREAD_SETNAME_NP]: Use pthread_setname_np
to set the name of the newly created thread (Bug#38632).
* thread.c (Fmake_thread): Use ENCODE_SYSTEM instead of
ENCODE_UTF_8 on the thread name.
---
configure.ac | 4 ++--
src/systhread.c | 17 +++++++++++------
src/thread.c | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 39bfcf5..de4710f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1767,7 +1767,7 @@ AC_CHECK_HEADERS_ONCE(
sys/sysinfo.h
coff.h pty.h
sys/resource.h
- sys/utsname.h pwd.h utmp.h util.h sys/prctl.h)
+ sys/utsname.h pwd.h utmp.h util.h)
AC_CACHE_CHECK([for ADDR_NO_RANDOMIZE],
[emacs_cv_personality_addr_no_randomize],
@@ -4180,7 +4180,7 @@ pthread_sigmask strsignal setitimer timer_getoverrun \
sendto recvfrom getsockname getifaddrs freeifaddrs \
gai_strerror sync \
getpwent endpwent getgrent endgrent \
-cfmakeraw cfsetspeed __executable_start log2 prctl)
+cfmakeraw cfsetspeed __executable_start log2 pthread_setname_np)
LIBS=$OLD_LIBS
dnl No need to check for posix_memalign if aligned_alloc works.
diff --git a/src/systhread.c b/src/systhread.c
index c3e4e6a..1dda036 100644
--- a/src/systhread.c
+++ b/src/systhread.c
@@ -98,10 +98,6 @@ sys_thread_yield (void)
#include <sched.h>
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-
void
sys_mutex_init (sys_mutex_t *mutex)
{
@@ -227,9 +223,18 @@ sys_thread_create (sys_thread_t *thread_ptr, const char
*name,
if (!pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED))
{
result = pthread_create (thread_ptr, &attr, func, arg) == 0;
-#if defined (HAVE_SYS_PRCTL_H) && defined (HAVE_PRCTL) && defined (PR_SET_NAME)
+#ifdef HAVE_PTHREAD_SETNAME_NP
if (result && name != NULL)
- prctl (PR_SET_NAME, name);
+ {
+ /* We need to truncate here otherwise pthread_setname_np
+ fails to set the name. TASK_COMM_LEN is what the length
+ is called in the Linux kernel headers (Bug#38632). */
+#define TASK_COMM_LEN 16
+ char p_name[TASK_COMM_LEN];
+ strncpy (p_name, name, TASK_COMM_LEN - 1);
+ p_name[TASK_COMM_LEN - 1] = '\0';
+ pthread_setname_np (*thread_ptr, p_name);
+ }
#endif
}
diff --git a/src/thread.c b/src/thread.c
index f811634..f7e39dc 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -826,7 +826,7 @@ If NAME is given, it must be a string; it names the new
thread. */)
new_thread->next_thread = all_threads;
all_threads = new_thread;
- char const *c_name = !NILP (name) ? SSDATA (ENCODE_UTF_8 (name)) : NULL;
+ char const *c_name = !NILP (name) ? SSDATA (ENCODE_SYSTEM (name)) : NULL;
if (c_name)
new_thread->thread_name = xstrdup (c_name);
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 9063124: Use pthread_setname_np to set thread name,
Robert Pluim <=