[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#39363: emacs-git version: pthread_setname_np on NetBSD
From: |
Robert Pluim |
Subject: |
bug#39363: emacs-git version: pthread_setname_np on NetBSD |
Date: |
Fri, 31 Jan 2020 10:02:50 +0100 |
>>>>> On Fri, 31 Jan 2020 09:48:13 +0200, Eli Zaretskii <eliz@gnu.org> said:
>> Date: Fri, 31 Jan 2020 00:02:13 +0100
>> From: Thomas Klausner <wiz@NetBSD.org>
>>
>> Recently, emacs from git stopped compiling on NetBSD because it
>> started using pthread_setname_np. AFAIK, there is no commonly agreed
>> upon standard for this function, and NetBSD's uses three arguments, see
>> https://netbsd.gw.com/cgi-bin/man-cgi?pthread_setname_np++NetBSD-current
>>
>> The attached patch makes emacs compile again (on NetBSD-9.99.43/amd64)
>> but configure should probably be taught to look for that version of
>> pthread_setname_np instead of the #ifdef __NetBSD__.
Eli> I think we want instead to modify the configure-time test to include
Eli> the possibility of 3-argument pthread_setname_np.
Untested patch (I donʼt have any NetBSD machines).
diff --git a/configure.ac b/configure.ac
index f604acb694..1d922d9c02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4192,6 +4192,21 @@ AC_DEFUN
AC_DEFINE(
HAVE_PTHREAD_SETNAME_NP_1ARG, 1,
[Define to 1 if pthread_setname_np takes a single argument.])
+ else
+ AC_CACHE_CHECK(
+ [whether pthread_setname_np takes three arguments],
+ [emacs_cv_pthread_setname_np_3arg],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[pthread_setname_np (0, "%s", "a");]])],
+ [emacs_cv_pthread_setname_np_3arg=yes],
+ [emacs_cv_pthread_setname_np_3arg=no])])
+ if test "$emacs_cv_pthread_setname_np_3arg" = "yes"; then
+ AC_DEFINE(
+ HAVE_PTHREAD_SETNAME_NP_3ARG, 1,
+ [Define to 1 if pthread_setname_np takes three arguments.])
+ fi
fi
fi
diff --git a/src/systhread.c b/src/systhread.c
index c649ae853a..0d600d6895 100644
--- a/src/systhread.c
+++ b/src/systhread.c
@@ -214,11 +214,13 @@ #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';
- #ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
+# ifdef HAVE_PTHREAD_SETNAME_NP_1ARG
pthread_setname_np (p_name);
- #else
+# elif defined HAVE_PTHREAD_SETNAME_NP_3ARG
+ pthread_setname_np (pthread_self (), "%s", p_name);
+# else
pthread_setname_np (pthread_self (), p_name);
- #endif
+# endif
#endif
}