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

[misc] PR #1941 adjustments

Browse Source
This commit is contained in:
ejurgensen
2025-11-11 23:19:05 +01:00
parent 38e1c89908
commit ec66f95269
8 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/misc.c
View File

@@ -1852,55 +1852,51 @@ mutex_init(pthread_mutex_t *mutex)
return err;
}
int64_t
thread_gettid(pthread_t p)
int
thread_gettid(void)
{
int64_t tid = -1;
int tid;
#if defined(HAVE_GETTID)
tid = (int64_t)gettid();
tid = (int)gettid();
#elif defined(HAVE_PTHREAD_GETTHREADID_NP)
tid = (int64_t)pthread_getthreadid_np();
tid = pthread_getthreadid_np();
#else //defacto thread id
tid = (int64_t)p;
tid = (int)pthread_self();
#endif
return tid;
}
void
thread_getname(pthread_t thread, char *name, size_t len)
thread_getname(char *name, size_t len)
{
#if defined(HAVE_PTHREAD_GETNAME_NP)
pthread_getname_np(thread, name, len);
pthread_getname_np(pthread_self(), name, len);
#elif defined(HAVE_PTHREAD_GET_NAME_NP)
pthread_get_name_np(thread, name, len);
pthread_get_name_np(pthread_self(), name, len);
#else
name[0] = '\0';
if (len > 0)
name[0] = '\0';
#endif
}
void
thread_getnametid(char *buf, size_t len)
{
int64_t tid;
int tid;
char thread_name[32];
pthread_t p = pthread_self();
thread_getname(p, thread_name, sizeof(thread_name));
tid = thread_gettid(p) % 10000;
snprintf(buf, len, "%s (%" PRId64 ")", thread_name, tid);
thread_getname(thread_name, sizeof(thread_name));
tid = thread_gettid() % 10000;
snprintf(buf, len, "%s (%d)", thread_name, tid);
}
void
thread_setname(const char *name)
{
#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)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(pthread_self(), name);
#elif defined(HAVE_PTHREAD_SETNAME_NP_MACOS)
pthread_setname_np(name);
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(pthread_self(), name);
#endif