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

[misc] Explicitly check for pthread_setname_np/pthread_set_name_np

Browse Source 
Seems there is no pthread_setname_np in OpenWrt
This commit is contained in:
ejurgensen 2016-05-05 19:39:15 +02:00
parent 95d0c25be3
commit 9a56044c77
8 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -41,6 +41,7 @@ AC_CHECK_HEADERS([sys/param.h])
AC_CHECK_HEADERS([sys/select.h])
AC_CHECK_HEADERS([dirent.h])
AC_CHECK_HEADERS([regex.h])
AC_CHECK_HEADERS([pthread_np.h])
AC_CHECK_FUNCS(posix_fadvise)
AC_CHECK_FUNCS(strptime)
AC_CHECK_FUNCS(strtok_r)
@ -48,6 +49,10 @@ AC_CHECK_FUNCS(timegm)
AC_CHECK_FUNCS(euidaccess)
AC_CHECK_FUNCS(pipe2)
AC_SEARCH_LIBS([pthread_setname_np], [pthread],
AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Define to 1 if you have pthread_setname_np]),
AC_SEARCH_LIBS([pthread_set_name_np], [pthread], AC_DEFINE(HAVE_PTHREAD_SET_NAME_NP, 1, [Define to 1 if you have pthread_set_name_np]))
)
AC_SEARCH_LIBS([inotify_add_watch], [inotify], [], AC_MSG_ERROR([inotify not found]))
dnl Large File Support (LFS)

6
src/cache.c
View File

@ -30,7 +30,7 @@
#include <time.h>
#include <string.h>
#include <pthread.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
@ -1859,9 +1859,9 @@ cache_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_cache, "cache");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_cache, "cache");
#endif

11
src/filescanner.c
View File

@ -38,6 +38,9 @@
#include <fcntl.h>
#include <dirent.h>
#include <pthread.h>
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
#include <unistr.h>
#include <unictype.h>
@ -45,10 +48,6 @@
#include <event2/event.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <pthread_np.h>
#endif
#ifdef HAVE_REGEX_H
# include <regex.h>
#endif
@ -2165,9 +2164,9 @@ filescanner_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_scan, "filescanner");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_scan, "filescanner");
#endif

6
src/httpd.c
View File

@ -28,7 +28,7 @@
#include <limits.h>
#include <errno.h>
#include <pthread.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
#include <time.h>
@ -1401,9 +1401,9 @@ httpd_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_httpd, "httpd");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_httpd, "httpd");
#endif

16
src/mpd.c
View File

@ -28,17 +28,20 @@
#include <limits.h>
#include <errno.h>
#include <pthread.h>
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
#include <stdint.h>
#include <inttypes.h>
# include <event2/event.h>
# include <event2/buffer.h>
# include <event2/bufferevent.h>
#include <event2/event.h>
#include <event2/buffer.h>
#include <event2/bufferevent.h>
#include <event2/http.h>
# include <event2/listener.h>
#include <event2/listener.h>
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
# define USE_EVENTFD
@ -47,7 +50,6 @@
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <netinet/in.h>
# include <pthread_np.h>
#endif
#include "logger.h"
@ -4896,9 +4898,9 @@ int mpd_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_mpd, "mpd");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_mpd, "mpd");
#endif

9
src/player.c
View File

@ -31,12 +31,14 @@
#include <errno.h>
#include <time.h>
#include <pthread.h>
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
#if defined(__linux__)
# include <sys/timerfd.h>
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <signal.h>
# include <pthread_np.h>
#endif
#include <event2/event.h>
@ -4475,13 +4477,12 @@ player_init(void)
DPRINTF(E_FATAL, L_PLAYER, "Could not spawn player thread: %s\n", strerror(errno));
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_player, "player");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_player, "player");
#endif
return 0;
thread_fail:

6
src/spotify.c
View File

@ -37,7 +37,7 @@
#include <sys/queue.h>
#include <time.h>
#include <pthread.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
@ -2311,9 +2311,9 @@ spotify_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_spotify, "spotify");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_spotify, "spotify");
#endif

6
src/worker.c
View File

@ -30,7 +30,7 @@
#include <string.h>
#include <errno.h>
#include <pthread.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifdef HAVE_PTHREAD_NP_H
# include <pthread_np.h>
#endif
@ -343,9 +343,9 @@ worker_init(void)
goto thread_fail;
}
#if defined(__linux__)
#if defined(HAVE_PTHREAD_SETNAME_NP)
pthread_setname_np(tid_worker, "worker");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#elif defined(HAVE_PTHREAD_SET_NAME_NP)
pthread_set_name_np(tid_worker, "worker");
#endif