[rhmessaging-commits] rhmessaging commits: r3096 - in store/trunk/cpp: docs and 8 other directories.

Author: kpvdr Date: 2009-02-03 11:21:51 -0500 (Tue, 03 Feb 2009) New Revision: 3096 Modified: store/trunk/cpp/Makefile.am store/trunk/cpp/bootstrap store/trunk/cpp/configure.ac store/trunk/cpp/docs/Makefile.am store/trunk/cpp/docs/jrnl_tmpl.dox store/trunk/cpp/etc/rhmd.conf store/trunk/cpp/lib/BindingDbt.cpp store/trunk/cpp/lib/BindingDbt.h store/trunk/cpp/lib/BufferValue.cpp store/trunk/cpp/lib/BufferValue.h store/trunk/cpp/lib/Cursor.h store/trunk/cpp/lib/DataTokenImpl.cpp store/trunk/cpp/lib/DataTokenImpl.h store/trunk/cpp/lib/IdDbt.cpp store/trunk/cpp/lib/IdDbt.h store/trunk/cpp/lib/IdPairDbt.cpp store/trunk/cpp/lib/IdPairDbt.h store/trunk/cpp/lib/IdSequence.cpp store/trunk/cpp/lib/IdSequence.h store/trunk/cpp/lib/JournalImpl.cpp store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/lib/Makefile.am store/trunk/cpp/lib/MessageStoreImpl.cpp store/trunk/cpp/lib/MessageStoreImpl.h store/trunk/cpp/lib/PreparedTransaction.cpp store/trunk/cpp/lib/PreparedTransaction.h store/trunk/cpp/lib/StoreException.h store/trunk/cpp/lib/StorePlugin.cpp store/trunk/cpp/lib/StringDbt.cpp store/trunk/cpp/lib/StringDbt.h store/trunk/cpp/lib/TxnCtxt.h store/trunk/cpp/lib/jrnl/aio.cpp store/trunk/cpp/lib/jrnl/aio.hpp store/trunk/cpp/lib/jrnl/aio_callback.hpp store/trunk/cpp/lib/jrnl/arr_cnt.cpp store/trunk/cpp/lib/jrnl/arr_cnt.hpp store/trunk/cpp/lib/jrnl/cvar.cpp store/trunk/cpp/lib/jrnl/cvar.hpp store/trunk/cpp/lib/jrnl/data_tok.cpp store/trunk/cpp/lib/jrnl/data_tok.hpp store/trunk/cpp/lib/jrnl/deq_hdr.hpp store/trunk/cpp/lib/jrnl/deq_rec.cpp store/trunk/cpp/lib/jrnl/deq_rec.hpp store/trunk/cpp/lib/jrnl/enq_hdr.hpp store/trunk/cpp/lib/jrnl/enq_map.cpp store/trunk/cpp/lib/jrnl/enq_map.hpp store/trunk/cpp/lib/jrnl/enq_rec.cpp store/trunk/cpp/lib/jrnl/enq_rec.hpp store/trunk/cpp/lib/jrnl/enums.hpp store/trunk/cpp/lib/jrnl/fcntl.cpp store/trunk/cpp/lib/jrnl/fcntl.hpp store/trunk/cpp/lib/jrnl/file_hdr.hpp store/trunk/cpp/lib/jrnl/jcfg.hpp store/trunk/cpp/lib/jrnl/jcntl.cpp store/trunk/cpp/lib/jrnl/jcntl.hpp store/trunk/cpp/lib/jrnl/jdir.cpp store/trunk/cpp/lib/jrnl/jdir.hpp store/trunk/cpp/lib/jrnl/jerrno.cpp store/trunk/cpp/lib/jrnl/jerrno.hpp store/trunk/cpp/lib/jrnl/jexception.cpp store/trunk/cpp/lib/jrnl/jexception.hpp store/trunk/cpp/lib/jrnl/jinf.cpp store/trunk/cpp/lib/jrnl/jinf.hpp store/trunk/cpp/lib/jrnl/jrec.cpp store/trunk/cpp/lib/jrnl/jrec.hpp store/trunk/cpp/lib/jrnl/lp_map.cpp store/trunk/cpp/lib/jrnl/lp_map.hpp store/trunk/cpp/lib/jrnl/lpmgr.cpp store/trunk/cpp/lib/jrnl/lpmgr.hpp store/trunk/cpp/lib/jrnl/pmgr.cpp store/trunk/cpp/lib/jrnl/pmgr.hpp store/trunk/cpp/lib/jrnl/rcvdat.hpp store/trunk/cpp/lib/jrnl/rec_hdr.hpp store/trunk/cpp/lib/jrnl/rec_tail.hpp store/trunk/cpp/lib/jrnl/rfc.cpp store/trunk/cpp/lib/jrnl/rfc.hpp store/trunk/cpp/lib/jrnl/rmgr.cpp store/trunk/cpp/lib/jrnl/rmgr.hpp store/trunk/cpp/lib/jrnl/rrfc.cpp store/trunk/cpp/lib/jrnl/rrfc.hpp store/trunk/cpp/lib/jrnl/slock.cpp store/trunk/cpp/lib/jrnl/slock.hpp store/trunk/cpp/lib/jrnl/time_ns.cpp store/trunk/cpp/lib/jrnl/time_ns.hpp store/trunk/cpp/lib/jrnl/txn_hdr.hpp store/trunk/cpp/lib/jrnl/txn_map.cpp store/trunk/cpp/lib/jrnl/txn_map.hpp store/trunk/cpp/lib/jrnl/txn_rec.cpp store/trunk/cpp/lib/jrnl/txn_rec.hpp store/trunk/cpp/lib/jrnl/wmgr.cpp store/trunk/cpp/lib/jrnl/wmgr.hpp store/trunk/cpp/lib/jrnl/wrfc.cpp store/trunk/cpp/lib/jrnl/wrfc.hpp store/trunk/cpp/lib/qmf-schema.xml store/trunk/cpp/rhel4-support/Makefile store/trunk/cpp/tests/Makefile.am store/trunk/cpp/tests/MessageUtils.h store/trunk/cpp/tests/OrderingTest.cpp store/trunk/cpp/tests/SimpleTest.cpp store/trunk/cpp/tests/TransactionalTest.cpp store/trunk/cpp/tests/TwoPhaseCommitTest.cpp store/trunk/cpp/tests/clean.sh store/trunk/cpp/tests/jrnl/Makefile.am store/trunk/cpp/tests/jrnl/_st_auto_expand.cpp store/trunk/cpp/tests/jrnl/_st_basic.cpp store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp store/trunk/cpp/tests/jrnl/_st_read.cpp store/trunk/cpp/tests/jrnl/_st_read_txn.cpp store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp store/trunk/cpp/tests/jrnl/_ut_jdir.cpp store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp store/trunk/cpp/tests/jrnl/_ut_jexception.cpp store/trunk/cpp/tests/jrnl/_ut_jinf.cpp store/trunk/cpp/tests/jrnl/_ut_lpmgr.cpp store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp store/trunk/cpp/tests/jrnl/chk_jdata store/trunk/cpp/tests/jrnl/cp_rtest_jrnl store/trunk/cpp/tests/jrnl/jhexdump store/trunk/cpp/tests/jrnl/jtt/Makefile.am store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.csv store/trunk/cpp/tests/jrnl/jtt/args.cpp store/trunk/cpp/tests/jrnl/jtt/args.hpp store/trunk/cpp/tests/jrnl/jtt/data_src.cpp store/trunk/cpp/tests/jrnl/jtt/data_src.hpp store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp store/trunk/cpp/tests/jrnl/jtt/jtt.csv store/trunk/cpp/tests/jrnl/jtt/main.cpp store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp store/trunk/cpp/tests/jrnl/jtt/test_case.cpp store/trunk/cpp/tests/jrnl/jtt/test_case.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp store/trunk/cpp/tests/jrnl/prof store/trunk/cpp/tests/jrnl/run-journal-tests store/trunk/cpp/tests/persistence.py store/trunk/cpp/tests/python_tests/__init__.py store/trunk/cpp/tests/python_tests/flow_to_disk.py store/trunk/cpp/tests/run_python_tests store/trunk/cpp/tests/run_test store/trunk/cpp/tests/start_broker store/trunk/cpp/tests/stop_broker store/trunk/cpp/tests/system_test.sh store/trunk/cpp/tests/unit_test.cpp store/trunk/cpp/tests/unit_test.h store/trunk/cpp/tests/vg_check Log: Updated copyright and LGPL 2.1 license notices. There are no code changes in this checkin. Modified: store/trunk/cpp/Makefile.am =================================================================== --- store/trunk/cpp/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# 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. + AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 @@ -3,4 +24,6 @@ EXTRA_DIST = README etc/rhmd.conf +DISTCHECK_CONFIGURE_FLAGS = --with-qpid-checkout=/home/kpvdr/mrg/qpid + sysconf_DATA = etc/rhmd.conf Modified: store/trunk/cpp/bootstrap =================================================================== --- store/trunk/cpp/bootstrap 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/bootstrap 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2007, 2008 Red Hat Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/configure.ac 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,23 +1,23 @@ -dnl # Copyright (C) 2007, 2008 Red Hat Inc. -dnl # -dnl # This file is part of Red Hat Messaging. -dnl # -dnl # Red Hat Messaging is free software; you can redistribute it and/or -dnl # modify it under the terms of the GNU Lesser General Public -dnl # License as published by the Free Software Foundation; either -dnl # version 2.1 of the License, or (at your option) any later version. -dnl # -dnl # This library is distributed in the hope that it will be useful, -dnl # but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl # Lesser General Public License for more details. -dnl # -dnl # You should have received a copy of the GNU Lesser General Public -dnl # License along with this library; if not, write to the Free Software -dnl # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -dnl # USA -dnl # -dnl # The GNU Lesser General Public License is available in the file COPYING. +dnl Copyright (c) 2007, 2008 Red Hat, Inc. +dnl +dnl This file is part of the Qpid async store library msgstore.so. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +dnl USA +dnl +dnl The GNU Lesser General Public License is available in the file COPYING. dnl dnl Process this file with autoconf to produce a configure script. Modified: store/trunk/cpp/docs/Makefile.am =================================================================== --- store/trunk/cpp/docs/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/docs/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,4 +1,25 @@ +# 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. + +# # Run doxygen to generate HTML doc. # Generate dependency files so its rebuilt only when needed. # Modified: store/trunk/cpp/docs/jrnl_tmpl.dox =================================================================== --- store/trunk/cpp/docs/jrnl_tmpl.dox 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/docs/jrnl_tmpl.dox 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,5 +1,26 @@ # Doxyfile 1.5.4 +# 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. + # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project # @@ -25,7 +46,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Red Hat Messaging Journal (RHMJ) " +PROJECT_NAME = "Qpid Asynchronous Store Library" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or Modified: store/trunk/cpp/etc/rhmd.conf =================================================================== --- store/trunk/cpp/etc/rhmd.conf 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/etc/rhmd.conf 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,2 +1,23 @@ +# 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. + # Configuration file for qpidd load-module=libbdbstore.so.0 Modified: store/trunk/cpp/lib/BindingDbt.cpp =================================================================== --- store/trunk/cpp/lib/BindingDbt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/BindingDbt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "BindingDbt.h" using namespace mrg::msgstore; Modified: store/trunk/cpp/lib/BindingDbt.h =================================================================== --- store/trunk/cpp/lib/BindingDbt.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/BindingDbt.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _BindingDbt_ #define _BindingDbt_ @@ -32,21 +32,21 @@ namespace mrg{ namespace msgstore{ - + class BindingDbt : public Dbt { char* data; qpid::framing::Buffer buffer; - static uint32_t encodedSize(const qpid::broker::PersistableExchange& e, - const qpid::broker::PersistableQueue& q, - const std::string& k, + static uint32_t encodedSize(const qpid::broker::PersistableExchange& e, + const qpid::broker::PersistableQueue& q, + const std::string& k, const qpid::framing::FieldTable& a); public: - BindingDbt(const qpid::broker::PersistableExchange& e, - const qpid::broker::PersistableQueue& q, - const std::string& k, + BindingDbt(const qpid::broker::PersistableExchange& e, + const qpid::broker::PersistableQueue& q, + const std::string& k, const qpid::framing::FieldTable& a); virtual ~BindingDbt(); Modified: store/trunk/cpp/lib/BufferValue.cpp =================================================================== --- store/trunk/cpp/lib/BufferValue.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/BufferValue.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "BufferValue.h" using namespace mrg::msgstore; @@ -28,19 +28,19 @@ BufferValue::BufferValue(u_int32_t size, u_int64_t offset) : data(new char[size]), - buffer(data, size) + buffer(data, size) { set_data(data); set_size(size); set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); set_doff(offset); set_dlen(size); - set_ulen(size); + set_ulen(size); } BufferValue::BufferValue(const Persistable& p) : data(new char[p.encodedSize()]), - buffer(data, p.encodedSize()) + buffer(data, p.encodedSize()) { p.encode(buffer); Modified: store/trunk/cpp/lib/BufferValue.h =================================================================== --- store/trunk/cpp/lib/BufferValue.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/BufferValue.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _BufferValue_ #define _BufferValue_ @@ -30,14 +30,14 @@ namespace mrg{ namespace msgstore{ - + class BufferValue : public Dbt { char* data; public: qpid::framing::Buffer buffer; - + BufferValue(u_int32_t size, u_int64_t offset); BufferValue(const qpid::broker::Persistable& p); virtual ~BufferValue(); Modified: store/trunk/cpp/lib/Cursor.h =================================================================== --- store/trunk/cpp/lib/Cursor.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/Cursor.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _Cursor_ #define _Cursor_ Modified: store/trunk/cpp/lib/DataTokenImpl.cpp =================================================================== --- store/trunk/cpp/lib/DataTokenImpl.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/DataTokenImpl.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "DataTokenImpl.h" using namespace mrg::msgstore; Modified: store/trunk/cpp/lib/DataTokenImpl.h =================================================================== --- store/trunk/cpp/lib/DataTokenImpl.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/DataTokenImpl.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _DataTokenImpl_ #define _DataTokenImpl_ Modified: store/trunk/cpp/lib/IdDbt.cpp =================================================================== --- store/trunk/cpp/lib/IdDbt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdDbt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "IdDbt.h" using namespace mrg::msgstore; Modified: store/trunk/cpp/lib/IdDbt.h =================================================================== --- store/trunk/cpp/lib/IdDbt.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdDbt.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _IdDbt_ #define _IdDbt_ @@ -28,13 +28,13 @@ namespace mrg{ namespace msgstore{ - + class IdDbt : public Dbt { void init(); public: u_int64_t id; - + IdDbt(u_int64_t id); IdDbt(); }; Modified: store/trunk/cpp/lib/IdPairDbt.cpp =================================================================== --- store/trunk/cpp/lib/IdPairDbt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdPairDbt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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; Modified: store/trunk/cpp/lib/IdPairDbt.h =================================================================== --- store/trunk/cpp/lib/IdPairDbt.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdPairDbt.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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_ @@ -29,7 +29,7 @@ namespace mrg{ namespace msgstore{ - + class IdPairDbt : public Dbt { uint64_t ids[2]; @@ -38,7 +38,7 @@ public: Dbt message; Dbt queue; - + IdPairDbt(uint64_t queue, uint64_t message); IdPairDbt(); uint64_t queueId() { return ids[1]; } Modified: store/trunk/cpp/lib/IdSequence.cpp =================================================================== --- store/trunk/cpp/lib/IdSequence.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdSequence.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "IdSequence.h" using namespace mrg::msgstore; Modified: store/trunk/cpp/lib/IdSequence.h =================================================================== --- store/trunk/cpp/lib/IdSequence.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/IdSequence.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _IdSequence_ #define _IdSequence_ Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/JournalImpl.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007, 2008 Red Hat Software + Copyright (c) 2007, 2008, 2009 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "JournalImpl.h" #include "jrnl/jerrno.hpp" @@ -81,7 +81,7 @@ _mgmtObject->set_baseFileName(journalBaseFilename); _mgmtObject->set_readPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE); _mgmtObject->set_readPages(JRNL_RMGR_PAGES); - + // The following will be set on initialize(), but being properties, these must be set to 0 in the meantime _mgmtObject->set_initialFileCount(0); _mgmtObject->set_dataFileSize(0); @@ -190,7 +190,7 @@ jcntl::recover(num_jfiles, auto_expand, ae_max_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks, cbp, 0, highest_rid); } - + // Populate PreparedTransaction lists from _tmap if (prep_tx_list_ptr) { @@ -234,7 +234,7 @@ log(LOG_DEBUG, "Recover phase 2 complete; journal now writable."); } -#define MAX_AIO_SLEEPS 1000 // 10 sec +#define MAX_AIO_SLEEPS 1000 // 10 sec #define AIO_SLEEP_TIME 10000 // 10 ms bool JournalImpl::loadMsgContent(u_int64_t rid, std::string& data, size_t length) @@ -321,7 +321,7 @@ const size_t this_data_len, data_tok* dtokp, const bool transient) { handleIoResult(jcntl::enqueue_data_record(data_buff, tot_data_len, this_data_len, dtokp, transient)); - + if (_mgmtObject != 0) { _mgmtObject->inc_enqueues(); @@ -334,7 +334,7 @@ const bool transient) { handleIoResult(jcntl::enqueue_extern_data_record(tot_data_len, dtokp, transient)); - + if (_mgmtObject != 0) { _mgmtObject->inc_enqueues(); @@ -347,7 +347,7 @@ const size_t this_data_len, data_tok* dtokp, const std::string& xid, const bool transient) { handleIoResult(jcntl::enqueue_txn_data_record(data_buff, tot_data_len, this_data_len, dtokp, xid, transient)); - + if (_mgmtObject != 0) { _mgmtObject->inc_enqueues(); @@ -361,7 +361,7 @@ const std::string& xid, const bool transient) { handleIoResult(jcntl::enqueue_extern_txn_data_record(tot_data_len, dtokp, xid, transient)); - + if (_mgmtObject != 0) { _mgmtObject->inc_enqueues(); @@ -374,7 +374,7 @@ JournalImpl::dequeue_data_record(data_tok* const dtokp, const bool txn_coml_commit) { handleIoResult(jcntl::dequeue_data_record(dtokp, txn_coml_commit)); - + if (_mgmtObject != 0) { _mgmtObject->inc_dequeues(); @@ -387,7 +387,7 @@ JournalImpl::dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid, const bool txn_coml_commit) { handleIoResult(jcntl::dequeue_txn_data_record(dtokp, xid, txn_coml_commit)); - + if (_mgmtObject != 0) { _mgmtObject->inc_dequeues(); @@ -400,7 +400,7 @@ JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid) { handleIoResult(jcntl::txn_abort(dtokp, xid)); - + if (_mgmtObject != 0) _mgmtObject->inc_txnAborts(); } @@ -409,7 +409,7 @@ JournalImpl::txn_commit(data_tok* const dtokp, const std::string& xid) { handleIoResult(jcntl::txn_commit(dtokp, xid)); - + if (_mgmtObject != 0) _mgmtObject->inc_txnCommits(); } Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/JournalImpl.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007, 2008 Red Hat Software + Copyright (c) 2007, 2008, 2009 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _JournalImpl_ #define _JournalImpl_ @@ -69,7 +69,7 @@ }; class JournalImpl : public qpid::broker::ExternalQueueStore, public journal::jcntl, public virtual journal::aio_callback - { + { private: static qpid::broker::Timer* journalTimerPtr; static u_int32_t cnt; @@ -77,13 +77,13 @@ bool getEventsTimerSetFlag; boost::intrusive_ptr<qpid::broker::TimerTask> getEventsFireEventsPtr; pthread_mutex_t _getf_mutex; - + u_int64_t lastReadRid; // rid of last read msg for loadMsgContent() bool writeActivityFlag; bool flushTriggeredFlag; boost::intrusive_ptr<qpid::broker::TimerTask> inactivityFireEventPtr; - + // temp local vars for loadMsgContent below void* _xidp; void* _datap; @@ -117,7 +117,7 @@ const u_int32_t wcache_pgsize_sblks) { initialize(num_jfiles, auto_expand, ae_max_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks, this); - } + } void recover(const u_int16_t num_jfiles, const bool auto_expand, @@ -144,7 +144,7 @@ } void recover_complete(); - + // Temporary fn to read and save last msg read from journal so it can be assigned // in chunks. To be replaced when coding to do this direct from the journal is ready. // Returns true if the record is extern, false if local. Modified: store/trunk/cpp/lib/Makefile.am =================================================================== --- store/trunk/cpp/lib/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# Copyright (c) 2007, 2008, 2009 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. + AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) \ -I$(srcdir)/gen -DRHM_CLEAN -pthread Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008, 2009 Red Hat, Inc. - This file is part of Red Hat Messaging. + This file is part of the Qpid async store library msgstore.so. - Red Hat Messaging 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 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. + 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 + 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. -*/ + The GNU Lesser General Public License is available in the file COPYING. + */ #include "MessageStoreImpl.h" Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008, 2009 Red Hat, Inc. - This file is part of Red Hat Messaging. + This file is part of the Qpid async store library msgstore.so. - Red Hat Messaging 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 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. + 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 + 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. -*/ + The GNU Lesser General Public License is available in the file COPYING. + */ #ifndef _MessageStoreImpl_ #define _MessageStoreImpl_ @@ -166,7 +166,7 @@ qpid::broker::RecoveryManager& recovery, qpid::broker::RecoverableQueue::shared_ptr& queue, txn_list& locked, - message_index& prepared, + message_index& prepared, long& rcnt, long& idcnt); qpid::broker::RecoverableMessage::shared_ptr getExternMessage(qpid::broker::RecoveryManager& recovery, Modified: store/trunk/cpp/lib/PreparedTransaction.cpp =================================================================== --- store/trunk/cpp/lib/PreparedTransaction.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/PreparedTransaction.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "PreparedTransaction.h" #include <algorithm> @@ -50,7 +50,7 @@ bool PreparedTransaction::isLocked(queue_id queue, message_id message) { - return (enqueues.get() && enqueues->isLocked(queue, message)) + return (enqueues.get() && enqueues->isLocked(queue, message)) || (dequeues.get() && dequeues->isLocked(queue, message)); } @@ -75,8 +75,8 @@ return txns.end(); } -PreparedTransaction::PreparedTransaction(const std::string& _xid, - LockedMappings::shared_ptr _enqueues, +PreparedTransaction::PreparedTransaction(const std::string& _xid, + LockedMappings::shared_ptr _enqueues, LockedMappings::shared_ptr _dequeues) : xid(_xid), enqueues(_enqueues), dequeues(_dequeues) {} Modified: store/trunk/cpp/lib/PreparedTransaction.h =================================================================== --- store/trunk/cpp/lib/PreparedTransaction.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/PreparedTransaction.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _PreparedTransaction_ #define _PreparedTransaction_ @@ -36,7 +36,7 @@ typedef uint64_t queue_id; typedef uint64_t message_id; - + class LockedMappings { public: @@ -65,7 +65,7 @@ const LockedMappings::shared_ptr enqueues; const LockedMappings::shared_ptr dequeues; - PreparedTransaction(const std::string& xid, LockedMappings::shared_ptr enqueues, LockedMappings::shared_ptr dequeues); + PreparedTransaction(const std::string& xid, LockedMappings::shared_ptr enqueues, LockedMappings::shared_ptr dequeues); bool isLocked(queue_id queue, message_id message); static bool isLocked(PreparedTransaction::list& txns, queue_id queue, message_id message); static PreparedTransaction::list::iterator getLockedPreparedTransaction(PreparedTransaction::list& txns, queue_id queue, message_id message); Modified: store/trunk/cpp/lib/StoreException.h =================================================================== --- store/trunk/cpp/lib/StoreException.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/StoreException.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 _StoreException_ #define _StoreException_ @@ -30,7 +30,7 @@ namespace mrg{ namespace msgstore{ -class StoreException : public std::exception +class StoreException : public std::exception { std::string text; public: @@ -40,7 +40,7 @@ virtual const char* what() const throw() { return text.c_str(); } }; -class StoreFullException : public StoreException +class StoreFullException : public StoreException { public: StoreFullException(const std::string& _text) : StoreException(_text) {} Modified: store/trunk/cpp/lib/StorePlugin.cpp =================================================================== --- store/trunk/cpp/lib/StorePlugin.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/StorePlugin.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 "qpid/broker/Broker.h" #include "qpid/Plugin.h" #include "qpid/Options.h" @@ -65,5 +65,5 @@ }; static StorePlugin instance; // Static initialization. - + }} // namespace qpid::broker Modified: store/trunk/cpp/lib/StringDbt.cpp =================================================================== --- store/trunk/cpp/lib/StringDbt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/StringDbt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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; Modified: store/trunk/cpp/lib/StringDbt.h =================================================================== --- store/trunk/cpp/lib/StringDbt.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/StringDbt.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,26 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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_ @@ -30,7 +30,7 @@ namespace mrg{ namespace msgstore{ - + class StringDbt : public Dbt { const std::string value;//holds value to be written Modified: store/trunk/cpp/lib/TxnCtxt.h =================================================================== --- store/trunk/cpp/lib/TxnCtxt.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/TxnCtxt.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008 Red Hat, Inc. - This file is part of Red Hat Messaging. + This file is part of the Qpid async store library msgstore.so. - Red Hat Messaging 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 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. + 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 + 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. -*/ + The GNU Lesser General Public License is available in the file COPYING. + */ #ifndef _TxnCtxt_ #define _TxnCtxt_ Modified: store/trunk/cpp/lib/jrnl/aio.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/aio.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,16 +1,18 @@ /** * \file aio.cpp * - * Red Hat Messaging - Message Journal + * Qpid asynchronous store plugin library * * File containing code for class mrg::journal::aio (libaio interface * encapsulation). See comments in file aio.hpp for details. * - * Copyright (C) 2007, 2008 Red Hat Inc. + * \author Kim van der Riet * - * This file is part of Red Hat Messaging. + * Copyright (c) 2007, 2008, 2009 Red Hat Inc. * - * Red Hat Messaging is free software; you can redistribute it and/or + * 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. Modified: store/trunk/cpp/lib/jrnl/aio.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/aio.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,16 +1,18 @@ /** * \file aio.hpp * - * Red Hat Messaging - Message Journal + * Qpid asynchronous store plugin library * * This file contains an encapsulation of the libaio interface used * by the journal. * - * Copyright 2007, 2008 Red Hat, Inc. +* \author Kim van der Riet * - * This file is part of Red Hat Messaging. + * Copyright (c) 2007, 2008, 2009 Red Hat, Inc. * - * Red Hat Messaging is free software; you can redistribute it and/or + * 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. Modified: store/trunk/cpp/lib/jrnl/aio_callback.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio_callback.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/aio_callback.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file aio_callback.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the definition for the AIO callback function -* pointer. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file aio_callback.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains the definition for the AIO callback function + * pointer. + * + * \author Kim van der Riet + * + * 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 mrg_journal_aio_callback_hpp #define mrg_journal_aio_callback_hpp @@ -38,7 +40,7 @@ { namespace journal { - + class data_tok; class aio_callback @@ -48,7 +50,7 @@ virtual void wr_aio_cb(std::vector<data_tok*>& dtokl) = 0; virtual void rd_aio_cb(std::vector<u_int16_t>& pil) = 0; }; - + } // namespace journal } // namespace mrg Modified: store/trunk/cpp/lib/jrnl/arr_cnt.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file arr_cnt.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::arr_cnt (enqueue map). See -* comments in file arr_cnt.hpp for details. -* -* Copyright (C) 2007, 2008 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file arr_cnt.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::arr_cnt (enqueue map). See + * comments in file arr_cnt.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/arr_cnt.hpp" Modified: store/trunk/cpp/lib/jrnl/arr_cnt.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file arr_cnt.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::arr_cnt (array counter). -* See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright (C) 2007 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file arr_cnt.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::arr_cnt (array counter). + * See class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_arr_cnt_hpp #define mrg_journal_arr_cnt_hpp Modified: store/trunk/cpp/lib/jrnl/cvar.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/cvar.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,33 @@ /** -* \file cvar.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::cvar (condition variable). See -* comments in file cvar.hpp for details. -* -* Copyright (C) 2007, 2008 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file cvar.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::cvar (condition variable). See + * comments in file cvar.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/cvar.hpp" Modified: store/trunk/cpp/lib/jrnl/cvar.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/cvar.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,33 @@ /** -* \file cvar.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains a posix condition variable class. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file cvar.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains a posix condition variable class. + * + * \author Kim van der Riet + * + * 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 mrg_journal_cvar_hpp #define mrg_journal_cvar_hpp Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file data_tok.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::data_tok (data block token). -* See comments in file data_tok.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file data_tok.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::data_tok (data block token). + * See comments in file data_tok.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/data_tok.hpp" Modified: store/trunk/cpp/lib/jrnl/data_tok.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/data_tok.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file data_tok.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::data_tok (data block token). -* See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file data_tok.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::data_tok (data block token). + * See class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_data_tok_hpp #define mrg_journal_data_tok_hpp @@ -160,7 +160,7 @@ { _xid.assign((const char*)xidp, xid_len); } void reset(); - + // debug aid std::string status_str() const; }; Modified: store/trunk/cpp/lib/jrnl/deq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file deq_hdr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::deq_hdr (dequeue record), -* used to dequeue a previously enqueued record. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file deq_hdr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::deq_hdr (dequeue record), + * used to dequeue a previously enqueued record. + * + * \author Kim van der Riet + * + * 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 mrg_journal_deq_hdr_hpp #define mrg_journal_deq_hdr_hpp @@ -132,7 +132,7 @@ */ inline static std::size_t size() { return sizeof(deq_hdr); } }; - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/deq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/deq_rec.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file deq_rec.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::deq_rec (journal dequeue -* record) class. See comments in file deq_rec.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file deq_rec.cpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::deq_rec (journal dequeue + * record) class. See comments in file deq_rec.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/deq_rec.hpp" @@ -318,8 +320,8 @@ } return size_dblks(rd_cnt); } - -bool + +bool deq_rec::rcv_decode(rec_hdr h, std::ifstream* ifsp, std::size_t& rec_offs) { if (rec_offs == 0) Modified: store/trunk/cpp/lib/jrnl/deq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/deq_rec.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file deq_rec.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::deq_rec (journal dequeue -* record) class. See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file deq_rec.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::deq_rec (journal dequeue + * record) class. See class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_deq_rec_hpp #define mrg_journal_deq_rec_hpp Modified: store/trunk/cpp/lib/jrnl/enq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file enq_hdr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::enq_hdr (enueue header), -* used to start an enqueue record in the journal. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enq_hdr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::enq_hdr (enueue header), + * used to start an enqueue record in the journal. + * + * \author Kim van der Riet + * + * 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 mrg_journal_enq_hdr_hpp #define mrg_journal_enq_hdr_hpp @@ -156,7 +156,7 @@ */ inline static std::size_t size() { return sizeof(enq_hdr); } }; - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/enq_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enq_map.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file enq_map.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::enq_map (enqueue map). See -* comments in file enq_map.hpp for details. -* -* Copyright (C) 2007, 2008 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enq_map.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::enq_map (enqueue map). See + * comments in file enq_map.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/enq_map.hpp" Modified: store/trunk/cpp/lib/jrnl/enq_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enq_map.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file enq_map.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::enq_map (enqueue map). -* See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright (C) 2007 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enq_map.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::enq_map (enqueue map). + * See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_enq_map_hpp #define mrg_journal_enq_map_hpp Modified: store/trunk/cpp/lib/jrnl/enq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enq_rec.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file enq_rec.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::enq_rec (journal enqueue -* record) class. See comments in file enq_rec.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enq_rec.cpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::enq_rec (journal enqueue + * record) class. See comments in file enq_rec.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/enq_rec.hpp" Modified: store/trunk/cpp/lib/jrnl/enq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enq_rec.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,32 @@ /** -* \file enq_rec.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::enq_rec (journal enqueue -* record) class. See class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enq_rec.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::enq_rec (journal enqueue + * record) class. See class documentation for details. + * + * 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 mrg_journal_enq_rec_hpp #define mrg_journal_enq_rec_hpp Modified: store/trunk/cpp/lib/jrnl/enums.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enums.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/enums.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,33 @@ /** -* \file enums.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing definitions for namespace mrg::journal enums. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file enums.hpp + * + * Qpid asynchronous store plugin library + * + * File containing definitions for namespace mrg::journal enums. + * + * \author Kim van der Riet + * + * 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 mrg_journal_enums_hpp #define mrg_journal_enums_hpp Modified: store/trunk/cpp/lib/jrnl/fcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/fcntl.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/fcntl.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,33 @@ /** -* \file fcntl.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::fcntl (non-logging file -* handle), used for controlling journal log files. See comments in file -* fcntl.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file fcntl.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::fcntl (non-logging file + * handle), used for controlling journal log files. See comments in file + * fcntl.hpp for details. + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/fcntl.hpp" @@ -314,7 +314,7 @@ // TODO - look at more efficient alternatives to allocating a null block: // 1. mmap() against /dev/zero, but can alignment for O_DIRECT be assured? // 2. ftruncate(), but does this result in a sparse file? If so, then this is no good. - + // Create temp null block for writing const std::size_t sblksize = JRNL_DBLK_SIZE * JRNL_SBLK_SIZE; void* nullbuf = 0; Modified: store/trunk/cpp/lib/jrnl/fcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/fcntl.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/fcntl.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,35 @@ /** -* \file fcntl.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::fcntl (non-logging file -* handle), used for controlling journal log files. See class documentation for -* details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file fcntl.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::fcntl (non-logging file + * handle), used for controlling journal log files. See class documentation for + * details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_fcntl_hpp #define mrg_journal_fcntl_hpp @@ -135,7 +137,7 @@ inline bool is_wr_compl() const { return _ffull_dblks == _wr_cmpl_cnt_dblks; } inline u_int32_t wr_aio_outstanding_dblks() const { return _wr_subm_cnt_dblks - _wr_cmpl_cnt_dblks; } inline bool wr_file_rotate() const { return is_wr_full(); } - + // Debug aid const std::string status_str() const; Modified: store/trunk/cpp/lib/jrnl/file_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/file_hdr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/file_hdr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,35 +1,35 @@ /** -* \file file_hdr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::file_hdr (file -* record header), used to start a journal file. It contains some -* file metadata and information to aid journal recovery. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file file_hdr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::file_hdr (file + * record header), used to start a journal file. It contains some + * file metadata and information to aid journal recovery. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_file_hdr_hpp #define mrg_journal_file_hdr_hpp @@ -202,7 +202,7 @@ */ inline static std::size_t size() { return sizeof(file_hdr); } }; // struct file_hdr - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/jcfg.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcfg.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jcfg.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jcfg.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains \#defines that control the implementation details of -* the journal. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jcfg.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains \#defines that control the implementation details of + * the journal. + * + * \author Kim van der Riet + * + * 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 mrg_journal_jcfg_hpp #define mrg_journal_jcfg_hpp Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file jcntl.cpp -* -* Red Hat Messaging - Message Journal -* -* Messaging journal top-level control and interface class -* mrg::journal::jcntl. See comments in file jcntl.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jcntl.cpp + * + * Qpid asynchronous store plugin library + * + * Messaging journal top-level control and interface class + * mrg::journal::jcntl. See comments in file jcntl.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/jcntl.hpp" @@ -157,7 +159,7 @@ if (_rcvdat._jfull) throw jexception(jerrno::JERR_JCNTL_RECOVERJFULL, "jcntl", "recover"); this->log(LOG_DEBUG, _rcvdat.to_log(_jid)); - + _lpmgr.recover(_rcvdat, this, &new_fcntl); _wrfc.initialize(_jfsize_sblks, &_rcvdat); @@ -166,7 +168,7 @@ _rmgr.initialize(cbp); _wmgr.initialize(cbp, wcache_pgsize_sblks, wcache_num_pages, JRNL_WMGR_MAXDTOKPP, JRNL_WMGR_MAXWAITUS, (_rcvdat._lffull ? 0 : _rcvdat._eo)); - + _readonly_flag = true; _init_flag = true; } @@ -185,7 +187,7 @@ _readonly_flag = false; } -void +void jcntl::delete_jrnl_files() { stop(true); // wait for AIO to complete @@ -384,7 +386,7 @@ while ( _emap.get_enq_cnt(ffid) == 0 && _tmap.get_txn_pfid_cnt(ffid) == 0 && ffid != fid) { if (++ffid >= _lpmgr.num_jfiles()) - ffid = 0; + ffid = 0; } if (!_rrfc.is_active()) _rrfc.set_findex(ffid); @@ -612,7 +614,7 @@ bool lowi = rd._owi; // local copy of owi to be used during analysis while (rcvr_get_next_record(fid, &ifs, lowi, rd)) ; if (ifs.is_open()) ifs.close(); - + // Remove all txns from tmap that are not in the prepared list if (prep_txn_list_ptr) { @@ -908,7 +910,7 @@ } return true; } - + bool jcntl::check_owi(const u_int16_t fid, rec_hdr& h, bool& lowi, rcvdat& rd, std::streampos& file_pos) { @@ -933,8 +935,8 @@ rd._h_rid = h._rid; return true; } - + void jcntl::check_journal_alignment(const u_int16_t fid, std::streampos& file_pos) { Modified: store/trunk/cpp/lib/jrnl/jcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jcntl.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file jcntl.hpp -* -* Red Hat Messaging - Message Journal -* -* Messaging journal top-level control and interface class -* mrg::journal::jcntl. See class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jcntl.hpp + * + * Qpid asynchronous store plugin library + * + * Messaging journal top-level control and interface class + * mrg::journal::jcntl. See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_jcntl_hpp #define mrg_journal_jcntl_hpp Modified: store/trunk/cpp/lib/jrnl/jdir.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jdir.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,35 @@ /** -* \file jdir.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::jdir (journal data -* directory), used for controlling and manipulating journal data -* direcories and files. See comments in file jdir.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jdir.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::jdir (journal data + * directory), used for controlling and manipulating journal data + * direcories and files. See comments in file jdir.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/jdir.hpp" @@ -203,7 +205,7 @@ oss << "dir=\"" << dirname << "\""; throw jexception(jerrno::JERR_JDIR_NOTDIR, oss.str(), "jdir", "verify_dir"); } - + // Read jinf file, then verify all journal files are present jinf ji(dirname + "/" + base_filename + "." + JRNL_INFO_EXTENSION, true); for (u_int16_t fnum=0; fnum < ji.num_jfiles(); fnum++) @@ -242,7 +244,7 @@ { if (errno == ENOENT) // dir does not exist. return; - + std::ostringstream oss; oss << "dir=\"" << dirname << "\"" << FORMAT_SYSERR(errno); throw jexception(jerrno::JERR_JDIR_OPENDIR, oss.str(), "jdir", "delete_dir"); @@ -302,7 +304,7 @@ oss << "dir=\"" << dirname << "\"" << FORMAT_SYSERR(errno); throw jexception(jerrno::JERR_JDIR_CLOSEDIR, oss.str(), "jdir", "delete_dir"); } - + if (!children_only) if (::rmdir(dirname.c_str())) { Modified: store/trunk/cpp/lib/jrnl/jdir.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jdir.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,35 +1,35 @@ /** -* \file jdir.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::jdir (journal data -* directory), used for controlling and manipulating journal data -* directories and files. See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jdir.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::jdir (journal data + * directory), used for controlling and manipulating journal data + * directories and files. See class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_jdir_hpp #define mrg_journal_jdir_hpp @@ -69,7 +69,7 @@ * and sub-directories. */ jdir(const std::string& dirname, const std::string& base_filename); - + virtual ~jdir(); Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jerrno.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,36 +1,36 @@ /** -* \file jerrno.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::jerrno (journal error -* codes). See comments in file jerrno.hpp for details. -* -* See file jerrno.hpp for class details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jerrno.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::jerrno (journal error + * codes). See comments in file jerrno.hpp for details. + * + * See file jerrno.hpp for class details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/jerrno.hpp" Modified: store/trunk/cpp/lib/jrnl/jerrno.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jerrno.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jerrno.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::jerrno (journal error -* codes). See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jerrno.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::jerrno (journal error + * codes). See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_jerrno_hpp #define mrg_journal_jerrno_hpp @@ -114,7 +114,7 @@ // class jrec, enq_rec, deq_rec, txn_rec static const u_int32_t JERR_JREC_BADRECHDR; ///< Invalid data record header static const u_int32_t JERR_JREC_BADRECTAIL; ///< Invalid data record tail - + // class wmgr static const u_int32_t JERR_WMGR_BADPGSTATE; ///< Page buffer in illegal state. static const u_int32_t JERR_WMGR_BADDTOKSTATE; ///< Data token in illegal state. Modified: store/trunk/cpp/lib/jrnl/jexception.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jexception.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jexception.cpp -* -* Red Hat Messaging - Message Journal -* -* Generic journal exception class mrg::journal::jexception. See comments -* in file jexception.hpp for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jexception.cpp + * + * Qpid asynchronous store plugin library + * + * Generic journal exception class mrg::journal::jexception. See comments + * in file jexception.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/jexception.hpp" Modified: store/trunk/cpp/lib/jrnl/jexception.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jexception.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,36 @@ /** -* \file jexception.hpp -* -* Red Hat Messaging - Message Journal -* -* Generic journal exception class mrg::journal::jexception (derived -* from class std::exception). Intended to serve as a common exception -* class for all more speicalized exceptions in the message journal. See -* class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jexception.hpp + * + * Qpid asynchronous store plugin library + * + * Generic journal exception class mrg::journal::jexception (derived + * from class std::exception). Intended to serve as a common exception + * class for all more speicalized exceptions in the message journal. See + * class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_jrnl_exception_hpp #define mrg_journal_jrnl_exception_hpp @@ -61,7 +63,7 @@ oss << pfn << " failed: " << FORMAT_SYSERR(err); \ throw jexception(jerrno::JERR__PTHREAD, oss.str(), cls, fn); \ } - + namespace mrg { namespace journal Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,35 @@ /** -* \file jinf.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::jinf class. -* -* See jinf.hpp comments for details of this class. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file jinf.cpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::jinf class. + * + * See jinf.hpp comments for details of this class. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/jinf.hpp" @@ -357,7 +359,7 @@ oss << " </cache_geometry>" << std::endl; oss << "</jrnl>" << std::endl; return oss.str(); -} +} void jinf::read(const std::string& jinf_filename) Modified: store/trunk/cpp/lib/jrnl/jinf.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jinf.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jinf.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::jinf class. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ - + * \file jinf.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::jinf class. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_jinf_hpp #define mrg_journal_jinf_hpp Modified: store/trunk/cpp/lib/jrnl/jrec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jrec.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jrec.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing source code for class mrg::journal::jrec (abstract journal -* jrecord). See comments in file jrec.hpp for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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 jreceived 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. -*/ + * \file jrec.cpp + * + * Qpid asynchronous store plugin library + * + * File containing source code for class mrg::journal::jrec (abstract journal + * jrecord). See comments in file jrec.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/jrec.hpp" Modified: store/trunk/cpp/lib/jrnl/jrec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/jrec.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file jrec.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing source code for class mrg::journal::jrec (abstract journal -* jrecord). See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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 jreceived 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. -*/ + * \file jrec.hpp + * + * Qpid asynchronous store plugin library + * + * File containing source code for class mrg::journal::jrec (abstract journal + * jrecord). See class documentation for details. + * + * \author Kim van der Riet + * + * 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 jreceived 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 mrg_journal_jrec_hpp #define mrg_journal_jrec_hpp Modified: store/trunk/cpp/lib/jrnl/lp_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/lp_map.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/lp_map.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file lp_map.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::lp_map (logical file map). See -* comments in file lp_map.hpp for details. -* -* Copyright (C) 2008, 2009 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file lp_map.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::lp_map (logical file map). See + * comments in file lp_map.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 "jrnl/lp_map.hpp" Modified: store/trunk/cpp/lib/jrnl/lp_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/lp_map.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/lp_map.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file lp_map.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::lp_map (logical file map). -* See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright (C) 2008, 2009 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file lp_map.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::lp_map (logical file map). + * See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 mrg_journal_lp_map_hpp #define mrg_journal_lp_map_hpp Modified: store/trunk/cpp/lib/jrnl/lpmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/lpmgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/lpmgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,35 @@ /** -* \file lpmgr.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::lpmgr (non-logging file -* handle), used for controlling journal log files. See comments in file -* lpmgr.hpp for details. -* -* Copyright 2008, 2009 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file lpmgr.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::lpmgr (non-logging file + * handle), used for controlling journal log files. See comments in file + * lpmgr.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 "jrnl/lpmgr.hpp" Modified: store/trunk/cpp/lib/jrnl/lpmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/lpmgr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/lpmgr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,33 @@ /** -* \file lpmgr.hpp -* -* Red Hat Messaging - Message Journal -* -* Class mrg::journal::lpmgr. See class documentation for details. -* -* Copyright 2008, 2009 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file lpmgr.hpp + * + * Qpid asynchronous store plugin library + * + * Class mrg::journal::lpmgr. See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 mrg_journal_lpmgr_hpp #define mrg_journal_lpmgr_hpp @@ -75,7 +77,7 @@ * lfid --> | 0 | 1 | 2 | 3 | 4 | 5 | lfid --> | 0 | 1 | 2 | 3 | 4 | 5 | * +---+---+---+---+---+---+ +---+---+---+---+---+---+ * </pre> - * + * * After insertion of 2 files after lid 2 (marked with *s): * <pre> * Logical view (sorted by lfid): Physical view (sorted by pfid): @@ -102,7 +104,7 @@ * owi --> | t | t | t | f | f | f | owi --> | t | t | t | f | f | f | * +---+---+---+---+---+---+ +---+---+---+---+---+---+ * </pre> - * + * * After inserting 2 files after lfid 2 and then 3 (the newly inserted file) - marked with *s: * <pre> * Logical view (sorted by lfid): Physical view (sorted by pfid): @@ -292,7 +294,7 @@ void append(jcntl* const jcp, new_obj_fn_ptr fp, const u_int16_t num_jfiles = 1); - + }; } // namespace journal Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/pmgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file pmgr.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::pmgr (page manager). See -* comments in file pmgr.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file pmgr.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::pmgr (page manager). See + * comments in file pmgr.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/pmgr.hpp" Modified: store/trunk/cpp/lib/jrnl/pmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/pmgr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file pmgr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::pmgr (page manager). See -* class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file pmgr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::pmgr (page manager). See + * class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_pmgr_hpp #define mrg_journal_pmgr_hpp Modified: store/trunk/cpp/lib/jrnl/rcvdat.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rcvdat.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rcvdat.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,33 +1,33 @@ /** -* \file rcvdat.hpp -* -* Red Hat Messaging - Message Journal -* -* Contains structure for recovery status and offset data. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rcvdat.hpp + * + * Qpid asynchronous store plugin library + * + * Contains structure for recovery status and offset data. + * + * \author Kim van der Riet + * + * 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 mrg_journal_rcvdat_hpp #define mrg_journal_rcvdat_hpp Modified: store/trunk/cpp/lib/jrnl/rec_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,35 +1,35 @@ /** -* \file rec_hdr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rec_hdr (record header), -* which is a common initial header used for all journal record structures -* except the record tail (rec_tail). -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rec_hdr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rec_hdr (record header), + * which is a common initial header used for all journal record structures + * except the record tail (rec_tail). + * + * \author Kim van der Riet + * + * 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 mrg_journal_rec_hdr_hpp #define mrg_journal_rec_hdr_hpp @@ -75,7 +75,7 @@ u_int8_t _eflag; ///< Flag for determining endianness u_int16_t _uflag; ///< User-defined flags u_int64_t _rid; ///< Record ID (rotating 64-bit counter) - + // Global flags static const u_int16_t HDR_OVERWRITE_INDICATOR_MASK = 0x1; @@ -134,7 +134,7 @@ */ inline static std::size_t size() { return sizeof(rec_hdr); } }; // struct rec_hdr - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/rec_tail.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_tail.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rec_tail.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,35 +1,35 @@ /** -* \file rec_tail.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rec_tail (record tail), used to -* finalize a persistent record. The presence of a valid tail at the expected -* position in the journal file indicates that the record write was completed. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rec_tail.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rec_tail (record tail), used to + * finalize a persistent record. The presence of a valid tail at the expected + * position in the journal file indicates that the record write was completed. + * + * \author Kim van der Riet + * + * 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 mrg_journal_rec_tail_hpp #define mrg_journal_rec_tail_hpp @@ -89,7 +89,7 @@ */ inline static std::size_t size() { return sizeof(rec_tail); } }; - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/rfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rfc.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rfc.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file rfc.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rfc (rotating -* file controller). See comments in file rfc.hpp for details. -* -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rfc.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rfc (rotating + * file controller). See comments in file rfc.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 "jrnl/rfc.hpp" Modified: store/trunk/cpp/lib/jrnl/rfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rfc.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rfc.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file rfc.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rfc (rotating -* file controller). See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rfc.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rfc (rotating + * file controller). See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2008, 2009 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 mrg_journal_rfc_hpp #define mrg_journal_rfc_hpp @@ -182,7 +182,7 @@ virtual inline bool is_compl() const = 0; virtual inline u_int32_t aio_outstanding_dblks() const = 0; virtual inline bool file_rotate() const = 0; - + // Debug aid virtual std::string status_str() const; }; // class rfc Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file rmgr.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rmgr (read manager). See -* comments in file rmgr.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rmgr.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rmgr (read manager). See + * comments in file rmgr.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/rmgr.hpp" Modified: store/trunk/cpp/lib/jrnl/rmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rmgr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file rmgr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rmgr (read manager). See -* class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rmgr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rmgr (read manager). See + * class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_rmgr_hpp #define mrg_journal_rmgr_hpp @@ -80,7 +82,7 @@ void recover_complete(); inline iores synchronize() { if (_rrfc.is_valid()) return RHM_IORES_SUCCESS; return aio_cycle(); } void invalidate(); - + /* TODO (if required) const iores get(const u_int64_t& rid, const std::size_t& dsize, const std::size_t& dsize_avail, const void** const data, bool auto_discard); Modified: store/trunk/cpp/lib/jrnl/rrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rrfc.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file rrfc.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rrfc (rotating -* file controller). See comments in file rrfc.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rrfc.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rrfc (rotating + * file controller). See comments in file rrfc.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/rrfc.hpp" Modified: store/trunk/cpp/lib/jrnl/rrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/rrfc.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file rrfc.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rrfc (rotating -* file controller). See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file rrfc.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rrfc (rotating + * file controller). See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_rrfc_hpp #define mrg_journal_rrfc_hpp @@ -164,7 +164,7 @@ inline u_int32_t aio_outstanding_dblks() const { return _curr_fc->rd_aio_outstanding_dblks(); } inline bool file_rotate() const { return _curr_fc->rd_file_rotate(); } inline bool is_wr_aio_outstanding() const { return _curr_fc->wr_aio_outstanding_dblks() > 0; } - + // Debug aid std::string status_str() const; Modified: store/trunk/cpp/lib/jrnl/slock.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/slock.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,33 @@ /** -* \file slock.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::slock (scoped lock). See -* comments in file slock.hpp for details. -* -* Copyright (C) 2007, 2008 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file slock.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::slock (scoped lock). See + * comments in file slock.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/slock.hpp" Modified: store/trunk/cpp/lib/jrnl/slock.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/slock.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file slock.hpp -* -* Red Hat Messaging - Message Journal -* -* Messaging journal scoped lock class mrg::journal::slock and scoped try-lock -* class mrg::journal::stlock. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file slock.hpp + * + * Qpid asynchronous store plugin library + * + * Messaging journal scoped lock class mrg::journal::slock and scoped try-lock + * class mrg::journal::stlock. + * + * \author Kim van der Riet + * + * 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 mrg_journal_slock_hpp #define mrg_journal_slock_hpp Modified: store/trunk/cpp/lib/jrnl/time_ns.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/time_ns.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/time_ns.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,27 +1,34 @@ /** -* \file time_ns.cpp -* -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file time_ns.cpp + * + * Qpid asynchronous store plugin library + * + * Messaging journal time struct mrg::journal::time_ns, derived from + * the ::timespec struct and provided with helper functions. + * + * \author Kim van der Riet + * + * Copyright (c) 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 "time_ns.hpp" Modified: store/trunk/cpp/lib/jrnl/time_ns.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/time_ns.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/time_ns.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,27 +1,35 @@ /** -* \file time_ns.hpp -* -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file time_ns.hpp + * + * Qpid asynchronous store plugin library + * + * Messaging journal time struct mrg::journal::time_ns, derived from + * the ::timespec struct and provided with helper functions. + * + * \author Kim van der Riet + * + * Copyright (c) 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 mrg_jtt_time_ns_hpp #define mrg_jtt_time_ns_hpp @@ -90,7 +98,7 @@ inline bool operator<=(const time_ns& rhs) { if(tv_sec == rhs.tv_sec) return tv_nsec <= rhs.tv_nsec; return tv_sec <= rhs.tv_sec; } }; - + } // namespace journal } // namespace mrg Modified: store/trunk/cpp/lib/jrnl/txn_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file txn_hdr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::txn_hdr (transaction -* record header), used to start a transaction (commit or abort) record. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file txn_hdr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::txn_hdr (transaction + * record header), used to start a transaction (commit or abort) record. + * + * \author Kim van der Riet + * + * 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 mrg_journal_txn_hdr_hpp #define mrg_journal_txn_hdr_hpp @@ -116,7 +116,7 @@ */ inline static std::size_t size() { return sizeof(txn_hdr); } }; - + #pragma pack() } // namespace journal Modified: store/trunk/cpp/lib/jrnl/txn_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/txn_map.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file txn_map.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::txn_map (transaction map). See -* comments in file txn_map.hpp for details. -* -* Copyright (C) 2007, 2008 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file txn_map.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::txn_map (transaction map). See + * comments in file txn_map.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/txn_map.hpp" Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file txn_map.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::txn_map (transaction map). -* See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright (C) 2007 Red Hat Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file txn_map.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::txn_map (transaction map). + * See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_txn_map_hpp #define mrg_journal_txn_map_hpp Modified: store/trunk/cpp/lib/jrnl/txn_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/txn_rec.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file txn_rec.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::txn_rec (journal dequeue -* record) class. See comments in file txn_rec.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file txn_rec.cpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::txn_rec (journal dequeue + * record) class. See comments in file txn_rec.hpp for details. + * + * \author Kim van der Riet + * + * 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 "jrnl/txn_rec.hpp" @@ -311,7 +313,7 @@ return size_dblks(rd_cnt); } -bool +bool txn_rec::rcv_decode(rec_hdr h, std::ifstream* ifsp, std::size_t& rec_offs) { if (rec_offs == 0) Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,34 +1,34 @@ /** -* \file txn_rec.hpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the code for the mrg::journal::txn_rec (journal data -* record) class. See class documentation for details. -* -* \author Kim van der Riet -* -* Copyright 2007 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file txn_rec.hpp + * + * Qpid asynchronous store plugin library + * + * This file contains the code for the mrg::journal::txn_rec (journal data + * record) class. See class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_txn_rec_hpp #define mrg_journal_txn_rec_hpp Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file wmgr.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::wmgr (read manager). See -* comments in file wmgr.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file wmgr.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::wmgr (read manager). See + * comments in file wmgr.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/wmgr.hpp" @@ -122,7 +124,7 @@ { if (xid_len) assert(xid_ptr != 0); - + if (_deq_busy || _abort_busy || _commit_busy) return RHM_IORES_BUSY; @@ -526,7 +528,7 @@ } } } - } + } if (dtokp->wstate() >= data_tok::ABORT_SUBM) _abort_busy = false; return res; @@ -661,7 +663,7 @@ } } } - } + } if (dtokp->wstate() >= data_tok::COMMIT_SUBM) _commit_busy = false; return res; @@ -877,7 +879,7 @@ fcntlp->add_wr_cmpl_cnt_dblks(JRNL_SBLK_SIZE); fcntlp->decr_aio_cnt(); fcntlp->set_wr_fhdr_aio_outstanding(false); - } + } } return tot_data_toks; Modified: store/trunk/cpp/lib/jrnl/wmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/wmgr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file wmgr.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::wmgr (read manager). See -* class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file wmgr.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::wmgr (read manager). See + * class documentation for details. + * + * \author Kim van der Riet + * + * 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 mrg_journal_wmgr_hpp #define mrg_journal_wmgr_hpp @@ -118,7 +120,7 @@ inline bool curr_pg_blocked() const { return _page_cb_arr[_pg_index]._state != UNUSED; } inline bool curr_file_blocked() const { return _wrfc.aio_cnt() > 0; } inline u_int32_t unflushed_dblks() { return _cached_offset_dblks; } - + // Debug aid const std::string status_str() const; Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file wrfc.cpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::rrfc (rotating -* file controller). See comments in file rrfc.hpp for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file wrfc.cpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::rrfc (rotating + * file controller). See comments in file rrfc.hpp for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 "jrnl/wrfc.hpp" Modified: store/trunk/cpp/lib/jrnl/wrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/jrnl/wrfc.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,32 +1,34 @@ /** -* \file wrfc.hpp -* -* Red Hat Messaging - Message Journal -* -* File containing code for class mrg::journal::wrfc (write rotating -* file controller). See class documentation for details. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ + * \file wrfc.hpp + * + * Qpid asynchronous store plugin library + * + * File containing code for class mrg::journal::wrfc (write rotating + * file controller). See class documentation for details. + * + * \author Kim van der Riet + * + * Copyright (c) 2007, 2008, 2009 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 mrg_journal_wrfc_hpp #define mrg_journal_wrfc_hpp @@ -140,7 +142,7 @@ inline bool is_compl() const { return _curr_fc->is_wr_compl(); }; inline u_int32_t aio_outstanding_dblks() const { return _curr_fc->wr_aio_outstanding_dblks(); } inline bool file_rotate() const { return _curr_fc->wr_file_rotate(); } - + // Debug aid std::string status_str() const; }; Modified: store/trunk/cpp/lib/qmf-schema.xml =================================================================== --- store/trunk/cpp/lib/qmf-schema.xml 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/lib/qmf-schema.xml 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,8 +1,28 @@ <schema package="com.redhat.rhm.store"> <!-- - License Text ---> + 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. + --> + <class name="Store"> <property name="brokerRef" type="objId" access="RO" references="qpid.Broker" index="y" parentRef="y"/> <property name="location" type="sstr" access="RO" desc="Logical directory on disk"/> Modified: store/trunk/cpp/rhel4-support/Makefile =================================================================== --- store/trunk/cpp/rhel4-support/Makefile 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/rhel4-support/Makefile 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# 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. + .PHONY: default apply default: Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# 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. + abs_builddir=@abs_builddir@ abs_srcdir=@abs_srcdir@ Modified: store/trunk/cpp/tests/MessageUtils.h =================================================================== --- store/trunk/cpp/tests/MessageUtils.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/MessageUtils.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,26 +1,25 @@ /* - Copyright (C) 2007 Red Hat Software + Copyright (c) 2007, 2008, 2009 Red Hat, Inc. - This file is part of Red Hat Messaging. - - Red Hat Messaging 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 file is part of the Qpid async store library msgstore.so. - This file 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. + 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. - 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 + 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. - The GNU Lesser General Public License is available in the file COPYING. -*/ + 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 <qpid/broker/Message.h> #include <qpid/framing/AMQFrame.h> @@ -32,7 +31,7 @@ struct MessageUtils { - static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, + static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, const Uuid& messageId=Uuid(), uint64_t contentSize = 0) { boost::intrusive_ptr<Message> msg(new Message()); @@ -43,7 +42,7 @@ msg->getFrames().append(method); msg->getFrames().append(header); MessageProperties* props = msg->getFrames().getHeaders()->get<MessageProperties>(true); - props->setContentLength(contentSize); + props->setContentLength(contentSize); props->setMessageId(messageId); msg->getFrames().getHeaders()->get<DeliveryProperties>(true)->setRoutingKey(routingKey); return msg; Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/OrderingTest.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,30 +1,26 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + Copyright (c) 2007, 2008, 2009 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 "unit_test.h" #include "MessageStoreImpl.h" @@ -78,7 +74,7 @@ boost::intrusive_ptr<Message> msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); - + queue->deliver(msg); } @@ -116,11 +112,11 @@ } void check() -{ +{ BOOST_REQUIRE(queue); BOOST_CHECK_EQUAL((u_int32_t) ids.size(), queue->getMessageCount()); while (pop()) ;//keeping popping 'till all messages are dequeued - BOOST_CHECK_EQUAL((u_int32_t) 0, queue->getMessageCount()); + BOOST_CHECK_EQUAL((u_int32_t) 0, queue->getMessageCount()); BOOST_CHECK_EQUAL((size_t) 0, ids.size()); } Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/SimpleTest.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,30 +1,26 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + Copyright (c) 2007, 2008, 2009 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 "unit_test.h" #include "MessageStoreImpl.h" @@ -61,7 +57,7 @@ struct DummyHandler : OutputHandler { - std::vector<AMQFrame> frames; + std::vector<AMQFrame> frames; virtual void send(AMQFrame& frame){ frames.push_back(frame); @@ -91,7 +87,7 @@ recover(store, queues, exchanges, links); } -void bindAndUnbind(const string& exchangeName, const string& queueName, +void bindAndUnbind(const string& exchangeName, const string& queueName, const string& key, const FieldTable& args) { { @@ -283,7 +279,7 @@ boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, routingKey, messageId, 14); MessageUtils::addContent(msg, data1); MessageUtils::addContent(msg, data2); - + msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); FieldTable table; table.setString("abc", "xyz"); @@ -308,7 +304,7 @@ BOOST_CHECK_EQUAL((uint8_t) PERSISTENT, msg->getProperties<DeliveryProperties>()->getDeliveryMode()); BOOST_REQUIRE(Str16Value("xyz") == *msg->getProperties<MessageProperties>()->getApplicationHeaders().get("abc")); BOOST_CHECK_EQUAL((u_int64_t) 14, msg->contentSize()); - + DummyHandler handler; QueuedMessage qm(queue.get(),msg,0); MessageUtils::deliver(qm, handler, 100); @@ -343,7 +339,7 @@ boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, routingKey, messageId, 7); MessageUtils::addContent(msg, data); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); - + QueuedMessage qm; qm.payload = msg; queue->enqueue(0, msg); @@ -387,7 +383,7 @@ table.setString("abc", "xyz"); msg->getProperties<MessageProperties>()->setApplicationHeaders(table); store.stage(pmsg); - + //append to it msg->releaseContent(&store);//ensure that data is not held in memory but is appended to disk when added store.appendContent(cpmsg, data1); @@ -402,7 +398,7 @@ //load it (without recovery) DummyHandler handler; QueuedMessage qm(queue.get(), msg, 0); - //52 chars of data, i.e. 2 chunks of 20 and one of 12 + //52 chars of data, i.e. 2 chunks of 20 and one of 12 MessageUtils::deliver(qm, handler, 20); BOOST_REQUIRE(handler.frames.size() > 1); string loaded; @@ -442,12 +438,12 @@ BOOST_REQUIRE(Str16Value("xyz") == *msg->getProperties<MessageProperties>()->getApplicationHeaders().get("abc")); BOOST_CHECK_EQUAL((u_int64_t) (data1.size() + data2.size()), msg->getFrames().getHeaders()->getContentLength()); - BOOST_CHECK_EQUAL((u_int64_t) 0, msg->contentSize());//ensure it is being lazily loaded + BOOST_CHECK_EQUAL((u_int64_t) 0, msg->contentSize());//ensure it is being lazily loaded //load lazily DummyHandler handler; QueuedMessage qm(queue.get(),msg,0); - //52 chars of data, i.e. 2 chunks of 20 and one of 12 + //52 chars of data, i.e. 2 chunks of 20 and one of 12 MessageUtils::deliver(qm, handler, 20); BOOST_REQUIRE(handler.frames.size() > 1); @@ -473,13 +469,13 @@ MessageStoreImpl store; store.init(test_dir, 4, 1, 8); store.truncate();//make sure it is empty to begin with - + const string data("abcdefg"); boost::intrusive_ptr<Message> msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(msg); intrusive_ptr<const PersistableMessage> cpmsg = static_pointer_cast<const PersistableMessage>(msg); MessageUtils::addContent(msg, data); - + store.stage(pmsg); store.destroy(*pmsg); @@ -501,7 +497,7 @@ MessageStoreImpl store; store.init(test_dir, 4, 1, 8); store.truncate();//make sure it is empty to begin with - + const string data("abcdefg"); boost::intrusive_ptr<Message> msg(MessageUtils::createMessage("my_exchange", "my_routing_key", "my_message", data.length())); intrusive_ptr<PersistableMessage> pmsg = static_pointer_cast<PersistableMessage>(msg); @@ -510,7 +506,7 @@ Queue queue("my_queue", 0, &store, 0); store.create(queue, qpid::framing::FieldTable()); - + store.enqueue(0, pmsg, queue); store.destroy(*pmsg); @@ -644,7 +640,7 @@ QueueRegistry queues; LinkRegistry links(0); - //ensure recovery works ok: + //ensure recovery works ok: recover(store, queues, exchanges, links); try { Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,30 +1,26 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + Copyright (c) 2007, 2008, 2009 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 "unit_test.h" #include "MessageStoreImpl.h" @@ -119,7 +115,7 @@ FieldTable settings; queueA = Queue::shared_ptr(new Queue(nameA, 0, store.get(), 0)); queueA->create(settings); - queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); + queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); queueB->create(settings); } @@ -149,13 +145,13 @@ boost::intrusive_ptr<Message> createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") { boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, key); - msg->getProperties<MessageProperties>()->setCorrelationId(id); + msg->getProperties<MessageProperties>()->setCorrelationId(id); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); return msg; } void checkMsg(Queue::shared_ptr& queue, u_int32_t size, const string& msgid = "<none>") -{ +{ BOOST_REQUIRE(queue); BOOST_CHECK_EQUAL(size, queue->getMessageCount()); if (size > 0) { @@ -192,10 +188,10 @@ // Check outcome BOOST_REQUIRE(queueA); BOOST_REQUIRE(queueB); - + Queue::shared_ptr x;//the queue from which the message was swapped Queue::shared_ptr y;//the queue on which the message is expected to be - + if (commit) { x = queueA; y = queueB; @@ -203,7 +199,7 @@ x = queueB; y = queueA; } - + checkMsg(x, 0); checkMsg(y, 1, "Message"); checkMsg(y, 0); Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp =================================================================== --- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,30 +1,26 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + Copyright (c) 2007, 2008, 2009 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 "unit_test.h" #include "MessageStoreImpl.h" @@ -89,17 +85,17 @@ public: Enqueue(TwoPhaseCommitTest* const test_): test(test_) {} void init() {} - void run(TPCTransactionContext* txn) { - msg1 = test->enqueue(txn, "Enqueue1", test->queueA); - msg2 = test->enqueue(txn, "Enqueue2", test->queueA); - msg3 = test->enqueue(txn, "Enqueue3", test->queueA); + void run(TPCTransactionContext* txn) { + msg1 = test->enqueue(txn, "Enqueue1", test->queueA); + msg2 = test->enqueue(txn, "Enqueue2", test->queueA); + msg3 = test->enqueue(txn, "Enqueue3", test->queueA); } - void check(bool committed) { + void check(bool committed) { if (committed) { test->checkMsg(test->queueA, 3, "Enqueue1"); test->checkMsg(test->queueA, 2, "Enqueue2"); test->checkMsg(test->queueA, 1, "Enqueue3"); - } + } test->checkMsg(test->queueA, 0); } }; @@ -113,21 +109,21 @@ public: Dequeue(TwoPhaseCommitTest* const test_): test(test_) {} void init() { - msg1 = test->deliver("Dequeue1", test->queueA); - msg2 = test->deliver("Dequeue2", test->queueA); - msg3 = test->deliver("Dequeue3", test->queueA); + msg1 = test->deliver("Dequeue1", test->queueA); + msg2 = test->deliver("Dequeue2", test->queueA); + msg3 = test->deliver("Dequeue3", test->queueA); } - void run(TPCTransactionContext* txn) { - test->dequeue(txn, test->queueA); - test->dequeue(txn, test->queueA); - test->dequeue(txn, test->queueA); + void run(TPCTransactionContext* txn) { + test->dequeue(txn, test->queueA); + test->dequeue(txn, test->queueA); + test->dequeue(txn, test->queueA); } - void check(bool committed) { + void check(bool committed) { if (!committed) { test->checkMsg(test->queueA, 3, "Dequeue1"); test->checkMsg(test->queueA, 2, "Dequeue2"); test->checkMsg(test->queueA, 1, "Dequeue3"); - } + } test->checkMsg(test->queueA, 0); } }; @@ -234,11 +230,11 @@ dtxmgr->rollback("my-xid"); } - swap.check(commit); + swap.check(commit); restart<MessageStoreImpl>(); swap.check(commit); } - + void testMultiQueueTxn(const unsigned num_queues_rem, const bool complete_prepared_list, const bool commit) { setup<TestMessageStore>(); @@ -251,7 +247,7 @@ // As the commits and aborts should happen through DtxManager, and it is too complex to // pass all these test params through, we bypass DtxManager and use the store directly. // This will prevent the queues from seeing committed txns, however. To test the success - // or failure of + // or failure of static_cast<TestTPCTxnCtxt*>(txn.get())->setCompleteFailure(num_queues_rem, complete_prepared_list); if (commit) store->commit(*txn); @@ -320,7 +316,7 @@ boost::intrusive_ptr<Message> deliver(const string& msgid, Queue::shared_ptr& queue) { - msg4 = createMessage(msgid); + msg4 = createMessage(msgid); queue->deliver(msg4); return msg4; } @@ -336,14 +332,14 @@ FieldTable settings; queueA = Queue::shared_ptr(new Queue(nameA, 0, store.get(), 0)); queueA->create(settings); - queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); + queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); queueB->create(settings); } boost::intrusive_ptr<Message> createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") { boost::intrusive_ptr<Message> msg = MessageUtils::createMessage(exchange, key); - msg->getProperties<MessageProperties>()->setCorrelationId(id); + msg->getProperties<MessageProperties>()->setCorrelationId(id); msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT); return msg; } @@ -373,7 +369,7 @@ } void checkMsg(Queue::shared_ptr& queue, u_int32_t size, const string& msgid = "<none>") - { + { BOOST_REQUIRE(queue); BOOST_CHECK_EQUAL(size, queue->getMessageCount()); if (size > 0) { @@ -384,13 +380,13 @@ } void swapCheck(bool swapped, const string& msgid, Queue::shared_ptr& from, Queue::shared_ptr& to) - { + { BOOST_REQUIRE(from); BOOST_REQUIRE(to); - + Queue::shared_ptr x; //the queue from which the message was swapped Queue::shared_ptr y; //the queue on which the message is expected to be - + if (swapped) { x = from; y = to; @@ -470,42 +466,42 @@ { recoverPrepared(false); } - + void testMultiQueueCommit() { testMultiQueueTxn(2, true, true); } - + void testMultiQueueAbort() { testMultiQueueTxn(2, true, false); } - + void testMultiQueueNoQueueCommitRecover() { testMultiQueueTxn(0, false, true); } - + void testMultiQueueNoQueueAbortRecover() { testMultiQueueTxn(0, false, false); } - + void testMultiQueueSomeQueueCommitRecover() { testMultiQueueTxn(1, false, true); } - + void testMultiQueueSomeQueueAbortRecover() { testMultiQueueTxn(1, false, false); } - + void testMultiQueueAllQueueCommitRecover() { testMultiQueueTxn(2, false, true); } - + void testMultiQueueAllQueueAbortRecover() { testMultiQueueTxn(2, false, false); Modified: store/trunk/cpp/tests/clean.sh =================================================================== --- store/trunk/cpp/tests/clean.sh 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/clean.sh 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,15 +1,15 @@ #!/bin/bash # -# Copyright (C) 2008 Red Hat Software +# Copyright (c) 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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 file is distributed in the hope that it will be useful, +# 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. @@ -21,7 +21,8 @@ # # The GNU Lesser General Public License is available in the file COPYING. -# This scrip cleans up any previous database and journal files, and should + +# This script cleans up any previous database and journal files, and should # be run prior to the store system tests, as these are prone to crashing or # hanging under some circumstances if the database is old or inconsistent. Modified: store/trunk/cpp/tests/jrnl/Makefile.am =================================================================== --- store/trunk/cpp/tests/jrnl/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,8 +1,8 @@ -# Copyright (C) 2007, 2008 Red Hat Inc. +# Copyright (c) 2007, 2008, 2009 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/tests/jrnl/_st_auto_expand.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_auto_expand.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_auto_expand.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" #include <cmath> @@ -52,7 +48,7 @@ test_jrnl jc(test_name, test_dir, test_name); jc.initialize(NUM_DEFAULT_JFILES, false, 0, DEFAULT_JFSIZE_SBLKS); unsigned m; - + // Fill journal to just below threshold u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, LARGE_MSG_REC_SIZE_DBLKS); @@ -77,7 +73,7 @@ test_jrnl jc(test_name, test_dir, test_name); jc.initialize(NUM_DEFAULT_JFILES, false, 0, DEFAULT_JFSIZE_SBLKS); unsigned m; - + // Fill journal to just below threshold u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, LARGE_MSG_REC_SIZE_DBLKS); @@ -114,7 +110,7 @@ test_jrnl jc(test_name, test_dir, test_name); jc.initialize(NUM_DEFAULT_JFILES, false, 0, DEFAULT_JFSIZE_SBLKS); unsigned m; - + // Fill journal to just below threshold u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, LARGE_MSG_REC_SIZE_DBLKS); Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" #include <cmath> @@ -364,7 +360,7 @@ test_jrnl jc(test_name, test_dir, test_name); jc.initialize(NUM_DEFAULT_JFILES, false, 0, DEFAULT_JFSIZE_SBLKS); unsigned m; - + // Fill journal to just below threshold u_int32_t t = num_msgs_to_threshold(NUM_DEFAULT_JFILES, DEFAULT_JFSIZE_SBLKS * JRNL_SBLK_SIZE, MSG_REC_SIZE_DBLKS); Modified: store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" #include <cmath> Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2008, 2009 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. + */ // NOTE: This file is included in _st_*.cpp files inside the QPID_AUTO_TEST_SUITE() // definition. @@ -251,7 +247,7 @@ _oldest_lfid += num_files; _map.insert(lppair(fh._lfid, fh)); } - } + } // Add new file headers u_int16_t pfid = num_jfiles_before_append; @@ -308,7 +304,7 @@ if (itr == _map.end()) BOOST_FAIL("check(): Unable to find pfid=" << (_num_used_files - 1) << " in map."); const u_int16_t lfid_stop = itr->second._lfid; - + std::size_t fidl_index = 0; for (u_int16_t lfid_cnt = lfid_start; lfid_cnt < lfid_stop; lfid_cnt++, fidl_index++) { @@ -496,7 +492,7 @@ of.write((const char*)&fh, cnt); if (of.fail() || of.bad()) BOOST_FAIL("Error writing file header to test journal file \"" << filename << "\"."); - + // fill remaining sblk with 0s while (cnt++ < JRNL_DBLK_SIZE * JRNL_SBLK_SIZE) { Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" #include <cmath> @@ -254,7 +250,7 @@ { { string msg; - + test_jrnl jc(test_name, test_dir, test_name); jc.initialize(NUM_TEST_JFILES, false, 0, TEST_JFSIZE_SBLKS); for (int m=0; m<NUM_MSGS; m++) Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,29 +1,25 @@ -/** -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" #include <cmath> Modified: store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_enq_map.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" Modified: store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_enq_map.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2007, 2008, 2009 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 "../unit_test.h" @@ -66,7 +60,7 @@ e2.insert_pfid(rid, pfid); BOOST_CHECK(!e2.empty()); BOOST_CHECK_EQUAL(e2.size(), u_int32_t(128)); - + // get u_int64_t rid_incr_2 = 6ULL; for (u_int64_t rid = rid_begin; rid < rid_end; rid += rid_incr_2) @@ -179,7 +173,7 @@ BOOST_ERROR("Failed to throw exception when locking non-existent rid."); } catch (const jexception& e) { BOOST_CHECK_EQUAL(e.err_code(), jerrno::JERR_MAP_NOTFOUND); } - + // get / unlock for (u_int64_t rid = rid_begin; rid < rid_end; rid += rid_incr_1) { @@ -253,9 +247,9 @@ QPID_AUTO_TEST_CASE(enq_count) { cout << test_filename << ".enq_count: " << flush; - + enq_map e6; - + // Check the allocation and cleanup as the file size is set both up and down e6.set_num_jfiles(24); e6.set_num_jfiles(0); @@ -295,7 +289,7 @@ else BOOST_CHECK_EQUAL(e6.get_enq_cnt(pfid), u_int32_t(0)); } - + cout << "ok" << endl; } Modified: store/trunk/cpp/tests/jrnl/_ut_jdir.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_jdir.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * 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 "../unit_test.h" @@ -155,11 +149,11 @@ { // Subdir count BOOST_CHECK_EQUAL(count_dir_contents(dirname, false, true), num_subdirs); - + // Journal file count unsigned num_jrnl_files = jrnl_present ? NUM_JFILES + 1 : 0; BOOST_CHECK_EQUAL(count_dir_contents(dirname, true, false), num_jrnl_files); - + // Check journal files are present if (jrnl_present) try { jdir::verify_dir(dirname, base_filename); } @@ -226,7 +220,7 @@ BOOST_CHECK(jdir::is_dir(dir_A)); dir1.delete_dir(); BOOST_CHECK(!jdir::exists(dir_A)); - + // Use static fn check_dir_not_existing(test_dir + "/B"); jdir::create_dir(test_dir + "/B"); @@ -235,7 +229,7 @@ BOOST_CHECK(jdir::is_dir(test_dir + "/B")); jdir::delete_dir(test_dir + "/B"); BOOST_CHECK(!jdir::exists(test_dir + "/B")); - + // Non-empty dirs check_dir_not_existing(test_dir + "/C"); jdir::create_dir(test_dir + "/C"); @@ -297,7 +291,7 @@ BOOST_CHECK(jdir::exists(test_dir + "/G/H//I")); jdir::delete_dir(test_dir + "/F"); BOOST_CHECK(!jdir::exists(test_dir + "/F")); - + // Use static fn check_dir_not_existing(test_dir + "/H"); jdir::create_dir(test_dir + "/H/I/J/K"); @@ -325,7 +319,7 @@ BOOST_CHECK(jdir::exists(test_dir + "//J//K//L")); jdir::delete_dir(test_dir + "//J"); BOOST_CHECK(!jdir::exists(test_dir + "//J")); - + // Non-empty dirs check_dir_not_existing(test_dir + "/K"); jdir::create_dir(test_dir + "/K/L/M1/N1"); @@ -387,7 +381,7 @@ // clean up test_dir_2.delete_dir(); BOOST_CHECK(!jdir::exists(jrnl_dir)); - + // non-existent dir with auto-create false jrnl_dir = "/tmp/test_dir_3"; check_dir_not_existing(jrnl_dir); @@ -401,7 +395,7 @@ { BOOST_CHECK_EQUAL(e.err_code(), jerrno::JERR_JDIR_OPENDIR); } - + // Use static fn jrnl_dir = "/tmp/test_dir_4"; check_dir_not_existing(jrnl_dir); Modified: store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_jerrno.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * 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 "../unit_test.h" @@ -51,5 +45,5 @@ BOOST_CHECK(std::strcmp(jerrno::err_msg(0), "<Unknown error code>") == 0); cout << "ok" << endl; } - + QPID_AUTO_TEST_SUITE_END() Modified: store/trunk/cpp/tests/jrnl/_ut_jexception.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_jexception.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * 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 "../unit_test.h" @@ -347,7 +341,7 @@ stringstream ss; ss << e; BOOST_CHECK(ss.str().size() > 0); - } + } cout << "ok" << endl; } Modified: store/trunk/cpp/tests/jrnl/_ut_jinf.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_jinf.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2007, 2008, 2009 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 "../unit_test.h" @@ -144,7 +138,7 @@ lfid_pfid_map::clean_journal_info_file(test_dir); cout << "done" << endl; } - + QPID_AUTO_TEST_CASE(analyze_empty_journal) { string test_name = get_test_name(test_filename, "analyze_empty_journal"); @@ -210,7 +204,7 @@ m.check_analysis(ji); m.destroy_journal(); - } + } cout << "done" << endl; } Modified: store/trunk/cpp/tests/jrnl/_ut_lpmgr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_lpmgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_lpmgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_lfmgr.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2008, 2009 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 "../unit_test.h" #include <cmath> @@ -320,7 +314,7 @@ const u_int16_t ae_max_jfiles) { lpmgr lm; - + for (unsigned i = 0; i < 2; i++) { if (i) @@ -681,7 +675,7 @@ lfid_pfid_map lfm(test_name, test_name); const u_int16_t num_jfiles = 8; lpmgr lm; - + for (unsigned i = 0; i < 2; i++) { if (i) @@ -779,7 +773,7 @@ rcvdat rd; u_int16_t curr_ae_max_jfiles = 0; jdir::create_dir(test_dir); // Check test dir exists; create it if not - + for (int test_num = 0; test_num < 100; test_num++) { test_jrnl jc(test_name, test_dir, test_name); Modified: store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_file_hdr.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2007, 2008, 2009 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 "../unit_test.h" @@ -57,9 +51,9 @@ BOOST_CHECK_EQUAL(h1._rid, 0ULL); BOOST_CHECK(!h1.get_owi()); - const u_int32_t magic = 0x89abcdefUL; + const u_int32_t magic = 0x89abcdefUL; const u_int16_t uflag = 0x5537; - const u_int8_t version = 0xef; + const u_int8_t version = 0xef; const u_int64_t rid = 0x123456789abcdef0ULL; const bool owi = true; @@ -86,7 +80,7 @@ BOOST_CHECK(h2.get_owi()); BOOST_CHECK_EQUAL(h2._uflag, uflag); - h1.hdr_copy(h2); + h1.hdr_copy(h2); BOOST_CHECK_EQUAL(h1._magic, magic); BOOST_CHECK_EQUAL(h1._version, version); #ifdef JRNL_LITTLE_ENDIAN Modified: store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../unit_test.h" @@ -100,7 +100,7 @@ BOOST_CHECK_EQUAL(t3 >= t1, true); BOOST_CHECK_EQUAL(t3 < t1, false); BOOST_CHECK_EQUAL(t3 <= t1, true); - + t3 += z; BOOST_CHECK_EQUAL(t3.tv_sec, sec1); BOOST_CHECK_EQUAL(t3.tv_nsec, nsec1); @@ -114,11 +114,11 @@ BOOST_CHECK_EQUAL(t3 >= t2, true); BOOST_CHECK_EQUAL(t3 < t2, false); BOOST_CHECK_EQUAL(t3 <= t2, true); - + t3 += z; BOOST_CHECK_EQUAL(t3.tv_sec, sec2); BOOST_CHECK_EQUAL(t3.tv_nsec, nsec2); - + t3 = t1; t3 += t2; BOOST_CHECK_EQUAL(t3.tv_sec, sec_sum); @@ -133,7 +133,7 @@ t3 -= t1; BOOST_CHECK_EQUAL(t3.tv_sec, sec_2_minus_1); BOOST_CHECK_EQUAL(t3.tv_nsec, nsec_2_minus_1); - + t3 = t1 + t2; BOOST_CHECK_EQUAL(t3.tv_sec, sec_sum); BOOST_CHECK_EQUAL(t3.tv_nsec, nsec_sum); Modified: store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,31 +1,25 @@ -/** -* \file _ut_txn_map.cpp -* -* Red Hat Messaging - Message Journal -* -* This file contains the unit tests for the journal. -* -* Copyright 2007, 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 2007, 2008, 2009 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 "../unit_test.h" @@ -49,7 +43,7 @@ stringstream ss; ss << "XID-" << setfill('0') << setw(16) << hex << rid; ss << "-0123456789abcdef"; - return ss.str(); + return ss.str(); } void check_td_equal(txn_data& td1, txn_data& td2) @@ -76,7 +70,7 @@ BOOST_CHECK_EQUAL(td._pfid, pfid); BOOST_CHECK_EQUAL(td._enq_flag, enq_flag); BOOST_CHECK_EQUAL(td._aio_compl, false); - + txn_map t1; BOOST_CHECK(t1.empty()); BOOST_CHECK_EQUAL(t1.size(), u_int32_t(0)); @@ -99,7 +93,7 @@ t2.insert_txn_data(make_xid(rid), txn_data(rid, ~rid, fid, false)); BOOST_CHECK(!t2.empty()); BOOST_CHECK_EQUAL(t2.size(), u_int32_t(128)); - + // get u_int64_t rid_incr_2 = 6ULL; for (u_int64_t rid = rid_begin; rid < rid_end; rid += rid_incr_2) Modified: store/trunk/cpp/tests/jrnl/chk_jdata =================================================================== --- store/trunk/cpp/tests/jrnl/chk_jdata 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/chk_jdata 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,5 +1,27 @@ #!/bin/bash +# Copyright (c) 2007 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. + + JRNL_BLK_SIZE=512 # Block size in bytes JRNL_PAGE_SIZE=256 # Journal page size in blocks JRNL_FILE_SIZE=12 # Journal file size in pages Modified: store/trunk/cpp/tests/jrnl/cp_rtest_jrnl =================================================================== --- store/trunk/cpp/tests/jrnl/cp_rtest_jrnl 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/cp_rtest_jrnl 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,4 +1,26 @@ #!/bin/bash + +# Copyright (c) 2007 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. + JDATA_DIR=jdata TAR_DIR=rd_test_jrnls Modified: store/trunk/cpp/tests/jrnl/jhexdump =================================================================== --- store/trunk/cpp/tests/jrnl/jhexdump 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jhexdump 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,10 +1,10 @@ #!/bin/bash -# Copyright (C) 2008 Red Hat Inc. +# Copyright (c) 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/tests/jrnl/jtt/Makefile.am =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/Makefile.am 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,8 +1,8 @@ -# Copyright (C) 2008 Red Hat Inc. +# Copyright (c) 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include <cstddef> Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include "jrnl_init_params.hpp" Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include <boost/test/unit_test_log.hpp> Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include <cstddef> @@ -40,7 +40,7 @@ { cout << test_filename << ".constructor: " << flush; const unsigned test_case_num = 0x12345; - const u_int32_t num_msgs = 0x100; + const u_int32_t num_msgs = 0x100; const std::size_t min_data_size = 0x1000; const std::size_t max_data_size = 0; const bool auto_deq = true; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" @@ -76,7 +76,7 @@ BOOST_CHECK(ts5.is_zero()); const time_ns& ts6 = tcr.test_time(); BOOST_CHECK(ts6.is_zero()); - + ::usleep(1100000); // 1.1 sec in microseconds tcr.set_stop_time(); BOOST_CHECK_EQUAL(tcr.exception(), false); Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include <ctime> Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "../../unit_test.h" #include <cstddef> @@ -50,7 +50,7 @@ } // === Test suite === - + QPID_AUTO_TEST_CASE(constructor) { cout << test_filename << ".constructor: " << flush; @@ -64,7 +64,7 @@ { cout << test_filename << ".append_1: " << flush; const unsigned test_case_num = 0x12345; - const u_int32_t num_msgs = 0x100; + const u_int32_t num_msgs = 0x100; const std::size_t min_data_size = 0x1000; const std::size_t max_data_size = 0; const bool auto_deq = true; @@ -97,7 +97,7 @@ { cout << test_filename << ".append_2: " << flush; const unsigned test_case_num = 0x12345; - const u_int32_t num_msgs = 0x100; + const u_int32_t num_msgs = 0x100; const std::size_t min_data_size = 0x1000; const std::size_t max_data_size = 0; const bool auto_deq = true; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.csv =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.csv 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.csv 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,8 +1,8 @@ -# Copyright (C) 2008 Red Hat Inc. +# Copyright (c) 2008 Red Hat Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/args.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "args.hpp" @@ -97,7 +97,7 @@ ("read-prob", po::value<unsigned>(&read_prob)->default_value(50), "Read probability (percent) for each message when read-mode is set to RANDOM.") - + ("recover-mode", po::value<bool>(&recover_mode)->zero_tokens(), "Recover journal from the previous test for each test case.") @@ -105,7 +105,7 @@ ("repeat", po::value<bool>(&repeat_flag)->zero_tokens(), "Repeat all test cases in CSV file indefinitely.") - + ("reuse-instance", po::value<bool>(&reuse_instance)->zero_tokens(), "Reuse journal instance for all test cases.") @@ -223,6 +223,6 @@ } std::cout << std::endl; } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/args.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/args.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_args_hpp #define mrg_jtt_args_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "data_src.hpp" @@ -83,7 +83,7 @@ if (offs >= max_xsize) return 0; return _xid_src + offs; } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_data_src_hpp #define mrg_jtt_data_src_hpp @@ -62,14 +62,14 @@ public: static const char* get_data(const std::size_t offs); static std::string get_xid(const std::size_t xid_size); - + private: data_src(); static u_int64_t get_xid_cnt() { mrg::journal::slock s(_m.m()); return _xid_cnt++; } static const char* get_xid_content(const std::size_t offs); static bool __init(); }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,10 +1,10 @@ #!/usr/bin/env python -# Copyright (C) 2007,2008 Red Hat Inc. +# Copyright (c) 2007, 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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. Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "jrnl_init_params.hpp" Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_jrnl_init_params_hpp #define mrg_jtt_jrnl_init_params_hpp @@ -42,7 +42,7 @@ static const u_int32_t def_jfsize_sblks; static const u_int16_t def_wcache_num_pages; static const u_int32_t def_wcache_pgsize_sblks; - + typedef boost::shared_ptr<jrnl_init_params> shared_ptr; private: Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "jrnl_instance.hpp" @@ -61,7 +61,7 @@ pthread_mutex_init(&_rd_list_mutex, 0); pthread_mutex_init(&_deq_list_mutex, 0); } - + jrnl_instance::jrnl_instance(const jrnl_init_params::shared_ptr& p): mrg::journal::jcntl(p->jid(), p->jdir(), p->base_filename()), _jpp(p), @@ -251,7 +251,7 @@ if (dtokp) { _tcrp->incr_num_rproc(); - + bool do_read = true; if (rd_mode == read_arg::RANDOM) do_read = 1.0 * std::rand() / RAND_MAX < _args_ptr->read_prob / 100.0; @@ -279,7 +279,7 @@ } read_compl = true; _tcrp->incr_num_read(); - + // clean up if (xsize) std::free(xptr); Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_jrnl_instance_hpp #define mrg_jtt_jrnl_instance_hpp @@ -103,7 +103,7 @@ void run_deq() throw (); inline static void* run_deq(void* p) { static_cast<jrnl_instance*>(p)->run_deq(); return 0; } - + void abort(const mrg::journal::data_tok* dtokp); void commit(const mrg::journal::data_tok* dtokp); void txn(const mrg::journal::data_tok* dtokp, const bool commit); @@ -115,7 +115,7 @@ // static void aio_rd_callback(jcntl* journal, std::vector<u_int16_t>& pil); // static void aio_wr_callback(jcntl* journal, std::vector<journal::data_tok*>& dtokl); }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/jtt.csv =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/jtt.csv 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# Copyright (c) 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. + ,,,,,,,"Msg size",,"Xid size",,,,,"enq-size",,"deq-size",,"txn-size",, "Test #","tf","pf","amn","mn incr","#msgs","ms incr","Min","Max","Min","Max","auto-deq","transient","extern","bytes","dblks","bytes","dblks","bytes","dblks","comment" ,,,,,,,,,,,,,,,,,,,, Modified: store/trunk/cpp/tests/jrnl/jtt/main.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/main.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/main.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_mgr.hpp" Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "read_arg.hpp" @@ -90,6 +90,6 @@ ra.parse(s); return is; } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_read_arg_hpp #define mrg_jtt_read_arg_hpp @@ -57,7 +57,7 @@ friend std::ostream& operator<<(std::ostream& os, const read_arg& ra); friend std::istream& operator>>(std::istream& is, read_arg& ra); }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_case.hpp" @@ -176,6 +176,6 @@ } return oss.str(); } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_test_case_hpp #define mrg_jtt_test_case_hpp @@ -44,9 +44,9 @@ enum data_location { JDL_INTERNAL = 0, JDL_EXTERNAL, JDL_RANDOM }; typedef data_location external_t; - + typedef boost::shared_ptr<test_case> shared_ptr; - + typedef std::map<std::string, test_case_result_agregation::shared_ptr> res_map; typedef std::pair<std::string, test_case_result_agregation::shared_ptr> res_map_pair; typedef res_map::const_iterator res_map_citr; @@ -90,7 +90,7 @@ inline external_t external() const { return _external; } bool this_external() const; inline const std::string& comment() const { return _comment; } - + void add_result(test_case_result::shared_ptr& p); void set_fmt_chk_res(const bool res, const std::string& jid); @@ -105,7 +105,7 @@ void clear(); const std::string str() const; }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_case_result.hpp" @@ -198,6 +198,6 @@ if (!_start_time.is_zero() && _stop_time >= _start_time) _test_time = _stop_time - _start_time; } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_test_case_result_hpp #define mrg_jtt_test_case_result_hpp @@ -86,7 +86,7 @@ inline elist_citr begin() { return _exception_list.begin(); } inline elist_citr end() { return _exception_list.end(); } inline const std::string& operator[](unsigned i) { return _exception_list[i]; } - + void clear(); const std::string str(const bool summary) const; Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_case_result_agregation.hpp" @@ -182,6 +182,6 @@ _test_time += t; return _test_time; } - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_test_case_result_agregation_hpp #define mrg_jtt_test_case_result_agregation_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_case_set.hpp" @@ -89,7 +89,7 @@ test_case_set::get_tc_from_csv(const std::string& csv_line, const csv_map& cols) { unsigned test_case_num = 0; - u_int32_t num_msgs = 0; + u_int32_t num_msgs = 0; std::size_t min_data_size = 0; std::size_t max_data_size = 0; bool auto_deq = false; Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_test_case_set_hpp #define mrg_jtt_test_case_set_hpp @@ -94,7 +94,7 @@ test_case::shared_ptr get_tc_from_csv(const std::string& csv_line, const csv_map& cols); static bool __init(); }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 "test_mgr.hpp" @@ -191,6 +191,6 @@ // static instances volatile sig_atomic_t test_mgr::_signal = 0; volatile bool test_mgr::_abort = false; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,25 +1,25 @@ -/** -* Copyright 2008 Red Hat, Inc. -* -* This file is part of Red Hat Messaging. -* -* Red Hat Messaging 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. -*/ +/* + * Copyright (c) 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 mrg_jtt_test_mgr_hpp #define mrg_jtt_test_mgr_hpp @@ -37,8 +37,8 @@ { public: typedef std::vector<jrnl_instance::shared_ptr> ji_list; - typedef ji_list::iterator ji_list_itr; - typedef ji_list::const_iterator ji_list_citr; + typedef ji_list::iterator ji_list_itr; + typedef ji_list::const_iterator ji_list_citr; private: ji_list _ji_list; @@ -53,7 +53,7 @@ virtual ~test_mgr(); void run(); inline bool error() const { return _err_flag; } - + static void signal_handler(int signal); private: @@ -62,7 +62,7 @@ inline static ptrdiff_t random_fn(const ptrdiff_t i) { return static_cast<ptrdiff_t>(1.0 * i * std::rand() / RAND_MAX); } }; - + } // namespace jtt } // namespace mrg Modified: store/trunk/cpp/tests/jrnl/prof =================================================================== --- store/trunk/cpp/tests/jrnl/prof 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/prof 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,5 +1,26 @@ #!/bin/bash +# Copyright (c) 2007 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. + mkdir -p profile opcontrol --setup --no-vmlinux --separate=library opcontrol --start Modified: store/trunk/cpp/tests/jrnl/run-journal-tests =================================================================== --- store/trunk/cpp/tests/jrnl/run-journal-tests 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/jrnl/run-journal-tests 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,5 +1,26 @@ -#!/bin/sh +#!/bin/bash +# 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. + fail=0 num_jrnls=1 Modified: store/trunk/cpp/tests/persistence.py =================================================================== --- store/trunk/cpp/tests/persistence.py 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/persistence.py 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,13 +1,13 @@ -# Copyright (C) 2007 Red Hat Software +# Copyright (c) 2007, 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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 file is distributed in the hope that it will be useful, +# 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. @@ -19,7 +19,6 @@ # # The GNU Lesser General Public License is available in the file COPYING. - import sys, re, traceback, socket from getopt import getopt, GetoptError Modified: store/trunk/cpp/tests/python_tests/__init__.py =================================================================== --- store/trunk/cpp/tests/python_tests/__init__.py 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/python_tests/__init__.py 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,22 +1,24 @@ # Do not delete - marks this directory as a python package. +# Copyright (c) 2008 Red Hat, Inc. # -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. +# 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. from flow_to_disk import * Modified: store/trunk/cpp/tests/python_tests/flow_to_disk.py =================================================================== --- store/trunk/cpp/tests/python_tests/flow_to_disk.py 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/python_tests/flow_to_disk.py 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,21 +1,24 @@ +# Copyright (c) 2008 Red Hat, Inc. # -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. +# 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. + from qpid.client import Client, Closed from qpid.queue import Empty from qpid.testlib import TestBase010 Modified: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/run_python_tests 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,15 +1,15 @@ #!/bin/bash # -# Copyright (C) 2007 Red Hat Software +# Copyright (c) 2008 Red Hat, Inc. # -# This file is part of Red Hat Messaging. +# This file is part of the Qpid async store library msgstore.so. # -# Red Hat Messaging is free software; you can redistribute it and/or +# 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 file is distributed in the hope that it will be useful, +# 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. Modified: store/trunk/cpp/tests/run_test =================================================================== --- store/trunk/cpp/tests/run_test 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/run_test 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,5 +1,27 @@ -#!/bin/sh +#!/bin/bash + +# Copyright (c) 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. + + # Set up environment and run a test executable or script. # # Output nothing if test passes, show the output if it fails and Modified: store/trunk/cpp/tests/start_broker =================================================================== --- store/trunk/cpp/tests/start_broker 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/start_broker 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,4 +1,26 @@ -#!/bin/sh +#!/bin/bash + +# Copyright (c) 2008, 2009 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. + QPIDD=$QPID_DIR/cpp/src/qpidd rm -f qpidd.vglog* qpidd.log test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=qpidd.vglog --" Modified: store/trunk/cpp/tests/stop_broker =================================================================== --- store/trunk/cpp/tests/stop_broker 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/stop_broker 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,4 +1,26 @@ -#!/bin/sh +#!/bin/bash + +# Copyright (c) 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. + # Stop the broker, check for errors. # if test -f qpidd.port; then Modified: store/trunk/cpp/tests/system_test.sh =================================================================== --- store/trunk/cpp/tests/system_test.sh 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/system_test.sh 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,15 +1,15 @@ #!/bin/bash + +# Copyright (c) 2007, 2008 Red Hat, Inc. # -# Copyright (C) 2007 Red Hat Software +# This file is part of the Qpid async store library msgstore.so. # -# This file is part of Red Hat Messaging. -# -# Red Hat Messaging is free software; you can redistribute it and/or +# 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 file is distributed in the hope that it will be useful, +# 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. @@ -21,6 +21,7 @@ # # The GNU Lesser General Public License is available in the file COPYING. + error() { echo $*; exit 1; } # Make sure $QPID_DIR contains what we need. Modified: store/trunk/cpp/tests/unit_test.cpp =================================================================== --- store/trunk/cpp/tests/unit_test.cpp 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/unit_test.cpp 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,21 +1,27 @@ /* - * - * Copyright (c) 2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + Copyright (c) 2007 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. */ + // Defines test_main function to link with actual unit test code. #define BOOST_AUTO_TEST_MAIN // Boost 1.33 #define BOOST_TEST_MAIN Modified: store/trunk/cpp/tests/unit_test.h =================================================================== --- store/trunk/cpp/tests/unit_test.h 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/unit_test.h 2009-02-03 16:21:51 UTC (rev 3096) @@ -2,29 +2,32 @@ #define QPIPD_TEST_UNIT_TEST_H_ /* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * + 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. */ + // Workaround so we can build against boost 1.32, 1.33 and boost 1.34. // Remove when we no longer need to support 1.32 or 1.33. - + #include <boost/version.hpp> #if (BOOST_VERSION < 103300) Modified: store/trunk/cpp/tests/vg_check =================================================================== --- store/trunk/cpp/tests/vg_check 2009-02-03 16:19:09 UTC (rev 3095) +++ store/trunk/cpp/tests/vg_check 2009-02-03 16:21:51 UTC (rev 3096) @@ -1,3 +1,24 @@ +# Copyright (c) 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. + # Check for valgrind errors. Sourced by test scripts. vg_failed() {