MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-21 02:09:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Initial changes to support systems with single arg pthread_setname_np()

Browse Source
This commit is contained in:
Brad Keifer
2025-11-05 11:36:37 +11:00
parent ffa88286e4
commit 28528abbcd
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@@ -80,8 +80,19 @@ AC_SEARCH_LIBS([pthread_setname_np], [pthread],
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <pthread.h>]], AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <pthread.h>]],
[[pthread_setname_np(pthread_self(), "name");]])], [[pthread_setname_np(pthread_self(), "name");]])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], 1, AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], 1,
[Define to 1 if you have pthread_setname_np])], [Define to 1 if you have pthread_setname_np with 2 args])],
[AC_MSG_RESULT([[no]])])],
[AC_SEARCH_LIBS([pthread_set_name_np], [pthread],
[AC_CHECK_FUNCS([pthread_set_name_np])])])
AC_SEARCH_LIBS([pthread_setname_np], [pthread],
[dnl Validate pthread_setname_np with 1 arg (some have 2)
AC_MSG_CHECKING([[for single-parameter pthread_setname_np]])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <pthread.h>]],
[[pthread_setname_np("name");]])],
[AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], 1,
[Define to 1 if you have pthread_setname_np with 1 arg])],
[AC_MSG_RESULT([[no]])])], [AC_MSG_RESULT([[no]])])],
[AC_SEARCH_LIBS([pthread_set_name_np], [pthread], [AC_SEARCH_LIBS([pthread_set_name_np], [pthread],
[AC_CHECK_FUNCS([pthread_set_name_np])])]) [AC_CHECK_FUNCS([pthread_set_name_np])])])
@@ -94,6 +105,7 @@ AC_SEARCH_LIBS([pthread_getname_np], [pthread],
AC_SEARCH_LIBS([pthread_getthreadid_np], [pthread], AC_SEARCH_LIBS([pthread_getthreadid_np], [pthread],
[AC_DEFINE([HAVE_PTHREAD_GETTHREADID_NP], 1, [AC_DEFINE([HAVE_PTHREAD_GETTHREADID_NP], 1,
[Define to 1 if you have pthread_getthreadid_np])]) [Define to 1 if you have pthread_getthreadid_np])])
AC_SEARCH_LIBS([uuid_generate_random], [uuid], AC_SEARCH_LIBS([uuid_generate_random], [uuid],
[AC_DEFINE([HAVE_UUID], 1, [AC_DEFINE([HAVE_UUID], 1,
[Define to 1 if you have uuid_generate_random])]) [Define to 1 if you have uuid_generate_random])])

26
src/misc.c
View File

@@ -1852,14 +1852,16 @@ mutex_init(pthread_mutex_t *mutex)
return err; return err;
} }
int int64_t
thread_gettid() thread_gettid(pthread_t p)
{ {
int tid = -1; int64_t tid = -1;
#if defined(HAVE_GETTID) #if defined(HAVE_GETTID)
tid = (int)gettid(); tid = (int64_t)gettid();
#elif defined(HAVE_PTHREAD_GETTHREADID_NP) #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
tid = pthread_getthreadid_np(); tid = (int64_t)pthread_getthreadid_np();
#else //defacto thread id
tid = (int64_t)p;
#endif #endif
return tid; return tid;
} }
@@ -1879,19 +1881,25 @@ thread_getname(pthread_t thread, char *name, size_t len)
void void
thread_getnametid(char *buf, size_t len) thread_getnametid(char *buf, size_t len)
{ {
int tid; int64_t tid;
char thread_name[32]; char thread_name[32];
pthread_t p = pthread_self(); pthread_t p = pthread_self();
thread_getname(p, thread_name, sizeof(thread_name)); thread_getname(p, thread_name, sizeof(thread_name));
tid = thread_gettid() % 10000; tid = thread_gettid(p) % 10000;
snprintf(buf, len, "%s (%d)", thread_name, tid); snprintf(buf, len, "%s (%" PRId64 ")", thread_name, tid);
} }
void void
thread_setname(pthread_t thread, const char *name) thread_setname(pthread_t thread, const char *name)
{ {
#if defined(HAVE_PTHREAD_SETNAME_NP) #if defined(HAVE_PTHREAD_SETNAME_NP_1)
pthread_setname_np(name);
DPRINTF(E_DBG, L_MISC,
"%s: Single argument pthread_setname_np(%s). Be aware! It must be called from thread whose name is to be changed\n",
__func__, name
);
#elif defined(HAVE_PTHREAD_SETNAME_NP_2)
pthread_setname_np(thread, name); pthread_setname_np(thread, name);
#elif defined(HAVE_PTHREAD_SET_NAME_NP) #elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(thread, name); pthread_set_name_np(thread, name);

4
src/misc.h
View File

@@ -319,8 +319,8 @@ int
mutex_init(pthread_mutex_t *mutex); mutex_init(pthread_mutex_t *mutex);
// wrapper for gettid/pthread_getthreadid_np // wrapper for gettid/pthread_getthreadid_np
int int64_t
thread_gettid(); thread_gettid(pthread_t p);
// wrapper for pthread_getname_np/pthread_get_name_np // wrapper for pthread_getname_np/pthread_get_name_np
void void