rhmessaging commits: r3536 - in store/trunk/cpp: tests and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: aconway
Date: 2009-07-31 15:45:42 -0400 (Fri, 31 Jul 2009)
New Revision: 3536
Modified:
store/trunk/cpp/configure.ac
store/trunk/cpp/tests/Makefile.am
store/trunk/cpp/tests/cluster/Makefile.am
store/trunk/cpp/tests/cluster/run_cluster_tests
store/trunk/cpp/tests/run_python_tests
store/trunk/cpp/tests/start_broker
store/trunk/cpp/tests/stop_broker
Log:
Add --with-qpid-build to configure to allow building against a VPATH build of qpid.
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/configure.ac 2009-07-31 19:45:42 UTC (rev 3536)
@@ -88,6 +88,10 @@
[AS_HELP_STRING([--with-qpid-checkout],
[Location of qpid checkout to build against (by default use installed qpid)])])
+AC_ARG_WITH([qpid-build],
+ [AS_HELP_STRING([--with-qpid-build],
+ [Qpid build directory if different from --with-qpid-checkout])])
+
AC_ARG_WITH([qpid-prefix],
[AS_HELP_STRING([--with-qpid-prefix],
[Location of installed qpid prefix to build against (by default "/")])],
@@ -96,6 +100,7 @@
if test x$with_qpid_checkout != x; then
QPID_DIR=$with_qpid_checkout
+ QPID_BLD=$QPID_DIR/cpp
QPID_SRC=$QPID_DIR/cpp/src
test -f $QPID_SRC/qpid/broker/MessageStore.h || \
AC_MSG_ERROR([$QPID_DIR does not appear to be a valid qpid checkout.])
@@ -116,8 +121,17 @@
QPID_CXXFLAGS="-I$QPID_INCLUDE"
QPID_LIBS="-L$QPID_LIB -lqpidbroker"
fi
+
+if test x$with_qpid_build != x; then
+ test x$with_qpid_checkout != x || AC_MSG_ERROR([--with-qpid-build requires --with-qpid-checkout])
+ QPID_BLD=$with_qpid_build
+ QPID_LIBS="$QPID_BLD/src/libqpidbroker.la $QPID_BLD/src/libqpidcommon.la"
+ QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC -I$QPID_BLD/include -I$QPID_BLD/src"
+fi
+
AC_SUBST([QPID_PREFIX])
AC_SUBST([QPID_DIR])
+AC_SUBST([QPID_BLD])
AC_SUBST([QPID_LIBS])
AC_SUBST([QPID_CXXFLAGS])
Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/Makefile.am 2009-07-31 19:45:42 UTC (rev 3536)
@@ -85,6 +85,7 @@
TESTS_ENVIRONMENT = \
QPID_DIR=$(QPID_DIR) \
+ QPID_BLD=$(QPID_BLD) \
VALGRIND=$(VALGRIND) \
abs_srcdir=$(abs_srcdir) \
STORE_LIB=$(abs_builddir)/../lib/.libs/msgstore.so \
Modified: store/trunk/cpp/tests/cluster/Makefile.am
===================================================================
--- store/trunk/cpp/tests/cluster/Makefile.am 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/cluster/Makefile.am 2009-07-31 19:45:42 UTC (rev 3536)
@@ -29,8 +29,6 @@
TMP_DATA_DIR=$(abs_srcdir)/../tmp_data_dir
-QPID_TEST_DIR = $(QPID_DIR)/cpp/src/tests
-
all-local: .valgrindrc .valgrind.supp
.valgrindrc: $(top_srcdir)/tests/.valgrindrc
cp $^ .
@@ -45,6 +43,7 @@
BOOST_TEST_SHOW_PROGRESS=yes \
STORE_ENABLE=1 \
QPID_DIR=$(QPID_DIR) \
+ QPID_BLD=$(QPID_BLD) \
VALGRIND=$(VALGRIND) \
STORE_LIB=$(abs_builddir)/../../lib/.libs/msgstore.so \
TMP_DATA_DIR=$(TMP_DATA_DIR) \
Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-31 19:45:42 UTC (rev 3536)
@@ -124,24 +124,26 @@
exit 0; # A warning, not a failure.
fi
-# QPID_DIR is defined for source tree builds because of the --with-qpid-checkout config parameter
+# QPID_DIR is defined for source tree builds by the --with-qpid-checkout configure option.
+# QPID_BLD is defined as the build directory, either $QPID_DIR/cpp or separately
+# specified with the --with-qpid-build option for VPATH builds.
# If set, then set all the env vars from the correct places in the svn source tree.
if test "${QPID_DIR}" -a -d "${QPID_DIR}" ; then
# Paths and dirs
export PYTHONPATH="${QPID_DIR}/python":"${abs_srcdir}"
# Libraries
- export CLUSTER_LIB="${QPID_DIR}/cpp/src/.libs/cluster.so"
- export TEST_STORE_LIB="${QPID_DIR}/cpp/src/tests/.libs/test_store.so"
+ export CLUSTER_LIB="${QPID_BLD}/src/.libs/cluster.so"
+ export TEST_STORE_LIB="${QPID_BLD}/src/tests/.libs/test_store.so"
# Executables
- CPP_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_test"
- PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/$PYTHON_TESTNAME"
- export QPIDD_EXEC="${QPID_DIR}/cpp/src/qpidd"
+ CPP_CLUSTER_EXEC="${QPID_BLD}/src/tests/cluster_test"
+ PYTHON_CLUSTER_EXEC="${QPID_BLD}/src/tests/$PYTHON_TESTNAME"
+ export QPIDD_EXEC="${QPID_BLD}/src/qpidd"
export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config"
export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route"
- export RECEIVER_EXEC="${QPID_DIR}/cpp/src/tests/receiver"
- export SENDER_EXEC="${QPID_DIR}/cpp/src/tests/sender"
+ export RECEIVER_EXEC="${QPID_BLD}/src/tests/receiver"
+ export SENDER_EXEC="${QPID_BLD}/src/tests/sender"
else
if test "${QPID_PREFIX}" -a -d "${QPID_PREFIX}" ; then
QPID_BIN_DIR=$QPID_PREFIX/bin
Modified: store/trunk/cpp/tests/run_python_tests
===================================================================
--- store/trunk/cpp/tests/run_python_tests 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/run_python_tests 2009-07-31 19:45:42 UTC (rev 3536)
@@ -72,7 +72,7 @@
mkdir -p ${STORE_DIR}
if test -z ${QPIDD} ; then
- export QPIDD=${QPID_DIR}/cpp/src/qpidd
+ export QPIDD=${QPID_BLD}/src/qpidd
fi
fail=0
Modified: store/trunk/cpp/tests/start_broker
===================================================================
--- store/trunk/cpp/tests/start_broker 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/start_broker 2009-07-31 19:45:42 UTC (rev 3536)
@@ -21,7 +21,7 @@
#
# The GNU Lesser General Public License is available in the file COPYING.
-QPIDD=$QPID_DIR/cpp/src/qpidd
+QPIDD=$QPID_BLD/src/qpidd
rm -f qpidd.vglog* qpidd.log
test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=qpidd.vglog --"
exec libtool --mode=execute $VALGRIND $QPIDD --daemon --port=0 --log-enable error+ --log-to-file qpidd.log "$@" > qpidd.port
Modified: store/trunk/cpp/tests/stop_broker
===================================================================
--- store/trunk/cpp/tests/stop_broker 2009-07-31 19:01:14 UTC (rev 3535)
+++ store/trunk/cpp/tests/stop_broker 2009-07-31 19:45:42 UTC (rev 3536)
@@ -25,7 +25,7 @@
#
if test -f qpidd.port; then
export QPID_PORT=`cat qpidd.port`
- QPIDD=$QPID_DIR/cpp/src/qpidd
+ QPIDD=$QPID_BLD/src/qpidd
rm -f qpidd.port
$QPIDD --quit || ERROR=$?
14 years, 11 months
rhmessaging commits: r3535 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-07-31 15:01:14 -0400 (Fri, 31 Jul 2009)
New Revision: 3535
Removed:
store/trunk/cpp/lib/StringDbt.cpp
store/trunk/cpp/lib/StringDbt.h
Modified:
store/trunk/cpp/lib/Makefile.am
Log:
Removed some more unneeded BDB files from the build
Modified: store/trunk/cpp/lib/Makefile.am
===================================================================
--- store/trunk/cpp/lib/Makefile.am 2009-07-31 18:25:15 UTC (rev 3534)
+++ store/trunk/cpp/lib/Makefile.am 2009-07-31 19:01:14 UTC (rev 3535)
@@ -47,7 +47,6 @@
JournalImpl.cpp \
MessageStoreImpl.cpp \
PreparedTransaction.cpp \
- StringDbt.cpp \
TxnCtxt.cpp \
BindingDbt.h \
BufferValue.h \
@@ -59,7 +58,6 @@
MessageStoreImpl.h \
PreparedTransaction.h \
StoreException.h \
- StringDbt.h \
TxnCtxt.h \
jrnl/aio.cpp \
jrnl/arr_cnt.cpp \
Deleted: store/trunk/cpp/lib/StringDbt.cpp
===================================================================
--- store/trunk/cpp/lib/StringDbt.cpp 2009-07-31 18:25:15 UTC (rev 3534)
+++ store/trunk/cpp/lib/StringDbt.cpp 2009-07-31 19:01:14 UTC (rev 3535)
@@ -1,41 +0,0 @@
-/*
- Copyright (c) 2007, 2008 Red Hat, Inc.
-
- This file is part of the Qpid async store library msgstore.so.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
- The GNU Lesser General Public License is available in the file COPYING.
- */
-
-#include "StringDbt.h"
-
-using namespace mrg::msgstore;
-
-StringDbt::StringDbt()
-{
-}
-
-StringDbt::StringDbt(const std::string& _value) : value(_value)
-{
- set_data((void*) value.data());
- set_size(value.length());
-}
-
-void StringDbt::read(std::string& out)
-{
- out.assign(reinterpret_cast<char*>(get_data()), get_size());
-}
Deleted: store/trunk/cpp/lib/StringDbt.h
===================================================================
--- store/trunk/cpp/lib/StringDbt.h 2009-07-31 18:25:15 UTC (rev 3534)
+++ store/trunk/cpp/lib/StringDbt.h 2009-07-31 19:01:14 UTC (rev 3535)
@@ -1,52 +0,0 @@
-/*
- Copyright (c) 2007, 2008 Red Hat, Inc.
-
- This file is part of the Qpid async store library msgstore.so.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
- The GNU Lesser General Public License is available in the file COPYING.
- */
-
-#ifndef _StringDbt_
-#define _StringDbt_
-
-#include "db-inc.h"
-#include <qpid/broker/Persistable.h>
-#include <qpid/framing/Buffer.h>
-
-namespace mrg{
-namespace msgstore{
-
-class StringDbt : public Dbt
-{
- const std::string value;//holds value to be written
-
-public:
- /**
- * For writing a string
- */
- StringDbt(const std::string& value);
- /**
- * For reading a string
- */
- StringDbt();
- void read(std::string& value);
-};
-
-}}
-
-#endif
14 years, 11 months
rhmessaging commits: r3534 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-07-31 14:25:15 -0400 (Fri, 31 Jul 2009)
New Revision: 3534
Removed:
store/trunk/cpp/lib/IdPairDbt.cpp
store/trunk/cpp/lib/IdPairDbt.h
Modified:
store/trunk/cpp/lib/Makefile.am
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Removed some unneeded BDB files from the build
Deleted: store/trunk/cpp/lib/IdPairDbt.cpp
===================================================================
--- store/trunk/cpp/lib/IdPairDbt.cpp 2009-07-31 15:06:34 UTC (rev 3533)
+++ store/trunk/cpp/lib/IdPairDbt.cpp 2009-07-31 18:25:15 UTC (rev 3534)
@@ -1,48 +0,0 @@
-/*
- Copyright (c) 2007, 2008 Red Hat, Inc.
-
- This file is part of the Qpid async store library msgstore.so.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
- The GNU Lesser General Public License is available in the file COPYING.
- */
-
-#include "IdPairDbt.h"
-
-using namespace mrg::msgstore;
-
-IdPairDbt::IdPairDbt() : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1]))
-{
- ids[0] = 0;
- ids[1] = 0;
- init();
-}
-
-IdPairDbt::IdPairDbt(uint64_t _queue, uint64_t _message) : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1]))
-{
- ids[0] = _message;
- ids[1] = _queue;
- init();
-}
-
-void IdPairDbt::init()
-{
- set_data(&ids);
- set_size(sizeof(ids));
- set_ulen(sizeof(ids));
- set_flags(DB_DBT_USERMEM);
-}
Deleted: store/trunk/cpp/lib/IdPairDbt.h
===================================================================
--- store/trunk/cpp/lib/IdPairDbt.h 2009-07-31 15:06:34 UTC (rev 3533)
+++ store/trunk/cpp/lib/IdPairDbt.h 2009-07-31 18:25:15 UTC (rev 3534)
@@ -1,50 +0,0 @@
-/*
- Copyright (c) 2007, 2008 Red Hat, Inc.
-
- This file is part of the Qpid async store library msgstore.so.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
- The GNU Lesser General Public License is available in the file COPYING.
- */
-
-#ifndef _IdPairDbt_
-#define _IdPairDbt_
-
-#include "db-inc.h"
-#include <qpid/framing/amqp_types.h>
-
-namespace mrg{
-namespace msgstore{
-
-class IdPairDbt : public Dbt
-{
- uint64_t ids[2];
-
- void init();
-public:
- Dbt message;
- Dbt queue;
-
- IdPairDbt(uint64_t queue, uint64_t message);
- IdPairDbt();
- uint64_t queueId() { return ids[1]; }
- uint64_t messageId() { return ids[0]; }
-};
-
-}}
-
-#endif
Modified: store/trunk/cpp/lib/Makefile.am
===================================================================
--- store/trunk/cpp/lib/Makefile.am 2009-07-31 15:06:34 UTC (rev 3533)
+++ store/trunk/cpp/lib/Makefile.am 2009-07-31 18:25:15 UTC (rev 3534)
@@ -43,7 +43,6 @@
BufferValue.cpp \
DataTokenImpl.cpp \
IdDbt.cpp \
- IdPairDbt.cpp \
IdSequence.cpp \
JournalImpl.cpp \
MessageStoreImpl.cpp \
@@ -55,7 +54,6 @@
Cursor.h \
DataTokenImpl.h \
IdDbt.h \
- IdPairDbt.h \
IdSequence.h \
JournalImpl.h \
MessageStoreImpl.h \
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-07-31 15:06:34 UTC (rev 3533)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-07-31 18:25:15 UTC (rev 3534)
@@ -25,7 +25,7 @@
#include "BindingDbt.h"
#include "BufferValue.h"
-#include "IdPairDbt.h"
+#include "IdDbt.h"
#include "jrnl/txn_map.hpp"
#include "qpid/log/Statement.h"
#include "qmf/com/redhat/rhm/store/Package.h"
14 years, 11 months
rhmessaging commits: r3533 - in store/trunk/cpp/lib: jrnl and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-07-31 11:06:34 -0400 (Fri, 31 Jul 2009)
New Revision: 3533
Modified:
store/trunk/cpp/lib/JournalImpl.cpp
store/trunk/cpp/lib/JournalImpl.h
store/trunk/cpp/lib/jrnl/jcntl.cpp
Log:
Related to BZ514278 - "QPID process goes down when running TSXTEST with --durable_msg": Changed timeout to 1-sec. with logged warnings every 2 sec. Also made all qualifications to mrg::journal in namespace mrg::store fully qualified in JournalImpl.h/.cpp
Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp 2009-07-30 20:43:52 UTC (rev 3532)
+++ store/trunk/cpp/lib/JournalImpl.cpp 2009-07-31 15:06:34 UTC (rev 3533)
@@ -134,7 +134,7 @@
const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages,
const u_int32_t wcache_pgsize_sblks,
- journal::aio_callback* const cbp)
+ mrg::journal::aio_callback* const cbp)
{
std::ostringstream oss;
oss << "Initialize; num_jfiles=" << num_jfiles << " jfsize_sblks=" << jfsize_sblks;
@@ -166,7 +166,7 @@
const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages,
const u_int32_t wcache_pgsize_sblks,
- journal::aio_callback* const cbp,
+ mrg::journal::aio_callback* const cbp,
boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr,
u_int64_t& highest_rid,
u_int64_t queue_id)
@@ -280,7 +280,7 @@
while (!done) {
iores res = read_data_record(&_datap, _dlen, &_xidp, xlen, transient, _external, &_dtok);
switch (res) {
- case journal::RHM_IORES_SUCCESS:
+ case mrg::journal::RHM_IORES_SUCCESS:
if (_dtok.rid() != rid) {
free_read_buffers();
// Reset data token for next read
@@ -294,22 +294,22 @@
done = true;
}
break;
- case journal::RHM_IORES_PAGE_AIOWAIT:
+ case mrg::journal::RHM_IORES_PAGE_AIOWAIT:
if (++aio_sleep_cnt <= MAX_AIO_SLEEPS) {
get_wr_events();
usleep(AIO_SLEEP_TIME);
} else {
std::stringstream ss;
- ss << "read_data_record() returned " << journal::iores_str(res);
+ ss << "read_data_record() returned " << mrg::journal::iores_str(res);
ss << "; exceeded maximum wait time";
- throw jexception(journal::jerrno::JERR__TIMEOUT, ss.str().c_str(), "JournalImpl",
+ throw jexception(mrg::journal::jerrno::JERR__TIMEOUT, ss.str().c_str(), "JournalImpl",
"loadMsgContent");
}
break;
default:
std::stringstream ss;
- ss << "read_data_record() returned " << journal::iores_str(res);
- throw jexception(journal::jerrno::JERR__UNEXPRESPONSE, ss.str().c_str(), "JournalImpl",
+ ss << "read_data_record() returned " << mrg::journal::iores_str(res);
+ throw jexception(mrg::journal::jerrno::JERR__UNEXPRESPONSE, ss.str().c_str(), "JournalImpl",
"loadMsgContent");
}
}
@@ -318,7 +318,7 @@
ss << "read_data_record() was unable to find rid 0x" << std::hex << rid << std::dec;
ss << " (" << rid << "); last rid found was 0x" << std::hex << _dtok.rid() << std::dec;
ss << " (" << _dtok.rid() << ")";
- throw jexception(journal::jerrno::JERR__RECNFOUND, ss.str().c_str(), "JournalImpl", "loadMsgContent");
+ throw jexception(mrg::journal::jerrno::JERR__RECNFOUND, ss.str().c_str(), "JournalImpl", "loadMsgContent");
}
}
@@ -425,6 +425,30 @@
}
}
+#define MAX_INVALID_RETRYS 5 // This will yield a total wait time of 10 sec with 5 log messages at 2 sec intervals
+iores
+JournalImpl::read_data_record(void** const data_buff, size_t& tot_data_len, void** const xid_buff, size_t& xid_len,
+ bool& transient, bool& external, mrg::journal::data_tok* const dtokp, bool ignore_pending_txns)
+{
+ int retry_cnt = 0;
+ iores res;
+ do {
+ res = jcntl::read_data_record(data_buff, tot_data_len, xid_buff, xid_len, transient, external, dtokp, ignore_pending_txns);
+ if (res == mrg::journal::RHM_IORES_RCINVALID) {
+ retry_cnt++;
+ std::ostringstream oss;
+ if (retry_cnt < MAX_INVALID_RETRYS) {
+ oss << "Store read pipeline on queue " << _jid << " timed out waiting for journal header file read, retrying...";
+ log(LOG_WARN, oss.str());
+ } else {
+ oss << "Store read pipeline on queue " << _jid << " timed out waiting for journal header file read, aborting read with RHM_IORES_RCINVALID";
+ log(LOG_ERROR, oss.str());
+ }
+ }
+ } while (res == mrg::journal::RHM_IORES_RCINVALID && retry_cnt < MAX_INVALID_RETRYS);
+ return res;
+}
+
void
JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid)
{
@@ -468,13 +492,13 @@
}
void
-JournalImpl::log(journal::log_level ll, const std::string& log_stmt) const
+JournalImpl::log(mrg::journal::log_level ll, const std::string& log_stmt) const
{
log(ll, log_stmt.c_str());
}
void
-JournalImpl::log(journal::log_level ll, const char* const log_stmt) const
+JournalImpl::log(mrg::journal::log_level ll, const char* const log_stmt) const
{
switch (ll)
{
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2009-07-30 20:43:52 UTC (rev 3532)
+++ store/trunk/cpp/lib/JournalImpl.h 2009-07-31 15:06:34 UTC (rev 3533)
@@ -25,6 +25,7 @@
#define _JournalImpl_
#include <set>
+#include "jrnl/enums.hpp"
#include "jrnl/jcntl.hpp"
#include "jrnl/slock.hpp"
#include "DataTokenImpl.h"
@@ -68,7 +69,7 @@
inline void cancel() { mrg::journal::slock s(&_gefe_mutex); parent = 0; }
};
- class JournalImpl : public qpid::broker::ExternalQueueStore, public journal::jcntl, public journal::aio_callback
+ class JournalImpl : public qpid::broker::ExternalQueueStore, public mrg::journal::jcntl, public mrg::journal::aio_callback
{
private:
static qpid::broker::Timer* journalTimerPtr;
@@ -88,7 +89,7 @@
void* _xidp;
void* _datap;
size_t _dlen;
- journal::data_tok _dtok;
+ mrg::journal::data_tok _dtok;
bool _external;
qpid::management::ManagementAgent* _agent;
@@ -110,7 +111,7 @@
const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages,
const u_int32_t wcache_pgsize_sblks,
- journal::aio_callback* const cbp);
+ mrg::journal::aio_callback* const cbp);
inline void initialize(const u_int16_t num_jfiles,
const bool auto_expand,
@@ -128,7 +129,7 @@
const u_int32_t jfsize_sblks,
const u_int16_t wcache_num_pages,
const u_int32_t wcache_pgsize_sblks,
- journal::aio_callback* const cbp,
+ mrg::journal::aio_callback* const cbp,
boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr,
u_int64_t& highest_rid,
u_int64_t queue_id);
@@ -155,42 +156,46 @@
// Overrides for write inactivity timer
void enqueue_data_record(const void* const data_buff, const size_t tot_data_len,
- const size_t this_data_len, journal::data_tok* dtokp,
+ const size_t this_data_len, mrg::journal::data_tok* dtokp,
const bool transient = false);
- void enqueue_extern_data_record(const size_t tot_data_len, journal::data_tok* dtokp,
+ void enqueue_extern_data_record(const size_t tot_data_len, mrg::journal::data_tok* dtokp,
const bool transient = false);
void enqueue_txn_data_record(const void* const data_buff, const size_t tot_data_len,
- const size_t this_data_len, journal::data_tok* dtokp, const std::string& xid,
+ const size_t this_data_len, mrg::journal::data_tok* dtokp, const std::string& xid,
const bool transient = false);
- void enqueue_extern_txn_data_record(const size_t tot_data_len, journal::data_tok* dtokp,
+ void enqueue_extern_txn_data_record(const size_t tot_data_len, mrg::journal::data_tok* dtokp,
const std::string& xid, const bool transient = false);
- void dequeue_data_record(journal::data_tok* const dtokp, const bool txn_coml_commit = false);
+ void dequeue_data_record(mrg::journal::data_tok* const dtokp, const bool txn_coml_commit = false);
- void dequeue_txn_data_record(journal::data_tok* const dtokp, const std::string& xid, const bool txn_coml_commit = false);
+ void dequeue_txn_data_record(mrg::journal::data_tok* const dtokp, const std::string& xid, const bool txn_coml_commit = false);
- void txn_abort(journal::data_tok* const dtokp, const std::string& xid);
+ mrg::journal::iores read_data_record(void** const data_buff, size_t& tot_data_len, void** const xid_buff,
+ size_t& xid_len, bool& transient, bool& external, mrg::journal::data_tok* const dtokp,
+ bool ignore_pending_txns = false);
- void txn_commit(journal::data_tok* const dtokp, const std::string& xid);
+ void txn_abort(mrg::journal::data_tok* const dtokp, const std::string& xid);
+ void txn_commit(mrg::journal::data_tok* const dtokp, const std::string& xid);
+
void stop(bool block_till_aio_cmpl = false);
// Logging
- void log(journal::log_level level, const std::string& log_stmt) const;
- void log(journal::log_level level, const char* const log_stmt) const;
+ void log(mrg::journal::log_level level, const std::string& log_stmt) const;
+ void log(mrg::journal::log_level level, const char* const log_stmt) const;
// Overrides for get_events timer
- journal::iores flush(const bool block_till_aio_cmpl = false);
+ mrg::journal::iores flush(const bool block_till_aio_cmpl = false);
// TimerTask callback
void getEventsFire();
void flushFire();
// AIO callbacks
- virtual void wr_aio_cb(std::vector<journal::data_tok*>& dtokl);
+ virtual void wr_aio_cb(std::vector<mrg::journal::data_tok*>& dtokl);
virtual void rd_aio_cb(std::vector<u_int16_t>& pil);
qpid::management::ManagementObject* GetManagementObject (void) const
@@ -209,7 +214,7 @@
journalTimerPtr->add(getEventsFireEventsPtr);
getEventsTimerSetFlag = true;
}
- void handleIoResult(const journal::iores r);
+ void handleIoResult(const mrg::journal::iores r);
// Management instrumentation callbacks overridden from jcntl
inline void instr_incr_outstanding_aio_cnt() {
@@ -235,9 +240,9 @@
~TplJournalImpl() {}
// Special version of read_data_record that ignores transactions - needed when reading the TPL
- inline journal::iores read_data_record(void** const datapp, std::size_t& dsize,
+ inline mrg::journal::iores read_data_record(void** const datapp, std::size_t& dsize,
void** const xidpp, std::size_t& xidsize, bool& transient, bool& external,
- journal::data_tok* const dtokp) {
+ mrg::journal::data_tok* const dtokp) {
return JournalImpl::read_data_record(datapp, dsize, xidpp, xidsize, transient, external, dtokp, true);
}
inline void read_reset() { _rmgr.invalidate(); }
Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-07-30 20:43:52 UTC (rev 3532)
+++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-07-31 15:06:34 UTC (rev 3533)
@@ -268,7 +268,8 @@
return _rmgr.discard(dtokp);
} */
-#define MAX_RCINVALID_CNT 500
+// These two combined make a wait time of approx. 2 sec.
+#define MAX_RCINVALID_CNT 400
#define RCINVALID_SLEEP_TIME_MS 5
iores
jcntl::read_data_record(void** const datapp, std::size_t& dsize, void** const xidpp, std::size_t& xidsize,
14 years, 11 months
rhmessaging commits: r3532 - in store/trunk/cpp: tests/cluster and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: astitcher
Date: 2009-07-30 16:43:52 -0400 (Thu, 30 Jul 2009)
New Revision: 3532
Modified:
store/trunk/cpp/configure.ac
store/trunk/cpp/tests/cluster/run_cluster_tests
Log:
Modify configure so that you can supply an install prefix for qpid
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2009-07-30 20:43:43 UTC (rev 3531)
+++ store/trunk/cpp/configure.ac 2009-07-30 20:43:52 UTC (rev 3532)
@@ -88,6 +88,12 @@
[AS_HELP_STRING([--with-qpid-checkout],
[Location of qpid checkout to build against (by default use installed qpid)])])
+AC_ARG_WITH([qpid-prefix],
+ [AS_HELP_STRING([--with-qpid-prefix],
+ [Location of installed qpid prefix to build against (by default "/")])],
+ [],
+ [with_qpid_prefix="/"])
+
if test x$with_qpid_checkout != x; then
QPID_DIR=$with_qpid_checkout
QPID_SRC=$QPID_DIR/cpp/src
@@ -98,13 +104,19 @@
QPID_LIBS="$QPID_SRC/libqpidbroker.la $QPID_SRC/libqpidcommon.la"
QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC"
else
+ QPID_PREFIX=$with_qpid_prefix
+ QPID_INCLUDE=$QPID_PREFIX/include
+ QPID_LIB=$QPID_PREFIX/lib
fail=0
- AC_CHECK_HEADERS([qpid/broker/MessageStore.h], , [fail=1])
+ test -f $QPID_INCLUDE/qpid/broker/MessageStore.h || \
+ fail=1
# Give any/all diagnostics before failing.
test $fail = 1 &&
AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qpidd-devel or use --with-qpid-checkout])
- QPID_LIBS="-lqpidbroker"
-fi
+ QPID_CXXFLAGS="-I$QPID_INCLUDE"
+ QPID_LIBS="-L$QPID_LIB -lqpidbroker"
+fi
+AC_SUBST([QPID_PREFIX])
AC_SUBST([QPID_DIR])
AC_SUBST([QPID_LIBS])
AC_SUBST([QPID_CXXFLAGS])
Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-30 20:43:43 UTC (rev 3531)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-30 20:43:52 UTC (rev 3532)
@@ -96,7 +96,9 @@
# If this script is run using parameter $1 = "LONG_TEST", then run the long test scripts
if test x$1 == x"LONG_TEST"; then
echo "Running long tests..."
- LONG_TEST=1
+ PYTHON_TESTNAME="long_cluster_tests.py"
+else
+ PYTHON_TESTNAME="cluster_tests.py"
fi
# Check AIS requirements and run tests if found.
@@ -134,17 +136,19 @@
# Executables
CPP_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_test"
- if test ${LONG_TEST}; then
- PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/long_cluster_tests.py"
- else
- PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_tests.py"
- fi
+ PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/$PYTHON_TESTNAME"
export QPIDD_EXEC="${QPID_DIR}/cpp/src/qpidd"
export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config"
export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route"
export RECEIVER_EXEC="${QPID_DIR}/cpp/src/tests/receiver"
export SENDER_EXEC="${QPID_DIR}/cpp/src/tests/sender"
else
+ if test "${QPID_PREFIX}" -a -d "${QPID_PREFIX}" ; then
+ QPID_BIN_DIR=$QPID_PREFIX/bin
+ QPID_SBIN_DIR=$QPID_PREFIX/sbin
+ QPID_LIB_DIR=$QPID_PREFIX/lib
+ QPID_LIBEXEC_DIR=$QPID_PREFIX/libexec
+ fi
# These four env vars must be set prior to calling this script
func_checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR
@@ -157,11 +161,7 @@
# Executables
CPP_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/cluster_test"
- if test ${LONG_TEST}; then
- PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/long_cluster_tests.py"
- else
- PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/cluster_tests.py"
- fi
+ PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/qpid/tests/$PYTHON_TESTNAME"
export QPIDD_EXEC="${QPID_SBIN_DIR}/qpidd"
export QPID_CONFIG_EXEC="${QPID_BIN_DIR}/qpid-config"
export QPID_ROUTE_EXEC="${QPID_BIN_DIR}/qpid-route"
14 years, 11 months
rhmessaging commits: r3531 - in store/trunk/cpp: tests and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: astitcher
Date: 2009-07-30 16:43:43 -0400 (Thu, 30 Jul 2009)
New Revision: 3531
Modified:
store/trunk/cpp/bootstrap
store/trunk/cpp/tests/Makefile.am
Log:
Remove pointless generated makefile fragment
Modified: store/trunk/cpp/bootstrap
===================================================================
--- store/trunk/cpp/bootstrap 2009-07-30 20:43:35 UTC (rev 3530)
+++ store/trunk/cpp/bootstrap 2009-07-30 20:43:43 UTC (rev 3531)
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2007, 2008 Red Hat Inc.
+# Copyright (C) 2007, 2008, 2009 Red Hat Inc.
#
# This file is part of the Qpid async store library msgstore.so.
#
@@ -25,11 +25,5 @@
aclocal -I m4
autoheader
libtoolize --automake
-
-# Generate (for automake) lots of repetitive parts of tests/Makefile.am.
-(cd tests && rm -f gen.mk
- perl -ne '/^include / or print' Makefile.am \
- | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null )
-
automake --add-missing
autoconf
Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:35 UTC (rev 3530)
+++ store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:43 UTC (rev 3531)
@@ -56,19 +56,18 @@
UNIT_TEST_SRCS = unit_test.cpp unit_test.h
UNIT_TEST_LDADD = -lboost_unit_test_framework $(top_builddir)/lib/msgstore.la
-include gen.mk
+SimpleTest_SOURCES = SimpleTest.cpp $(UNIT_TEST_SRCS)
+SimpleTest_LDADD = $(UNIT_TEST_LDADD) -lrt
-gen.mk: Makefile.am
- ( \
- for i in $(check_PROGRAMS); do \
- echo $${i}_SOURCES = $$i.cpp '$$(UNIT_TEST_SRCS)'; \
- echo $${i}_LDADD = '$$(UNIT_TEST_LDADD)' -lrt; \
- echo ; \
- done; \
- ) \
- > $@-t
- mv $@-t $@
+OrderingTest_SOURCES = OrderingTest.cpp $(UNIT_TEST_SRCS)
+OrderingTest_LDADD = $(UNIT_TEST_LDADD) -lrt
+TransactionalTest_SOURCES = TransactionalTest.cpp $(UNIT_TEST_SRCS)
+TransactionalTest_LDADD = $(UNIT_TEST_LDADD) -lrt
+
+TwoPhaseCommitTest_SOURCES = TwoPhaseCommitTest.cpp $(UNIT_TEST_SRCS)
+TwoPhaseCommitTest_LDADD = $(UNIT_TEST_LDADD) -lrt
+
EXTRA_DIST = \
clean.sh \
failing_python_tests.txt \
14 years, 11 months
rhmessaging commits: r3530 - in store/trunk/cpp: tests and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: astitcher
Date: 2009-07-30 16:43:35 -0400 (Thu, 30 Jul 2009)
New Revision: 3530
Modified:
store/trunk/cpp/Makefile.am
store/trunk/cpp/configure.ac
store/trunk/cpp/tests/Makefile.am
store/trunk/cpp/tests/cluster/Makefile.am
Log:
Remove checks for cluster libraries not used by store
Added a configure argument to control cluster/store tests
By default enable cluster tests if we find the qpid cluster module
Modified: store/trunk/cpp/Makefile.am
===================================================================
--- store/trunk/cpp/Makefile.am 2009-07-30 20:43:23 UTC (rev 3529)
+++ store/trunk/cpp/Makefile.am 2009-07-30 20:43:35 UTC (rev 3530)
@@ -57,4 +57,5 @@
endif
check-long:
- $(MAKE) -C tests check-long
\ No newline at end of file
+ $(MAKE) -C tests check-long
+
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2009-07-30 20:43:23 UTC (rev 3529)
+++ store/trunk/cpp/configure.ac 2009-07-30 20:43:35 UTC (rev 3530)
@@ -40,11 +40,19 @@
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on lots of compiler warnings (recommended)],
[case "${enableval}" in
- yes|no) ;;
+ yes|no) enable_WARNINGS=${enableval};;
*) AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
esac],
- [enableval=yes])
+ [enable_WARNINGS=yes])
+AC_ARG_ENABLE(cluster-tests,
+[ --enable-cluster-tests enable cluster tests with persistence],
+[case "${enableval}" in
+ yes|no) enable_CLUSTER_TESTS=${enableval} ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for cluster test option]) ;;
+ esac],
+ [enable_CLUSTER_TESTS=none])
+
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
# rhm-users list.
@@ -53,7 +61,7 @@
# -Wunreachable-code -Wpadded -Winline
# -Wshadow - warns about boost headers.
-if test "${enableval}" = yes; then
+if test "$enable_WARNINGS" = yes; then
gl_COMPILER_FLAGS(-Werror)
gl_COMPILER_FLAGS(-pedantic)
gl_COMPILER_FLAGS(-Wall)
@@ -101,6 +109,32 @@
AC_SUBST([QPID_LIBS])
AC_SUBST([QPID_CXXFLAGS])
+# Check for cluster module to see whether to enable cluster tests
+AC_MSG_CHECKING([presence of qpid cluster module])
+found_cluster_so=no
+if test x$with_qpid_checkout != x -a -f $QPID_SRC/.libs/cluster.so ; then
+ found_cluster_so=yes
+elif test -f $QPID_LIB/qpid/daemon/cluster.so ; then
+ found_cluster_so=yes
+fi
+
+case "$enable_CLUSTER_TESTS" in
+ yes)
+ if test $found_cluster_so = no; then
+ AC_MSG_ERROR([didn't find cluster module: can't enable cluster tests])
+ fi ;;
+ no) ;;
+ none)
+ if test $found_cluster_so = yes; then
+ enable_CLUSTER_TESTS=yes
+ else
+ enable_CLUSTER_TESTS=no
+ fi ;;
+ *)
+ AC_MSG_ERROR([bad value $enable_CLUSTER_TESTS for cluster tests]) ;;
+esac
+AC_MSG_RESULT([$enable_CLUSTER_TESTS])
+
# Check for libaio and libaio-devel
libaio_fail=0
AC_CHECK_LIB([aio], [io_setup], ,[libaio_fail=1])
@@ -156,52 +190,11 @@
# If rpmlint is available we'll run it when building RPMs.
AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint])
AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
-
-# Check for optional cluster requirements.
-tmp_LIBS=$LIBS
-LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync"
-AC_CHECK_LIB([cpg],[cpg_local_get],[have_libcpg=yes],)
-AC_CHECK_HEADERS([openais/cpg.h corosync/cpg.h],[have_cpg_h=yes],)
-AC_ARG_WITH([cpg],
- [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])],
- [case "${withval}" in
- yes) # yes - require dependencies
- test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel or corosync-devel])
- test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel or corosync-devel])
- with_cpg=yes
- ;;
- no) with_cpg=no ;;
- *) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;;
- esac],
- [ # not specified - use if present
- test x$have_libcpg = xyes -a x$have_cpg_h = xyes && with_cpg=yes
- ]
-)
-AM_CONDITIONAL([HAVE_LIBCPG], [test x$with_cpg = xyes])
-AC_CHECK_LIB([cman],[cman_is_quorate],have_libcman=yes,)
-AC_CHECK_HEADERS([libcman.h],have_libcman_h=yes,)
-AC_ARG_WITH([libcman],
- [AS_HELP_STRING([--with-libcman], [Integration with libcman quorum service.])],
- [case "${withval}" in
- yes) # yes - require dependencies
- test x$have_libcman = xyes || AC_MSG_ERROR([libcman not found, install cman-devel or cmanlib-devel])
- test x$have_libcman_h = xyes || AC_MSG_ERROR([libcman.h not found, install cman-devel or cmanlib-devel])
- with_libcman=yes
- ;;
- no) with_libcman=no ;;
- *) AC_MSG_ERROR([Bad value ${withval} for --with-libcman option]) ;;
- esac],
- [ # not specified - use if present and we're using with_cpg
- test x$have_libcman = xyes -a x$have_libcman_h = xyes -a x$with_cpg = xyes && with_libcman=yes
- ]
-)
-AM_CONDITIONAL([HAVE_LIBCMAN], [test x$with_libcman = xyes])
-LIBS=$tmp_LIBS
-
# Also doxygen for documentation...
AC_CHECK_PROG([do_doxygen], [doxygen], [yes])
AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes])
+AM_CONDITIONAL([DO_CLUSTER_TESTS], [test $enable_CLUSTER_TESTS = yes])
AC_CONFIG_FILES([
Makefile
Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:23 UTC (rev 3529)
+++ store/trunk/cpp/tests/Makefile.am 2009-07-30 20:43:35 UTC (rev 3530)
@@ -28,7 +28,11 @@
TMP_DATA_DIR=$(abs_srcdir)/tmp_data_dir
+if DO_CLUSTER_TESTS
SUBDIRS = jrnl cluster .
+else
+SUBDIRS = jrnl .
+endif
TESTS = \
SimpleTest \
@@ -93,4 +97,4 @@
$(MAKE) -C jrnl check-long
$(MAKE) -C cluster check-long
$(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=.
-
\ No newline at end of file
+
Modified: store/trunk/cpp/tests/cluster/Makefile.am
===================================================================
--- store/trunk/cpp/tests/cluster/Makefile.am 2009-07-30 20:43:23 UTC (rev 3529)
+++ store/trunk/cpp/tests/cluster/Makefile.am 2009-07-30 20:43:35 UTC (rev 3530)
@@ -23,8 +23,6 @@
abs_builddir=@abs_builddir@
abs_srcdir=@abs_srcdir@
-if HAVE_LIBCPG
-
AM_CXXFLAGS = $(WARNING_CFLAGS) -pthread -DBOOST_TEST_DYN_LINK
INCLUDES=-I$(top_srcdir)/lib $(QPID_CXXFLAGS)
@@ -58,9 +56,3 @@
check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=.
-else
-
-check-long:
- @echo "Cluster tests skipped - HAVE_LIBCPG not defined."
-
-endif
14 years, 11 months
rhmessaging commits: r3529 - store/trunk/cpp.
by rhmessaging-commits＠lists.jboss.org
Author: astitcher
Date: 2009-07-30 16:43:23 -0400 (Thu, 30 Jul 2009)
New Revision: 3529
Modified:
store/trunk/cpp/configure.ac
Log:
Removed all reference to APR libs from autoconf
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2009-07-30 17:37:11 UTC (rev 3528)
+++ store/trunk/cpp/configure.ac 2009-07-30 20:43:23 UTC (rev 3529)
@@ -150,28 +150,6 @@
gl_CLOCK_TIME
-AC_ARG_ENABLE([apr-platform],
- [AS_HELP_STRING([--enable-apr-platform],
- [use the Apache Portable Runtime library for platform (default no)])],
- [case $enableval in
- yes|no) enable_APR_PLATFORM=$enableval;;
- *) AC_MSG_ERROR([Invalid value for --enable-apr-platform: $enableval]);;
- esac],
- [enable_APR_PLATFORM=no]
-)
-AM_CONDITIONAL([USE_APR_PLATFORM], [test x$enable_APR_PLATFORM = xyes])
-
-APR_MINIMUM_VERSION=1.2.2
-AC_SUBST(APR_MINIMUM_VERSION)
-AC_SUBST(APR_CXXFLAGS)
-AC_SUBST(USE_APR_PLATFORM)
-
-if test x$enable_APR_PLATFORM = xyes; then
- PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
- APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR_PLATFORM=1"
- USE_APR_PLATFORM=1
-fi
-
# We use valgrind for the tests. See if it's available.
AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind])
14 years, 11 months
rhmessaging commits: r3528 - store/trunk/cpp/lib/jrnl.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-07-30 13:37:11 -0400 (Thu, 30 Jul 2009)
New Revision: 3528
Modified:
store/trunk/cpp/lib/jrnl/rmgr.cpp
Log:
Minor change in format for JERR_RMGR_RIDMISMATCH message
Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-07-30 14:06:48 UTC (rev 3527)
+++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-07-30 17:37:11 UTC (rev 3528)
@@ -181,10 +181,8 @@
if (_hdr._rid != dtokp->rid())
{
std::ostringstream oss;
- oss << std::hex << std::setfill('0');
- oss << "rid=0x" << std::setw(16) << _hdr._rid;
- oss << "; dtok_rid=" << std::setw(16) << dtokp->rid();
- oss << "; dtok_id=0x" << std::setw(8) << dtokp->id();
+ oss << std::hex << "rid=0x" << _hdr._rid << "; dtok_rid=0x" << dtokp->rid()
+ << "; dtok_id=0x" << dtokp->id();
throw jexception(jerrno::JERR_RMGR_RIDMISMATCH, oss.str(), "rmgr", "read");
}
}
14 years, 11 months
rhmessaging commits: r3527 - store/trunk/cpp/tests.
by rhmessaging-commits＠lists.jboss.org
Author: astitcher
Date: 2009-07-30 10:06:48 -0400 (Thu, 30 Jul 2009)
New Revision: 3527
Modified:
store/trunk/cpp/tests/OrderingTest.cpp
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/TransactionalTest.cpp
store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
Log:
Change Timer references to sys::Timer as they have changed in the broker
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2009-07-29 19:22:31 UTC (rev 3526)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2009-07-30 14:06:48 UTC (rev 3527)
@@ -37,6 +37,7 @@
opts.selectors.push_back(level); \
qpid::log::Logger::instance().configure(opts);
+using namespace qpid;
using namespace qpid::broker;
using namespace qpid::framing;
using namespace mrg::msgstore;
@@ -102,7 +103,7 @@
store->init(test_dir, 4, 1, 8);
ExchangeRegistry exchanges;
LinkRegistry links;
- Timer t;
+ sys::Timer t;
DtxManager mgr(t);
mgr.setStore (store.get());
RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, 0);
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2009-07-29 19:22:31 UTC (rev 3526)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2009-07-30 14:06:48 UTC (rev 3527)
@@ -67,7 +67,7 @@
void recover(MessageStoreImpl& store, QueueRegistry& queues, ExchangeRegistry& exchanges, LinkRegistry& links)
{
- Timer t;
+ sys::Timer t;
DtxManager mgr(t);
mgr.setStore (&store);
RecoveryManagerImpl recovery(queues, exchanges, links, mgr, 0);
@@ -419,7 +419,7 @@
registry.setStore (&store);
ExchangeRegistry exchanges;
LinkRegistry links;
- Timer t;
+ sys::Timer t;
DtxManager dtx(t);
dtx.setStore (&store);
RecoveryManagerImpl recovery(registry, exchanges, links, dtx, 10);
Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp 2009-07-29 19:22:31 UTC (rev 3526)
+++ store/trunk/cpp/tests/TransactionalTest.cpp 2009-07-30 14:06:48 UTC (rev 3527)
@@ -39,6 +39,7 @@
qpid::log::Logger::instance().configure(opts);
using namespace mrg::msgstore;
+using namespace qpid;
using namespace qpid::broker;
using namespace qpid::framing;
using namespace std;
@@ -132,7 +133,7 @@
queues = std::auto_ptr<QueueRegistry>(new QueueRegistry);
ExchangeRegistry exchanges;
LinkRegistry links;
- Timer t;
+ sys::Timer t;
DtxManager mgr(t);
mgr.setStore (store.get());
RecoveryManagerImpl recovery(*queues, exchanges, links, mgr, 0);
Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-07-29 19:22:31 UTC (rev 3526)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-07-30 14:06:48 UTC (rev 3527)
@@ -40,6 +40,7 @@
qpid::log::Logger::instance().configure(opts);
using namespace mrg::msgstore;
+using namespace qpid;
using namespace qpid::broker;
using namespace qpid::framing;
using namespace std;
@@ -355,7 +356,7 @@
store = std::auto_ptr<T>(new T());
store->init(test_dir, 4, 1, 8);
- Timer t;
+ sys::Timer t;
ExchangeRegistry exchanges;
queues = std::auto_ptr<QueueRegistry>(new QueueRegistry);
links = std::auto_ptr<LinkRegistry>(new LinkRegistry);
14 years, 11 months