You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2007/07/30 15:25:32 UTC
svn commit: r560973 - in /incubator/qpid/trunk/qpid: ./ cpp/ cpp/src/
cpp/src/qpid/sys/apr/
Author: astitcher
Date: Mon Jul 30 06:25:31 2007
New Revision: 560973
URL: http://svn.apache.org/viewvc?view=rev&rev=560973
Log:
r797@fuschia: andrew | 2007-07-30 14:25:02 +0100
* Removed all the leader-follower acceptor code (APR based acceptor)
* Removed the --enable/disable-apr-netio option to configure
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jul 30 06:25:31 2007
@@ -1,2 +1,2 @@
8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:1224
-c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:702
+c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:797
Modified: incubator/qpid/trunk/qpid/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=560973&r1=560972&r2=560973
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Mon Jul 30 06:25:31 2007
@@ -33,8 +33,10 @@
a source distribution:
* boost <http://www.boost.org> (1.33.1)
* uuid <http://e2fsprogs.sourceforge.net/> (1.39)
- * apr <http://apr.apache.org> (1.2.7)
* pkgconfig <http://pkgconfig.freedesktop.org/wiki/> (0.21)
+
+Building on a platform other than Linux currently requires:
+ * apr <http://apr.apache.org> (1.2.7)
Optional cluster functionality requires:
* openais <http://openais.org/> (0.80.3)
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=560973&r1=560972&r2=560973
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Mon Jul 30 06:25:31 2007
@@ -90,17 +90,6 @@
AC_SUBST(CPPUNIT_LIBS)
AC_SUBST(CPPUNIT_CXXFLAGS)
-AC_ARG_ENABLE([apr-netio],
- [AS_HELP_STRING([--enable-apr-netio],
- [use the Apache Portable Runtime library for network IO (default yes)])],
- [case $enableval in
- yes|no) enable_APR_NETIO=$enableval;;
- *) AC_MSG_ERROR([Invalid value for --enable-apr-netio: $enableval]);;
- esac],
- [enable_APR_NETIO=yes]
-)
-AM_CONDITIONAL([USE_APR_NETIO], [test x$enable_APR_NETIO = xyes])
-
AC_ARG_ENABLE([apr-platform],
[AS_HELP_STRING([--enable-apr-platform],
[use the Apache Portable Runtime library for platform (default no)])],
@@ -117,16 +106,10 @@
AC_SUBST(APR_CXXFLAGS)
AC_SUBST(USE_APR_PLATFORM)
-if test "$enable_APR_NETIO" = yes -o "$enable_APR_PLATFORM" = yes; then
+if test "$enable_APR_PLATFORM" = yes; then
PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
- APR_CXXFLAGS="$APR_CFLAGS"
- if test "$enable_APR_NETIO" = yes; then
- USE_APR_NETIO=1
- fi
- if test "$enable_APR_PLATFORM" = yes; then
- APR_CXXFLAGS+=" -DUSE_APR_PLATFORM=1"
- USE_APR_PLATFORM=1
- fi
+ APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR_PLATFORM=1"
+ USE_APR_PLATFORM=1
fi
AC_ARG_ENABLE([valgrind],
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=560973&r1=560972&r2=560973
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Mon Jul 30 06:25:31 2007
@@ -33,40 +33,22 @@
sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp
-apr_netio_src = \
- qpid/sys/apr/APRAcceptor.cpp \
+apr_plat_src = \
qpid/sys/apr/APRBase.cpp \
qpid/sys/apr/APRPool.cpp \
- qpid/sys/apr/APRSocket.cpp \
- qpid/sys/apr/LFProcessor.cpp \
- qpid/sys/apr/LFSessionContext.cpp
-
-apr_netio_hdr = \
- qpid/sys/apr/APRBase.h \
- qpid/sys/apr/APRPool.h \
- qpid/sys/apr/APRSocket.h \
- qpid/sys/apr/LFProcessor.h \
- qpid/sys/apr/LFSessionContext.h
-
-apr_plat_src = \
qpid/sys/apr/Socket.cpp \
qpid/sys/apr/Time.cpp \
qpid/sys/apr/Thread.cpp \
qpid/sys/apr/Shlib.cpp
-
apr_plat_hdr = \
+ qpid/sys/apr/APRBase.h \
+ qpid/sys/apr/APRPool.h \
qpid/sys/apr/Condition.h \
qpid/sys/apr/Mutex.h \
qpid/sys/apr/Thread.h
-posix_netio_src = \
- qpid/sys/AsynchIOAcceptor.cpp
-
-posix_netio_hdr =
-
posix_plat_src = \
- qpid/sys/Dispatcher.cpp \
qpid/sys/epoll/EpollPoller.cpp \
qpid/sys/posix/check.cpp \
qpid/sys/posix/Socket.cpp \
@@ -82,24 +64,14 @@
qpid/sys/posix/Mutex.h \
qpid/sys/posix/Thread.h
-if USE_APR_NETIO
- platform_dist=$(posix_netio_src) $(posix_netio_hdr)
- platform_src = $(apr_netio_src)
- platform_hdr = $(apr_netio_hdr)
-else
- platform_dist=$(apr_netio_src) $(apr_netio_hdr)
- platform_src = $(posix_netio_src)
- platform_hdr = $(posix_netio_hdr)
-endif
-
if USE_APR_PLATFORM
- platform_dist+=$(posix_plat_src) $(posix_plat_hdr)
- platform_src += $(apr_plat_src)
- platform_hdr += $(apr_plat_hdr)
+ platform_dist=$(posix_plat_src) $(posix_plat_hdr)
+ platform_src = $(apr_plat_src)
+ platform_hdr = $(apr_plat_hdr)
else
- platform_dist+=$(apr_plat_src) $(apr_plat_hdr)
- platform_src += $(posix_plat_src)
- platform_hdr += $(posix_plat_hdr)
+ platform_dist=$(apr_plat_src) $(apr_plat_hdr)
+ platform_src = $(posix_plat_src)
+ platform_hdr = $(posix_plat_hdr)
endif
lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
@@ -166,8 +138,10 @@
qpid/Url.h \
qpid/Url.cpp \
qpid/QpidError.cpp \
- qpid/sys/Serializer.cpp \
+ qpid/sys/AsynchIOAcceptor.cpp \
+ qpid/sys/Dispatcher.cpp \
qpid/sys/Runnable.cpp \
+ qpid/sys/Serializer.cpp \
qpid/sys/Shlib.h \
qpid/sys/Shlib.cpp \
qpid/Options.cpp \