FS-4753 --resolve this should properly detect it everywhere

This commit is contained in:
Anthony Minessale
2012-10-23 13:14:51 -04:00
parent 4b6db1329c
commit 5f469ad2bd
11 changed files with 34 additions and 9 deletions
+1 -1
View File
@@ -1 +1 @@
Thu Sep 27 13:36:14 CDT 2012
Tue Oct 23 13:13:30 EDT 2012
+12
View File
@@ -66,6 +66,18 @@ apr-config.out: $(APR_CONFIG)
build/apr_rules.out: build/apr_rules.mk
sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_blddir)/config.status
cd $(srcdir) && ./config.status
$(top_blddir)/config.status: $(top_srcdir)/configure
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(top_srcdir)/configure.in
cd $(srcdir) && autoconf
cd $(srcdir) && autoheader
install: $(TARGET_LIB) apr-config.out build/apr_rules.out
$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
$(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+3
View File
@@ -550,6 +550,7 @@ AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)
AC_CHECK_LIB(dl, dlopen)
dnl ----------------------------- Checking for Threads
echo "${nl}Checking for Threads..."
@@ -1619,6 +1620,8 @@ APR_CHECK_DEFINE_FILES(POLLIN, poll.h sys/poll.h)
if test "$threads" = "1"; then
APR_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
AC_CHECK_LIB(pthread, pthread_setschedprio, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPRIO, 1, [Define if you have pthread_setschedprio()])])
# Some systems have setpshared and define PROCESS_SHARED, but don't
# really support PROCESS_SHARED locks. So, we must validate that we
# can go through the steps without receiving some sort of system error.
+2 -1
View File
@@ -174,7 +174,8 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
}
if ((stat = pthread_create((*new)->td, temp, dummy_worker, (*new))) == 0) {
#ifndef __APPLE__
#ifdef HAVE_PTHREAD_SETSCHEDPRIO
if (attr && attr->priority) {
pthread_t *thread = (*new)->td;
pthread_setschedprio(*thread, attr->priority);
+1 -1
View File
@@ -1 +1 @@
Mon Oct 1 12:24:45 CDT 2012
Tue Oct 23 13:13:35 EDT 2012
+3
View File
@@ -40,6 +40,9 @@ dist_man_MANS =
# man/man1/localinfo.1 man/man1/addrinfo.1 \
# man/man1/stunc.1 man/man1/sip-dig.1
noop:
@echo ok
$(dist_man_MANS): manpages
manpages:
+3
View File
@@ -254,6 +254,9 @@ if test x"$have_check" = "xyes"; then
fi
AC_CHECK_HEADERS([fnmatch.h])
AC_CHECK_LIB(pthread, pthread_setschedprio, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPRIO, 1, [Define if you have pthread_setschedprio()])])
dnl dl is currently used only in testing
AC_CHECK_LIB([dl], [dlopen], [
dnl Note: -ldl is not added to LIBS
@@ -269,13 +269,10 @@ int su_pthreaded_port_start(su_port_create_f *create,
pthread_mutex_lock(arg.mutex);
if (pthread_create(&tid, &attr, su_pthread_port_clone_main, &arg) == 0) {
#if defined (WIN32)
/* this needs to be revisited when pthread for Windows supports thread priority settings */
#elif defined (__APPLE__)
/* no such function on Apple */
#else
#ifdef HAVE_PTHREAD_SETSCHEDPRIO
pthread_setschedprio(tid, 99);
#endif
pthread_cond_wait(arg.cv, arg.mutex);
thread_created = 1;
}