[xiph-cvs] cvs commit: net resolver.c
Brendan
brendan at xiph.org
Wed Mar 5 17:55:20 PST 2003
brendan 03/03/05 20:55:20
Modified: . acinclude.m4 configure.in
examples Makefile.am
src Makefile.am
. avl.h
. httpp.c
. resolver.c
Log:
Use gnu archive ACX_PTHREAD macro to figure out how to compile thread support.
Also make it possible to build libshout without threads, albeit without locking
in the resolver or avl trees.
New option --disable-pthread too.
Revision Changes Path
1.2 +192 -0 libshout/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/libshout/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acinclude.m4 26 Feb 2003 21:47:47 -0000 1.1
+++ acinclude.m4 6 Mar 2003 01:55:19 -0000 1.2
@@ -222,3 +222,195 @@
AC_SUBST(VORBISENC_LIBS)
rm -f conf.vorbistest
])
+
+
+dnl Available from the GNU Autoconf Macro Archive at:
+dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html
+dnl
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthread or
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+ ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [acx_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: threads are created detached by default
+ # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ AC_TRY_LINK([#include <pthread.h>],
+ [int attr=PTHREAD_CREATE_JOINABLE;],
+ ok=PTHREAD_CREATE_JOINABLE, ok=unknown)
+ if test x"$ok" = xunknown; then
+ AC_TRY_LINK([#include <pthread.h>],
+ [int attr=PTHREAD_CREATE_UNDETACHED;],
+ ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)
+ fi
+ if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,
+ [Define to the necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+ AC_MSG_RESULT(${ok})
+ if test x"$ok" = xunknown; then
+ AC_MSG_WARN([we do not know how to create joinable pthreads])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: must compile with cc_r
+ AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ acx_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
<p><p>1.14 +17 -0 libshout/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.in 26 Feb 2003 21:47:47 -0000 1.13
+++ configure.in 6 Mar 2003 01:55:19 -0000 1.14
@@ -103,6 +103,23 @@
AC_CHECK_FUNCS(getnameinfo getaddrinfo inet_pton)
dnl Extra dependencies
+
+AC_ARG_ENABLE([pthread],
+ [[ --disable-pthread do not link with pthread even if it is available]])
+
+have_thread="no"
+if test "$enable_pthread" != "no"
+then
+ ACX_PTHREAD([
+ AC_DEFINE([USE_THREAD], 1, [Define if you want to use the thread library])
+ LIBS="$LIBS $PTHREAD_LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ CC="$PTHREAD_CC"
+ have_thread="yes"
+ ])
+fi
+AM_CONDITIONAL([HAVE_THREAD], [test "$have_thread" == "yes"])
+
XIPH_PATH_OGG
XIPH_PATH_VORBIS
<p><p>1.3 +1 -1 libshout/examples/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/examples/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 8 Nov 2002 07:49:00 -0000 1.2
+++ Makefile.am 6 Mar 2003 01:55:20 -0000 1.3
@@ -5,6 +5,6 @@
noinst_PROGRAMS = example
example_SOURCES = example.c
-example_LDADD = ../src/libshout.la -logg -lvorbis -lpthread
+example_LDADD = ../src/libshout.la $(OGG_LIBS) $(VORBIS_LIBS)
INCLUDES = -I$(top_srcdir)/include
<p><p>1.7 +6 -2 libshout/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 26 Feb 2003 21:47:47 -0000 1.6
+++ Makefile.am 6 Mar 2003 01:55:20 -0000 1.7
@@ -2,7 +2,11 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = avl net timing httpp thread
+if HAVE_THREAD
+ MAYBE_THREAD = thread
+ MAYBE_THREAD_LIB = thread/libicethread.la
+endif
+SUBDIRS = avl net timing httpp $(MAYBE_THREAD)
lib_LTLIBRARIES = libshout.la
libshout_la_LDFLAGS = -version-info 3:0:0
@@ -11,7 +15,7 @@
libshout_la_SOURCES = shout.c util.c vorbis.c mp3.c
libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
- httpp/libicehttpp.la thread/libicethread.la $(VORBIS_LIBS) $(OGG_LIBS)
+ httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
INCLUDES = -I$(top_srcdir)/include/shout -I$(srcdir)/net -I$(srcdir)/timing -I$(srcdir)/avl -I$(srcdir)/thread -I$(srcdir)/httpp $(VORBIS_CFLAGS) $(OGG_CFLAGS)
<p><p>1.3 +13 -3 avl/avl.h
Index: avl.h
===================================================================
RCS file: /usr/local/cvsroot/avl/avl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avl.h 11 Feb 2002 09:11:18 -0000 1.2
+++ avl.h 6 Mar 2003 01:55:20 -0000 1.3
@@ -2,7 +2,7 @@
* Copyright (C) 1995 by Sam Rushing <rushing at nightmare.com>
*/
-/* $Id: avl.h,v 1.2 2002/02/11 09:11:18 msmith Exp $ */
+/* $Id: avl.h,v 1.3 2003/03/06 01:55:20 brendan Exp $ */
#ifndef __AVL_H
#define __AVL_H
@@ -11,7 +11,15 @@
extern "C" {
#endif
+#ifdef USE_THREAD
#include "thread.h"
+#else
+#define thread_rwlock_create(x)
+#define thread_rwlock_destroy(x)
+#define thread_rwlock_rlock(x)
+#define thread_rwlock_wlock(x)
+#define thread_rwlock_unlock(x)
+#endif
typedef struct avl_node_tag {
void * key;
@@ -24,8 +32,9 @@
* The rest of the bits are used for <rank>
*/
unsigned long rank_and_balance;
-
+#ifdef USE_THREAD
rwlock_t rwlock;
+#endif
} avl_node;
#define AVL_GET_BALANCE(n) ((int)(((n)->rank_and_balance & 3) - 1))
@@ -59,8 +68,9 @@
unsigned long length;
avl_key_compare_fun_type compare_fun;
void * compare_arg;
-
+#ifdef USE_THREAD
rwlock_t rwlock;
+#endif
} avl_tree;
avl_tree * avl_tree_new (avl_key_compare_fun_type compare_fun, void * compare_arg);
<p><p>1.13 +0 -1 httpp/httpp.c
Index: httpp.c
===================================================================
RCS file: /usr/local/cvsroot/httpp/httpp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- httpp.c 17 Jan 2003 09:01:04 -0000 1.12
+++ httpp.c 6 Mar 2003 01:55:20 -0000 1.13
@@ -9,7 +9,6 @@
#include <string.h>
#include <ctype.h>
-#include "thread.h"
#include "avl.h"
#include "httpp.h"
<p><p>1.6 +10 -0 net/resolver.c
Index: resolver.c
===================================================================
RCS file: /usr/local/cvsroot/net/resolver.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- resolver.c 22 Nov 2002 13:02:51 -0000 1.5
+++ resolver.c 6 Mar 2003 01:55:20 -0000 1.6
@@ -19,7 +19,15 @@
#include <winsock2.h>
#endif
+#ifdef USE_THREAD
#include "../thread/thread.h"
+#else
+#define thread_mutex_create(x)
+#define thread_mutex_destroy(x)
+#define thread_mutex_lock(x)
+#define thread_mutex_unlock(x)
+#endif
+
#include "resolver.h"
#include "sock.h"
@@ -29,7 +37,9 @@
/* internal data */
+#ifdef USE_THREAD
static mutex_t _resolver_mutex;
+#endif
static int _initialized = 0;
#ifdef HAVE_INET_PTON
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list