Author: kpvdr Date: 2008-09-10 15:43:56 -0400 (Wed, 10 Sep 2008) New Revision: 2438 Modified: 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/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_cb.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/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/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/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/jrnl/_st_basic.cpp store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 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_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/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/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/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/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 Log: namespace adjustment: namespace rhm is now namespace mrg; namespace rhm::bdbstore is now namespace mrg::msgstore. Added some missing GPL copyright notices. Modified: store/trunk/cpp/lib/BindingDbt.cpp =================================================================== --- store/trunk/cpp/lib/BindingDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/BindingDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "BindingDbt.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using qpid::broker::PersistableExchange; using qpid::broker::PersistableQueue; using qpid::framing::FieldTable; Modified: store/trunk/cpp/lib/BindingDbt.h =================================================================== --- store/trunk/cpp/lib/BindingDbt.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/BindingDbt.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -30,8 +30,8 @@ #include <qpid/framing/Buffer.h> #include <qpid/framing/FieldTable.h> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class BindingDbt : public Dbt { Modified: store/trunk/cpp/lib/BufferValue.cpp =================================================================== --- store/trunk/cpp/lib/BufferValue.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/BufferValue.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "BufferValue.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using qpid::broker::Persistable; BufferValue::BufferValue(u_int32_t size, u_int64_t offset) Modified: store/trunk/cpp/lib/BufferValue.h =================================================================== --- store/trunk/cpp/lib/BufferValue.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/BufferValue.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,8 +28,8 @@ #include <qpid/broker/Persistable.h> #include <qpid/framing/Buffer.h> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class BufferValue : public Dbt { Modified: store/trunk/cpp/lib/Cursor.h =================================================================== --- store/trunk/cpp/lib/Cursor.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/Cursor.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -26,8 +26,8 @@ #include "db-inc.h" -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class Cursor { Modified: store/trunk/cpp/lib/DataTokenImpl.cpp =================================================================== --- store/trunk/cpp/lib/DataTokenImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/DataTokenImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "DataTokenImpl.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; DataTokenImpl::DataTokenImpl():data_tok() {} Modified: store/trunk/cpp/lib/DataTokenImpl.h =================================================================== --- store/trunk/cpp/lib/DataTokenImpl.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/DataTokenImpl.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,8 +28,8 @@ #include <boost/intrusive_ptr.hpp> #include <qpid/broker/PersistableMessage.h> -namespace rhm { -namespace bdbstore { +namespace mrg { +namespace msgstore { class DataTokenImpl : public journal::data_tok, public qpid::RefCounted { @@ -45,7 +45,7 @@ { sourceMsg = msg; } }; -} // namespace bdbstore -} // namespace rhm +} // namespace msgstore +} // namespace mrg #endif Modified: store/trunk/cpp/lib/IdDbt.cpp =================================================================== --- store/trunk/cpp/lib/IdDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "IdDbt.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; IdDbt::IdDbt() : id(0) { Modified: store/trunk/cpp/lib/IdDbt.h =================================================================== --- store/trunk/cpp/lib/IdDbt.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdDbt.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -26,8 +26,8 @@ #include "db-inc.h" -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class IdDbt : public Dbt { Modified: store/trunk/cpp/lib/IdPairDbt.cpp =================================================================== --- store/trunk/cpp/lib/IdPairDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdPairDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "IdPairDbt.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; IdPairDbt::IdPairDbt() : message(&ids[0], sizeof(ids[0])), queue(&ids[1], sizeof(ids[1])) { Modified: store/trunk/cpp/lib/IdPairDbt.h =================================================================== --- store/trunk/cpp/lib/IdPairDbt.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdPairDbt.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,8 +27,8 @@ #include "db-inc.h" #include <qpid/framing/amqp_types.h> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class IdPairDbt : public Dbt { Modified: store/trunk/cpp/lib/IdSequence.cpp =================================================================== --- store/trunk/cpp/lib/IdSequence.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdSequence.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "IdSequence.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using qpid::sys::Mutex; IdSequence::IdSequence() : id(1) {} Modified: store/trunk/cpp/lib/IdSequence.h =================================================================== --- store/trunk/cpp/lib/IdSequence.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/IdSequence.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,8 +28,8 @@ #include <qpid/sys/Mutex.h> #include <sys/types.h> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class IdSequence { Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/JournalImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -32,8 +32,8 @@ #include "qpid/sys/Monitor.h" #include "StoreException.h" -using namespace rhm::bdbstore; -using namespace rhm::journal; +using namespace mrg::msgstore; +using namespace mrg::journal; using qpid::management::ManagementAgent; qpid::broker::Timer* JournalImpl::journalTimerPtr = 0; @@ -157,7 +157,7 @@ const u_int32_t wcache_pgsize_sblks, const journal::rd_aio_cb rd_cb, const journal::wr_aio_cb wr_cb, - boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr, + boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr, u_int64_t& highest_rid, u_int64_t queue_id) { @@ -180,7 +180,7 @@ if (prep_tx_list_ptr) { // Create list of prepared xids std::vector<std::string> prep_xid_list; - for (bdbstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) { + for (msgstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) { prep_xid_list.push_back(i->xid); } @@ -194,7 +194,7 @@ // Populate PreparedTransaction lists from _tmap if (prep_tx_list_ptr) { - for (bdbstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) { + for (msgstore::PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) { try { txn_data_list tdl = _tmap.get_tdata_list(i->xid); assert(tdl.size()); // should never be empty @@ -489,16 +489,16 @@ writeActivityFlag = true; switch (r) { - case rhm::journal::RHM_IORES_SUCCESS: + case mrg::journal::RHM_IORES_SUCCESS: return; - case rhm::journal::RHM_IORES_ENQCAPTHRESH: + case mrg::journal::RHM_IORES_ENQCAPTHRESH: { std::ostringstream oss; oss << "Enqueue capacity threshold exceeded on queue \"" << _jid << "\"."; log(LOG_WARN, oss.str()); THROW_STORE_FULL_EXCEPTION(oss.str()); } - case rhm::journal::RHM_IORES_FULL: + case mrg::journal::RHM_IORES_FULL: { std::ostringstream oss; oss << "Journal full on queue \"" << _jid << "\"."; @@ -508,7 +508,7 @@ default: { std::ostringstream oss; - oss << "Unexpected I/O response (" << rhm::journal::iores_str(r) << ") on queue " << _jid << "\"."; + oss << "Unexpected I/O response (" << mrg::journal::iores_str(r) << ") on queue " << _jid << "\"."; log(LOG_ERROR, oss.str()); THROW_STORE_FULL_EXCEPTION(oss.str()); } Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/JournalImpl.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -36,8 +36,8 @@ #include "qpid/management/Manageable.h" #include "Journal.h" -namespace rhm { - namespace bdbstore { +namespace mrg { + namespace msgstore { class JournalImpl; @@ -119,7 +119,7 @@ const u_int32_t wcache_pgsize_sblks, const journal::rd_aio_cb rd_cb, const journal::wr_aio_cb wr_cb, - boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr, + boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr, u_int64_t& highest_rid, u_int64_t queue_id); @@ -127,7 +127,7 @@ const u_int32_t jfsize_sblks, const u_int16_t wcache_num_pages, const u_int32_t wcache_pgsize_sblks, - boost::ptr_list<bdbstore::PreparedTransaction>* prep_tx_list_ptr, + boost::ptr_list<msgstore::PreparedTransaction>* prep_tx_list_ptr, u_int64_t& highest_rid, u_int64_t queue_id) { recover(num_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks, 0, @@ -229,7 +229,7 @@ inline void read_reset() { _rmgr.invalidate(); } }; - } // namespace bdbstore -} // namespace rhm + } // namespace msgstore +} // namespace mrg #endif Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -33,7 +33,7 @@ #define MAX_AIO_SLEEPS 1000 // ~1 second #define AIO_SLEEP_TIME 1000 // 1 milisecond -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using namespace qpid::broker; using boost::static_pointer_cast; using boost::intrusive_ptr; @@ -767,12 +767,12 @@ try { unsigned aio_sleep_cnt = 0; while (read) { - rhm::journal::iores res = jc->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok); + mrg::journal::iores res = jc->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok); readSize = dtok.dsize(); switch (res) { - case rhm::journal::RHM_IORES_SUCCESS: { + case mrg::journal::RHM_IORES_SUCCESS: { msg_count++; RecoverableMessage::shared_ptr msg; char* data = (char*)dbuff; @@ -842,12 +842,12 @@ aio_sleep_cnt = 0; break; } - case rhm::journal::RHM_IORES_PAGE_AIOWAIT: + case mrg::journal::RHM_IORES_PAGE_AIOWAIT: if (++aio_sleep_cnt > MAX_AIO_SLEEPS) THROW_STORE_EXCEPTION("Timeout waiting for AIO in MessageStoreImpl::recoverMessages()"); ::usleep(AIO_SLEEP_TIME); break; - case rhm::journal::RHM_IORES_EMPTY: + case mrg::journal::RHM_IORES_EMPTY: read = false; break; // done with all messages. (add call in jrnl to test that _emap is empty.) default: @@ -946,7 +946,7 @@ dtok.reset(); dtok.set_wstate(DataTokenImpl::ENQ); switch (tplStorePtr->read_data_record(&dbuff, dbuffSize, &xidbuff, xidbuffSize, transientFlag, externalFlag, &dtok)) { - case rhm::journal::RHM_IORES_SUCCESS: { + case mrg::journal::RHM_IORES_SUCCESS: { // Every TPL record contains both data and an XID assert(dbuffSize>0); assert(xidbuffSize>0); @@ -980,12 +980,12 @@ aio_sleep_cnt = 0; break; } - case rhm::journal::RHM_IORES_PAGE_AIOWAIT: + case mrg::journal::RHM_IORES_PAGE_AIOWAIT: if (++aio_sleep_cnt > MAX_AIO_SLEEPS) THROW_STORE_EXCEPTION("Timeout waiting for AIO in MessageStoreImpl::recoverTplStore()"); ::usleep(AIO_SLEEP_TIME); break; - case rhm::journal::RHM_IORES_EMPTY: + case mrg::journal::RHM_IORES_EMPTY: done = true; break; // done with all messages. (add call in jrnl to test that _emap is empty.) default: @@ -1216,7 +1216,7 @@ JournalImpl* jc = static_cast<JournalImpl*>(queue.getExternalQueueStore()); if (jc) { // TODO: check if this result should be used... - /*rhm::journal::iores res =*/ jc->flush(); + /*mrg::journal::iores res =*/ jc->flush(); } } catch (const journal::jexception& e) { THROW_STORE_EXCEPTION(std::string("Queue ") + qn + ": flush() failed: " + e.what() ); Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -45,8 +45,8 @@ #define DB_BUFFER_SMALL ENOMEM #endif -namespace rhm { -namespace bdbstore { +namespace mrg { +namespace msgstore { /** * An implementation of the MessageStore interface based on Berkeley DB @@ -342,7 +342,7 @@ { return qpid::management::Manageable::STATUS_OK; } }; // class MessageStoreImpl -} // namespace bdbstore -} // namespace rhm +} // namespace msgstore +} // namespace mrg #endif Modified: store/trunk/cpp/lib/PreparedTransaction.cpp =================================================================== --- store/trunk/cpp/lib/PreparedTransaction.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/PreparedTransaction.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -24,7 +24,7 @@ #include "PreparedTransaction.h" #include <algorithm> -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using std::string; void LockedMappings::add(queue_id queue, message_id message) Modified: store/trunk/cpp/lib/PreparedTransaction.h =================================================================== --- store/trunk/cpp/lib/PreparedTransaction.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/PreparedTransaction.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -31,8 +31,8 @@ #include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_list.hpp> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ typedef uint64_t queue_id; typedef uint64_t message_id; Modified: store/trunk/cpp/lib/StoreException.h =================================================================== --- store/trunk/cpp/lib/StoreException.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/StoreException.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,8 +27,8 @@ #include "IdDbt.h" #include <boost/format.hpp> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class StoreException : public std::exception { Modified: store/trunk/cpp/lib/StorePlugin.cpp =================================================================== --- store/trunk/cpp/lib/StorePlugin.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/StorePlugin.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ struct StorePlugin : public Plugin { - rhm::bdbstore::MessageStoreImpl::Options options; + mrg::msgstore::MessageStoreImpl::Options options; MessageStore *store; Options* getOptions() { return &options; } @@ -43,7 +43,7 @@ void earlyInitialize (Plugin::Target& target) { Broker* broker = dynamic_cast<Broker*>(&target); - store = new rhm::bdbstore::MessageStoreImpl (); + store = new mrg::msgstore::MessageStoreImpl (); DataDir& dataDir = broker->getDataDir (); if (options.storeDir.empty ()) @@ -60,7 +60,7 @@ void initialize(Plugin::Target& target) { Broker* broker = dynamic_cast<Broker*>(&target); - ((rhm::bdbstore::MessageStoreImpl*) store)->initManagement (broker); + ((mrg::msgstore::MessageStoreImpl*) store)->initManagement (broker); } }; Modified: store/trunk/cpp/lib/StringDbt.cpp =================================================================== --- store/trunk/cpp/lib/StringDbt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/StringDbt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "StringDbt.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; StringDbt::StringDbt() { Modified: store/trunk/cpp/lib/StringDbt.h =================================================================== --- store/trunk/cpp/lib/StringDbt.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/StringDbt.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,8 +28,8 @@ #include <qpid/broker/Persistable.h> #include <qpid/framing/Buffer.h> -namespace rhm{ -namespace bdbstore{ +namespace mrg{ +namespace msgstore{ class StringDbt : public Dbt { Modified: store/trunk/cpp/lib/TxnCtxt.h =================================================================== --- store/trunk/cpp/lib/TxnCtxt.h 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/TxnCtxt.h 2008-09-10 19:43:56 UTC (rev 2438) @@ -42,8 +42,8 @@ #include "qpid/sys/Mutex.h" #include "StoreException.h" -namespace rhm{ -namespace bdbstore{ +namespace mrg { +namespace msgstore { class TxnCtxt : public qpid::broker::TransactionContext { Modified: store/trunk/cpp/lib/jrnl/aio.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/aio.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -1,11 +1,41 @@ +/** +* \file aio.cpp +* +* Red Hat Messaging - Message Journal +* +* 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. +* +* 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. +*/ + #include "aio.hpp" -namespace rhm +namespace mrg { namespace journal { } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/aio.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/aio.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -1,13 +1,42 @@ +/** +* \file aio.hpp +* +* Red Hat Messaging - Message Journal +* +* This file contains an encapsulation of the libaio interface used +* by 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. +*/ -#ifndef rhm_journal_aio_hpp -#define rhm_journal_aio_hpp +#ifndef mrg_journal_aio_hpp +#define mrg_journal_aio_hpp #include <libaio.h> #include <cstring> #include <sys/types.h> #include <string.h> -namespace rhm +namespace mrg { namespace journal { @@ -81,6 +110,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif +#endif // ifndef mrg_journal_aio_hpp Modified: store/trunk/cpp/lib/jrnl/aio_cb.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/aio_cb.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/aio_cb.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,13 +28,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_aio_cb_hpp -#define rhm_journal_aio_cb_hpp +#ifndef mrg_journal_aio_cb_hpp +#define mrg_journal_aio_cb_hpp #include <vector> #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -47,7 +47,7 @@ */ typedef void (*wr_aio_cb)(jcntl* journal, std::vector<data_tok*>& dtokl); typedef void (*rd_aio_cb)(jcntl* journal, std::vector<u_int16_t>& pil); -} -} +} // namespace journal +} // namespace mrg -#endif +#endif // ifndef mrg_journal_aio_cb_hpp Modified: store/trunk/cpp/lib/jrnl/arr_cnt.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/arr_cnt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::arr_cnt (enqueue map). See +* 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. @@ -32,7 +32,7 @@ #include <cassert> -namespace rhm +namespace mrg { namespace journal { @@ -166,4 +166,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/arr_cnt.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/arr_cnt.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::arr_cnt (array counter). +* File containing code for class mrg::journal::arr_cnt (array counter). * See class documentation for details. * * \author Kim van der Riet @@ -30,12 +30,12 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_arr_cnt_hpp -#define rhm_journal_arr_cnt_hpp +#ifndef mrg_journal_arr_cnt_hpp +#define mrg_journal_arr_cnt_hpp #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -72,6 +72,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_arr_cnt_hpp +#endif // ifndef mrg_journal_arr_cnt_hpp Modified: store/trunk/cpp/lib/jrnl/cvar.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/cvar.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::cvar (condition variable). See +* 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. Modified: store/trunk/cpp/lib/jrnl/cvar.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/cvar.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,8 +27,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_cvar_hpp -#define rhm_journal_cvar_hpp +#ifndef mrg_journal_cvar_hpp +#define mrg_journal_cvar_hpp #include <cstring> #include "jrnl/jerrno.hpp" @@ -37,7 +37,7 @@ #include <pthread.h> #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -80,7 +80,7 @@ } }; -} -} +} // namespace journal +} // namespace mrg -#endif +#endif // ifndef mrg_journal_cvar_hpp Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::data_tok (data block token). +* 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. @@ -35,7 +35,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -192,4 +192,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/data_tok.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/data_tok.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::data_tok (data block token). +* File containing code for class mrg::journal::data_tok (data block token). * See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_data_tok_hpp -#define rhm_journal_data_tok_hpp +#ifndef mrg_journal_data_tok_hpp +#define mrg_journal_data_tok_hpp -namespace rhm +namespace mrg { namespace journal { @@ -47,7 +47,7 @@ #include <string> #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal @@ -166,6 +166,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_data_tok_hpp +#endif // ifndef mrg_journal_data_tok_hpp Modified: store/trunk/cpp/lib/jrnl/deq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::deq_hdr (dequeue record), +* File containing code for class mrg::journal::deq_hdr (dequeue record), * used to dequeue a previously enqueued record. * * \author Kim van der Riet @@ -30,13 +30,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_deq_hdr_hpp -#define rhm_journal_deq_hdr_hpp +#ifndef mrg_journal_deq_hdr_hpp +#define mrg_journal_deq_hdr_hpp #include <cstddef> #include "jrnl/rec_hdr.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -136,6 +136,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_deq_hdr_hpp +#endif // ifndef mrg_journal_deq_hdr_hpp Modified: store/trunk/cpp/lib/jrnl/deq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::deq_rec (journal dequeue +* 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. @@ -39,7 +39,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -451,4 +451,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/deq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::deq_rec (journal dequeue +* 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 @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_deq_rec_hpp -#define rhm_journal_deq_rec_hpp +#ifndef mrg_journal_deq_rec_hpp +#define mrg_journal_deq_rec_hpp -namespace rhm +namespace mrg { namespace journal { @@ -45,7 +45,7 @@ #include "jrnl/deq_hdr.hpp" #include "jrnl/jrec.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -98,6 +98,6 @@ }; // class deq_rec } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_deq_rec_hpp +#endif // ifndef mrg_journal_deq_rec_hpp Modified: store/trunk/cpp/lib/jrnl/enq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::enq_hdr (enueue header), +* 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 @@ -30,13 +30,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_enq_hdr_hpp -#define rhm_journal_enq_hdr_hpp +#ifndef mrg_journal_enq_hdr_hpp +#define mrg_journal_enq_hdr_hpp #include <cstddef> #include "jrnl/rec_hdr.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -160,6 +160,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_enq_hdr_hpp +#endif // ifndef mrg_journal_enq_hdr_hpp Modified: store/trunk/cpp/lib/jrnl/enq_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::enq_map (enqueue map). See +* 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. @@ -36,7 +36,7 @@ #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -209,4 +209,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/enq_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::enq_map (enqueue map). +* File containing code for class mrg::journal::enq_map (enqueue map). * See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_enq_map_hpp -#define rhm_journal_enq_map_hpp +#ifndef mrg_journal_enq_map_hpp +#define mrg_journal_enq_map_hpp -namespace rhm +namespace mrg { namespace journal { @@ -47,7 +47,7 @@ #include <pthread.h> #include <vector> -namespace rhm +namespace mrg { namespace journal { @@ -107,6 +107,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_enq_map_hpp +#endif // ifndef mrg_journal_enq_map_hpp Modified: store/trunk/cpp/lib/jrnl/enq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::enq_rec (journal enqueue +* 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. @@ -39,7 +39,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -612,4 +612,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/enq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::enq_rec (journal enqueue +* 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. @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_enq_rec_hpp -#define rhm_journal_enq_rec_hpp +#ifndef mrg_journal_enq_rec_hpp +#define mrg_journal_enq_rec_hpp -namespace rhm +namespace mrg { namespace journal { @@ -43,7 +43,7 @@ #include "jrnl/enq_hdr.hpp" #include "jrnl/jrec.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -111,6 +111,6 @@ }; // class enq_rec } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_enq_rec_hpp +#endif // ifndef mrg_journal_enq_rec_hpp Modified: store/trunk/cpp/lib/jrnl/enums.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enums.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/enums.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing definitions for namespace rhm::journal enums. +* File containing definitions for namespace mrg::journal enums. * * \author Kim van der Riet * @@ -29,10 +29,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_enums_hpp -#define rhm_journal_enums_hpp +#ifndef mrg_journal_enums_hpp +#define mrg_journal_enums_hpp -namespace rhm +namespace mrg { namespace journal { @@ -103,6 +103,6 @@ } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_enums_hpp +#endif // ifndef mrg_journal_enums_hpp Modified: store/trunk/cpp/lib/jrnl/fcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/fcntl.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/fcntl.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::fcntl (non-logging file +* 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. * @@ -40,7 +40,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -406,4 +406,4 @@ std::string fcntl::_pool_dir; } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/fcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/fcntl.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/fcntl.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::fcntl (non-logging file +* File containing code for class mrg::journal::fcntl (non-logging file * handle), used for controlling journal log files. See class documentation for * details. * @@ -29,10 +29,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_fcntl_hpp -#define rhm_journal_fcntl_hpp +#ifndef mrg_journal_fcntl_hpp +#define mrg_journal_fcntl_hpp -namespace rhm +namespace mrg { namespace journal { @@ -45,7 +45,7 @@ #include "jrnl/rcvdat.hpp" #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -155,6 +155,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_fcntl_hpp +#endif // ifndef mrg_journal_fcntl_hpp Modified: store/trunk/cpp/lib/jrnl/file_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::file_hdr (file +* 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. * @@ -31,8 +31,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_file_hdr_hpp -#define rhm_journal_file_hdr_hpp +#ifndef mrg_journal_file_hdr_hpp +#define mrg_journal_file_hdr_hpp #include <cerrno> #include <ctime> @@ -41,7 +41,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -203,6 +203,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_file_hdr_hpp +#endif // ifndef mrg_journal_file_hdr_hpp Modified: store/trunk/cpp/lib/jrnl/jcfg.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcfg.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jcfg.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -30,8 +30,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jcfg_hpp -#define rhm_journal_jcfg_hpp +#ifndef mrg_journal_jcfg_hpp +#define mrg_journal_jcfg_hpp #if defined(__i386__) /* little endian, 32 bits */ #define JRNL_LITTLE_ENDIAN @@ -88,4 +88,4 @@ #define RHM_LENDIAN_FLAG 0 ///< Value of little endian flag on disk #define RHM_BENDIAN_FLAG 1 ///< Value of big endian flag on disk -#endif // ifndef rhm_journal_jcfg_hpp +#endif // ifndef mrg_journal_jcfg_hpp Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -4,7 +4,7 @@ * Red Hat Messaging - Message Journal * * Messaging journal top-level control and interface class -* rhm::journal::jcntl. See comments in file jcntl.hpp for details. +* mrg::journal::jcntl. See comments in file jcntl.hpp for details. * * Copyright 2007, 2008 Red Hat, Inc. * @@ -47,7 +47,7 @@ #include <sstream> #include <unistd.h> -namespace rhm +namespace mrg { namespace journal { @@ -977,4 +977,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -4,7 +4,7 @@ * Red Hat Messaging - Message Journal * * Messaging journal top-level control and interface class -* rhm::journal::jcntl. See class documentation for details. +* mrg::journal::jcntl. See class documentation for details. * * Copyright 2007, 2008 Red Hat, Inc. * @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jcntl_hpp -#define rhm_journal_jcntl_hpp +#ifndef mrg_journal_jcntl_hpp +#define mrg_journal_jcntl_hpp -namespace rhm +namespace mrg { namespace journal { @@ -48,7 +48,7 @@ #include "jrnl/wmgr.hpp" #include "jrnl/wrfc.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -681,6 +681,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jcntl_hpp +#endif // ifndef mrg_journal_jcntl_hpp Modified: store/trunk/cpp/lib/jrnl/jdir.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jdir.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::jdir (journal data +* 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. * @@ -42,7 +42,7 @@ #include <sstream> #include <sys/stat.h> -namespace rhm +namespace mrg { namespace journal { @@ -426,4 +426,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jdir.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jdir.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::jdir (journal data +* 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. * @@ -31,10 +31,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jdir_hpp -#define rhm_journal_jdir_hpp +#ifndef mrg_journal_jdir_hpp +#define mrg_journal_jdir_hpp -namespace rhm +namespace mrg { namespace journal { @@ -44,7 +44,7 @@ #include "jrnl/jinf.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -319,6 +319,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jdir_hpp +#endif // ifndef mrg_journal_jdir_hpp Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::jerrno (journal error +* 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. @@ -34,7 +34,7 @@ #include "jrnl/jerrno.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -234,4 +234,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jerrno.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jerrno.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::jerrno (journal error +* File containing code for class mrg::journal::jerrno (journal error * codes). See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jerrno_hpp -#define rhm_journal_jerrno_hpp +#ifndef mrg_journal_jerrno_hpp +#define mrg_journal_jerrno_hpp -namespace rhm +namespace mrg { namespace journal { @@ -45,7 +45,7 @@ #include <string> #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -149,6 +149,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jerrno_hpp +#endif // ifndef mrg_journal_jerrno_hpp Modified: store/trunk/cpp/lib/jrnl/jexception.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jexception.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* Generic journal exception class rhm::journal::jexception. See comments +* Generic journal exception class mrg::journal::jexception. See comments * in file jexception.hpp for details. * * \author Kim van der Riet @@ -38,7 +38,7 @@ #define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1 -namespace rhm +namespace mrg { namespace journal { @@ -180,4 +180,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jexception.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jexception.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* Generic journal exception class rhm::journal::jexception (derived +* 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. @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jrnl_exception_hpp -#define rhm_journal_jrnl_exception_hpp +#ifndef mrg_journal_jrnl_exception_hpp +#define mrg_journal_jrnl_exception_hpp -namespace rhm +namespace mrg { namespace journal { @@ -62,7 +62,7 @@ throw jexception(jerrno::JERR__PTHREAD, oss.str(), cls, fn); \ } -namespace rhm +namespace mrg { namespace journal { @@ -114,6 +114,6 @@ }; // class jexception } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jrnl_exception_hpp +#endif // ifndef mrg_journal_jrnl_exception_hpp Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::jinf class. +* This file contains the code for the mrg::journal::jinf class. * * See jinf.hpp comments for details of this class. * @@ -40,7 +40,7 @@ #include "jrnl/jerrno.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -378,4 +378,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jinf.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jinf.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::jinf class. +* This file contains the code for the mrg::journal::jinf class. * * \author Kim van der Riet * @@ -29,14 +29,14 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jinf_hpp -#define rhm_journal_jinf_hpp +#ifndef mrg_journal_jinf_hpp +#define mrg_journal_jinf_hpp #include <ctime> #include <string> #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -113,6 +113,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jinf_hpp +#endif // ifndef mrg_journal_jinf_hpp Modified: store/trunk/cpp/lib/jrnl/jrec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jrec.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing source code for class rhm::journal::jrec (abstract 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 @@ -37,7 +37,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -116,4 +116,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/jrec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/jrec.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing source code for class rhm::journal::jrec (abstract journal +* File containing source code for class mrg::journal::jrec (abstract journal * jrecord). See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_jrec_hpp -#define rhm_journal_jrec_hpp +#ifndef mrg_journal_jrec_hpp +#define mrg_journal_jrec_hpp -namespace rhm +namespace mrg { namespace journal { @@ -48,7 +48,7 @@ #include <string> #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -177,6 +177,6 @@ }; // class jrec } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_jrec_hpp +#endif // ifndef mrg_journal_jrec_hpp Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::pmgr (page manager). See +* File containing code for class mrg::journal::pmgr (page manager). See * comments in file pmgr.hpp for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -39,7 +39,7 @@ #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -208,4 +208,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/pmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::pmgr (page manager). See +* File containing code for class mrg::journal::pmgr (page manager). See * class documentation for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_pmgr_hpp -#define rhm_journal_pmgr_hpp +#ifndef mrg_journal_pmgr_hpp +#define mrg_journal_pmgr_hpp -namespace rhm +namespace mrg { namespace journal { @@ -50,7 +50,7 @@ #include "jrnl/txn_map.hpp" #include "jrnl/txn_rec.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -133,6 +133,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_pmgr_hpp +#endif // ifndef mrg_journal_pmgr_hpp Modified: store/trunk/cpp/lib/jrnl/rcvdat.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -29,8 +29,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rcvdat_hpp -#define rhm_journal_rcvdat_hpp +#ifndef mrg_journal_rcvdat_hpp +#define mrg_journal_rcvdat_hpp #include <cstddef> #include <iomanip> @@ -40,7 +40,7 @@ #include "jrnl/jcfg.hpp" #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -133,7 +133,7 @@ return oss.str(); } }; -} -} +} // namespace journal +} // namespace mrg -#endif +#endif // ifndef mrg_journal_rcvdat_hpp Modified: store/trunk/cpp/lib/jrnl/rec_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rec_hdr (record header), +* 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). * @@ -31,14 +31,14 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rec_hdr_hpp -#define rhm_journal_rec_hdr_hpp +#ifndef mrg_journal_rec_hdr_hpp +#define mrg_journal_rec_hdr_hpp #include <cstddef> #include "jrnl/jcfg.hpp" #include <sys/types.h> -namespace rhm +namespace mrg { namespace journal { @@ -138,6 +138,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_rec_hdr_hpp +#endif // ifndef mrg_journal_rec_hdr_hpp Modified: store/trunk/cpp/lib/jrnl/rec_tail.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rec_tail (record tail), used to +* 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. * @@ -31,13 +31,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rec_tail_hpp -#define rhm_journal_rec_tail_hpp +#ifndef mrg_journal_rec_tail_hpp +#define mrg_journal_rec_tail_hpp #include <cstddef> #include "jrnl/jcfg.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -93,6 +93,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_rec_tail_hpp +#endif // ifndef mrg_journal_rec_tail_hpp Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rmgr (read manager). See +* File containing code for class mrg::journal::rmgr (read manager). See * comments in file rmgr.hpp for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -37,7 +37,7 @@ #include "jrnl/jerrno.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -801,4 +801,4 @@ */ } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/rmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rmgr (read manager). See +* File containing code for class mrg::journal::rmgr (read manager). See * class documentation for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rmgr_hpp -#define rhm_journal_rmgr_hpp +#ifndef mrg_journal_rmgr_hpp +#define mrg_journal_rmgr_hpp -namespace rhm +namespace mrg { namespace journal { @@ -47,7 +47,7 @@ #include "jrnl/rec_hdr.hpp" #include "jrnl/rrfc.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -110,6 +110,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_rmgr_hpp +#endif // ifndef mrg_journal_rmgr_hpp Modified: store/trunk/cpp/lib/jrnl/rrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rrfc (rotating +* 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. @@ -35,7 +35,7 @@ #include "jrnl/jerrno.hpp" #include "jrnl/jexception.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -107,4 +107,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/rrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rrfc (rotating +* File containing code for class mrg::journal::rrfc (rotating * file controller). See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rrfc_hpp -#define rhm_journal_rrfc_hpp +#ifndef mrg_journal_rrfc_hpp +#define mrg_journal_rrfc_hpp -namespace rhm +namespace mrg { namespace journal { @@ -44,7 +44,7 @@ #include <cstddef> #include "jrnl/fcntl.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -141,6 +141,6 @@ }; // class rrfc } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_rrfc_hpp +#endif // ifndef mrg_journal_rrfc_hpp Modified: store/trunk/cpp/lib/jrnl/slock.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/slock.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::slock (scoped lock). See +* 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. Modified: store/trunk/cpp/lib/jrnl/slock.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/slock.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,8 +3,8 @@ * * Red Hat Messaging - Message Journal * -* Messaging journal scoped lock class rhm::journal::slock and scoped try-lock -* class rhm::journal::stlock. +* Messaging journal scoped lock class mrg::journal::slock and scoped try-lock +* class mrg::journal::stlock. * * Copyright 2007, 2008 Red Hat, Inc. * @@ -28,8 +28,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_slock_hpp -#define rhm_journal_slock_hpp +#ifndef mrg_journal_slock_hpp +#define mrg_journal_slock_hpp #include <cerrno> #include <cstring> @@ -38,7 +38,7 @@ #include <pthread.h> #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -83,6 +83,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_slock_hpp +#endif // ifndef mrg_journal_slock_hpp Modified: store/trunk/cpp/lib/jrnl/time_ns.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -44,5 +44,5 @@ } -} // namespace jtt -} // namespace rhm +} // namespace journal +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/time_ns.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/time_ns.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/time_ns.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -22,14 +22,14 @@ * * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_time_ns_hpp -#define rhm_jtt_time_ns_hpp +#ifndef mrg_jtt_time_ns_hpp +#define mrg_jtt_time_ns_hpp #include <cerrno> #include <ctime> #include <string> -namespace rhm +namespace mrg { namespace journal { @@ -91,7 +91,7 @@ { if(tv_sec == rhs.tv_sec) return tv_nsec <= rhs.tv_nsec; return tv_sec <= rhs.tv_sec; } }; -} // namespace jtt -} // namespace rhm +} // namespace journal +} // namespace mrg -#endif // ifndef rhm_jtt_time_ns_hpp +#endif // ifndef mrg_jtt_time_ns_hpp Modified: store/trunk/cpp/lib/jrnl/txn_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::txn_hdr (transaction +* 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 @@ -30,13 +30,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_txn_hdr_hpp -#define rhm_journal_txn_hdr_hpp +#ifndef mrg_journal_txn_hdr_hpp +#define mrg_journal_txn_hdr_hpp #include <cstddef> #include "jrnl/rec_hdr.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -120,6 +120,6 @@ #pragma pack() } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_txn_hdr_hpp +#endif // ifndef mrg_journal_txn_hdr_hpp Modified: store/trunk/cpp/lib/jrnl/txn_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::txn_map (transaction map). See +* 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. @@ -36,7 +36,7 @@ #include "jrnl/slock.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -280,4 +280,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::txn_map (transaction map). +* File containing code for class mrg::journal::txn_map (transaction map). * See class documentation for details. * * \author Kim van der Riet @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_txn_map_hpp -#define rhm_journal_txn_map_hpp +#ifndef mrg_journal_txn_map_hpp +#define mrg_journal_txn_map_hpp -namespace rhm +namespace mrg { namespace journal { @@ -48,7 +48,7 @@ #include <sys/types.h> #include <vector> -namespace rhm +namespace mrg { namespace journal { @@ -150,6 +150,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_txn_map_hpp +#endif // ifndef mrg_journal_txn_map_hpp Modified: store/trunk/cpp/lib/jrnl/txn_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::txn_rec (journal dequeue +* 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. @@ -39,7 +39,7 @@ #include "jrnl/jexception.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -439,4 +439,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* This file contains the code for the rhm::journal::txn_rec (journal data +* 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 @@ -30,10 +30,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_txn_rec_hpp -#define rhm_journal_txn_rec_hpp +#ifndef mrg_journal_txn_rec_hpp +#define mrg_journal_txn_rec_hpp -namespace rhm +namespace mrg { namespace journal { @@ -45,7 +45,7 @@ #include "jrnl/jrec.hpp" #include "jrnl/txn_hdr.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -95,6 +95,6 @@ }; // class txn_rec } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_txn_rec_hpp +#endif // ifndef mrg_journal_txn_rec_hpp Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::wmgr (read manager). See +* File containing code for class mrg::journal::wmgr (read manager). See * comments in file wmgr.hpp for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -39,7 +39,7 @@ #include "jrnl/jerrno.hpp" #include <sstream> -namespace rhm +namespace mrg { namespace journal { @@ -1123,4 +1123,4 @@ const char* wmgr::_op_str[] = {"enqueue", "dequeue", "abort", "commit"}; } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/wmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::wmgr (read manager). See +* File containing code for class mrg::journal::wmgr (read manager). See * class documentation for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_wmgr_hpp -#define rhm_journal_wmgr_hpp +#ifndef mrg_journal_wmgr_hpp +#define mrg_journal_wmgr_hpp -namespace rhm +namespace mrg { namespace journal { @@ -46,7 +46,7 @@ #include "jrnl/wrfc.hpp" #include <set> -namespace rhm +namespace mrg { namespace journal { @@ -139,6 +139,6 @@ }; } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_wmgr_hpp +#endif // ifndef mrg_journal_wmgr_hpp Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::rrfc (rotating +* 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. @@ -34,7 +34,7 @@ #include "jrnl/jerrno.hpp" #include "jrnl/jexception.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -185,4 +185,4 @@ } } // namespace journal -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/lib/jrnl/wrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -3,7 +3,7 @@ * * Red Hat Messaging - Message Journal * -* File containing code for class rhm::journal::wrfc (write rotating +* File containing code for class mrg::journal::wrfc (write rotating * file controller). See class documentation for details. * * Copyright 2007, 2008 Red Hat, Inc. @@ -28,10 +28,10 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_journal_rfc_hpp -#define rhm_journal_rfc_hpp +#ifndef mrg_journal_rfc_hpp +#define mrg_journal_rfc_hpp -namespace rhm +namespace mrg { namespace journal { @@ -43,7 +43,7 @@ #include "jrnl/enums.hpp" #include "jrnl/rrfc.hpp" -namespace rhm +namespace mrg { namespace journal { @@ -131,6 +131,6 @@ }; // class wrfc } // namespace journal -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_journal_rfc_hpp +#endif // ifndef mrg_journal_rfc_hpp Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/OrderingTest.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -36,7 +36,7 @@ using namespace qpid::broker; using namespace qpid::framing; -using namespace rhm::bdbstore; +using namespace mrg::msgstore; QPID_AUTO_TEST_SUITE(OrderingTest) Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/SimpleTest.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -40,7 +40,7 @@ using namespace qpid; using namespace qpid::broker; using namespace qpid::framing; -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using namespace std; QPID_AUTO_TEST_SUITE(SimpleTest) Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ #include "qpid/framing/AMQHeaderBody.h" #include "qpid/log/Statement.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using namespace qpid::broker; using namespace qpid::framing; using namespace std; Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp =================================================================== --- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -36,7 +36,7 @@ #include "qpid/log/Statement.h" #include "TxnCtxt.h" -using namespace rhm::bdbstore; +using namespace mrg::msgstore; using namespace qpid::broker; using namespace qpid::framing; using namespace std; Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -34,7 +34,7 @@ #include "jrnl/jcfg.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(journal_basic) Modified: store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -34,7 +34,7 @@ #include "jrnl/jcfg.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(journal_basic_txn) Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ #include "jrnl/jcfg.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(journal_read) Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ #include "jrnl/jcfg.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(journal_read_txn) Modified: store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_arr_cnt.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -33,10 +33,10 @@ #include "jrnl/arr_cnt.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; -QPID_AUTO_TEST_SUITE(eng_map_suite) +QPID_AUTO_TEST_SUITE(arr_cnt_suite) const string test_filename("_ut_arr_cnt"); Modified: store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -34,10 +34,10 @@ #include "jrnl/jerrno.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; -QPID_AUTO_TEST_SUITE(eng_map_suite) +QPID_AUTO_TEST_SUITE(enq_map_suite) const string test_filename("_ut_enq_map"); Modified: store/trunk/cpp/tests/jrnl/_ut_jdir.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -49,7 +49,7 @@ #define NUM_CLEAR_OPS 20 using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(jdir_suite) Modified: store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -34,11 +34,11 @@ #include "jrnl/jerrno.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(jerrno_suite) -using namespace rhm::journal; +using namespace mrg::journal; const string test_filename("_ut_jerrno"); Modified: store/trunk/cpp/tests/jrnl/_ut_jexception.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ #include "jrnl/jexception.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(jexception_suite) Modified: store/trunk/cpp/tests/jrnl/_ut_jinf.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -44,7 +44,7 @@ #define JFSIZE_SBLKS 128 using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(jinf_suite) Modified: store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -39,7 +39,7 @@ #include "jrnl/txn_hdr.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(rec_hdr_suite) Modified: store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,10 +28,10 @@ #include "jrnl/time_ns.hpp" using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; -QPID_AUTO_TEST_SUITE(jtt_time_ns) +QPID_AUTO_TEST_SUITE(time_ns_suite) const string test_filename("_ut_time_ns"); Modified: store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -35,7 +35,7 @@ #include <sstream> using namespace boost::unit_test; -using namespace rhm::journal; +using namespace mrg::journal; using namespace std; QPID_AUTO_TEST_SUITE(txn_map_suite) Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,7 +28,7 @@ #include <iostream> using namespace boost::unit_test; -using namespace rhm::jtt; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_data_src) Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_init_params.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -26,7 +26,7 @@ #include <iostream> using namespace boost::unit_test; -using namespace rhm::jtt; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_jrnl_init_params) Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -30,8 +30,8 @@ #include "jrnl/jerrno.hpp" using namespace boost::unit_test; -using namespace rhm::journal; -using namespace rhm::jtt; +using namespace mrg::journal; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_jrnl_instance) @@ -50,7 +50,7 @@ const u_int32_t jfsize_sblks = 128; args a("a1"); - using rhm::jtt::test_case; + using mrg::jtt::test_case; test_case::shared_ptr p(new test_case(1, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET, test_case::JDL_INTERNAL, "t1")); jrnl_instance ji(jid, jdir, bfn, num_jfiles, jfsize_sblks); @@ -73,7 +73,7 @@ const u_int32_t jfsize_sblks = 128; args a("a2"); - using rhm::jtt::test_case; + using mrg::jtt::test_case; test_case::shared_ptr p(new test_case(2, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET, test_case::JDL_INTERNAL, "t2")); jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles, @@ -98,7 +98,7 @@ const u_int32_t jfsize_sblks = 128; args a("a3"); - using rhm::jtt::test_case; + using mrg::jtt::test_case; test_case::shared_ptr p(new test_case(3, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET, test_case::JDL_INTERNAL, "t3")); jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles, @@ -123,7 +123,7 @@ const u_int32_t jfsize_sblks = 128; args a("a4"); - using rhm::jtt::test_case; + using mrg::jtt::test_case; test_case::shared_ptr p(new test_case(5, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET, test_case::JDL_INTERNAL, "t5")); jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles, @@ -155,7 +155,7 @@ args a("a5"); a.recover_mode = true; - using rhm::jtt::test_case; + using mrg::jtt::test_case; test_case::shared_ptr p(new test_case(6, 0, 0, 0, false, 0, 0, test_case::JTT_PERSISTNET, test_case::JDL_INTERNAL, "t6")); jrnl_init_params::shared_ptr jpp(new jrnl_init_params(jid, jdir, bfn, num_jfiles, Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_read_arg.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,7 +28,7 @@ #include <boost/program_options.hpp> namespace po = boost::program_options; -using namespace rhm::jtt; +using namespace mrg::jtt; using namespace boost::unit_test; using namespace std; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -29,7 +29,7 @@ #include "test_case_result.hpp" using namespace boost::unit_test; -using namespace rhm::jtt; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_test_case) @@ -46,7 +46,7 @@ const bool auto_deq = true; const std::size_t min_xid_size = 0x200; const std::size_t max_xid_size = 0x200; - using rhm::jtt::test_case; + using mrg::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; const string comment = "This is a test"; @@ -76,7 +76,7 @@ const bool auto_deq = true; const std::size_t min_xid_size = 0x200; const std::size_t max_xid_size = 0x200; - using rhm::jtt::test_case; + using mrg::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; const string comment = "This is a test"; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,8 +28,8 @@ #include "test_case_result.hpp" using namespace boost::unit_test; -using namespace rhm::journal; -using namespace rhm::jtt; +using namespace mrg::journal; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_test_case_result) 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 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,8 +27,8 @@ #include "test_case_result_agregation.hpp" using namespace boost::unit_test; -using namespace rhm::journal; -using namespace rhm::jtt; +using namespace mrg::journal; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_test_case_result_agregation) Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -29,7 +29,7 @@ #include "test_case_set.hpp" using namespace boost::unit_test; -using namespace rhm::jtt; +using namespace mrg::jtt; using namespace std; QPID_AUTO_TEST_SUITE(jtt_test_case_set) @@ -70,7 +70,7 @@ const bool auto_deq = true; const std::size_t min_xid_size = 0x200; const std::size_t max_xid_size = 0x200; - using rhm::jtt::test_case; + using mrg::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; const string comment = "This is a test"; @@ -103,7 +103,7 @@ const bool auto_deq = true; const std::size_t min_xid_size = 0x200; const std::size_t max_xid_size = 0x200; - using rhm::jtt::test_case; + using mrg::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; const string comment = "This is a test"; Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -28,7 +28,7 @@ namespace po = boost::program_options; -namespace rhm +namespace mrg { namespace jtt { @@ -225,4 +225,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/args.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/args.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,13 +21,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_args_hpp -#define rhm_jtt_args_hpp +#ifndef mrg_jtt_args_hpp +#define mrg_jtt_args_hpp #include <boost/program_options.hpp> #include "read_arg.hpp" -namespace rhm +namespace mrg { namespace jtt { @@ -63,6 +63,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_args_hpp +#endif // ifndef mrg_jtt_args_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <iomanip> #include <sstream> -namespace rhm +namespace mrg { namespace jtt { @@ -85,5 +85,5 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,8 +21,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_data_src_hpp -#define rhm_jtt_data_src_hpp +#ifndef mrg_jtt_data_src_hpp +#define mrg_jtt_data_src_hpp #include <cstddef> #include "jrnl/slock.hpp" @@ -33,7 +33,7 @@ #define DATA_SIZE 1024 * 1024 #define XID_SIZE 1024 * 1024 -namespace rhm +namespace mrg { namespace jtt { @@ -65,12 +65,12 @@ private: data_src(); - static u_int64_t get_xid_cnt() { rhm::journal::slock s(_m.m()); return _xid_cnt++; } + 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 rhm +} // namespace mrg -#endif // ifndef rhm_jtt_data_src_hpp +#endif // ifndef mrg_jtt_data_src_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -23,7 +23,7 @@ #include "jrnl_init_params.hpp" -namespace rhm +namespace mrg { namespace jtt { @@ -69,4 +69,4 @@ const u_int32_t jrnl_init_params::def_wcache_pgsize_sblks = 64; } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_init_params.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,14 +21,14 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_jrnl_init_params_hpp -#define rhm_jtt_jrnl_init_params_hpp +#ifndef mrg_jtt_jrnl_init_params_hpp +#define mrg_jtt_jrnl_init_params_hpp #include <boost/shared_ptr.hpp> #include <string> #include <sys/types.h> -namespace rhm +namespace mrg { namespace jtt { @@ -71,6 +71,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_jrnl_init_params_hpp +#endif // ifndef mrg_jtt_jrnl_init_params_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -33,7 +33,7 @@ #define MAX_RD_WAIT 100 // in ms #define MAX_ENQCAPTHRESH_CNT 1000 // 10s if MAX_WR_WAIT is 10 ms -namespace rhm +namespace mrg { namespace jtt { @@ -41,7 +41,7 @@ jrnl_instance::jrnl_instance(const std::string& jid, const std::string& jdir, const std::string& base_filename, const u_int16_t num_jfiles, const u_int32_t jfsize_sblks, const u_int16_t wcache_num_pages, const u_int32_t wcache_pgsize_sblks): - rhm::journal::jcntl(jid, jdir, base_filename), + mrg::journal::jcntl(jid, jdir, base_filename), _jpp(new jrnl_init_params(jid, jdir, base_filename, num_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks)), _args_ptr(0), @@ -63,7 +63,7 @@ } jrnl_instance::jrnl_instance(const jrnl_init_params::shared_ptr& p): - rhm::journal::jcntl(p->jid(), p->jdir(), p->base_filename()), + mrg::journal::jcntl(p->jid(), p->jdir(), p->base_filename()), _jpp(p), _args_ptr(0), _dtok_master_enq_list(), @@ -116,9 +116,9 @@ 0, highest_rid); recover_complete(); } - catch (const rhm::journal::jexception& e) + catch (const mrg::journal::jexception& e) { - if (e.err_code() == rhm::journal::jerrno::JERR_JDIR_STAT) + if (e.err_code() == mrg::journal::jerrno::JERR_JDIR_STAT) initialize(_jpp->num_jfiles(), _jpp->jfsize_sblks(), _jpp->wcache_num_pages(), _jpp->wcache_pgsize_sblks(), aio_rd_callback, aio_wr_callback); else @@ -129,7 +129,7 @@ initialize(_jpp->num_jfiles(), _jpp->jfsize_sblks(), _jpp->wcache_num_pages(), _jpp->wcache_pgsize_sblks(), aio_rd_callback, aio_wr_callback); } - catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); } + catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); } catch (const std::exception& e) { _tcrp->add_exception(e.what()); } catch (...) { _tcrp->add_exception("Unknown exception"); } } @@ -154,7 +154,7 @@ stop(true); _tcrp->set_stop_time(); } - catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); } + catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); } catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); } catch (...) { _tcrp->add_exception("Unknown exception"); panic(); } _tcrp->set_stop_time(); @@ -169,7 +169,7 @@ unsigned sleep_cnt = 0U; while(_tcrp->num_enq() < _tcp->num_msgs() && !_tcrp->exception()) { - dtok_ptr p(new rhm::journal::data_tok); + dtok_ptr p(new mrg::journal::data_tok); _dtok_master_enq_list.push_back(p); const char* msgp = data_src::get_data(_tcrp->num_enq() % 10); const std::size_t msg_size = _tcp->this_data_size(); @@ -177,7 +177,7 @@ const std::string xid(data_src::get_xid(xid_size)); const bool external = _tcp->this_external(); const bool transient = _tcp->this_transience(); - rhm::journal::iores res; + mrg::journal::iores res; if (xid_size) { if (external) @@ -195,13 +195,13 @@ } switch (res) { - case rhm::journal::RHM_IORES_SUCCESS: + case mrg::journal::RHM_IORES_SUCCESS: sleep_cnt = 0U; _tcrp->incr_num_enq(); if (p->has_xid() && !_tcp->auto_deq()) commit(p.get()); break; - case rhm::journal::RHM_IORES_ENQCAPTHRESH: + case mrg::journal::RHM_IORES_ENQCAPTHRESH: if (++sleep_cnt > MAX_ENQCAPTHRESH_CNT) { _tcrp->add_exception("Timeout waiting for RHM_IORES_ENQCAPTHRESH to clear."); @@ -209,20 +209,20 @@ } else if (get_wr_events() == 0) { - rhm::journal::slock sl(&_wr_full_mutex); + mrg::journal::slock sl(&_wr_full_mutex); _wr_full_cv.waitintvl(MAX_WR_WAIT * 1000000); // MAX_WR_WAIT in ms } break; default: std::ostringstream oss; oss << "ERROR: enqueue operation in journal \"" << _jid << "\" returned "; - oss << rhm::journal::iores_str(res) << "."; + oss << mrg::journal::iores_str(res) << "."; _tcrp->add_exception(oss.str()); } } flush(true); } - catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); } + catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); } catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); } catch (...) { _tcrp->add_exception("Unknown exception"); panic(); } } @@ -239,7 +239,7 @@ { journal::data_tok* dtokp = 0; { - rhm::journal::slock sl(&_rd_list_mutex); + mrg::journal::slock sl(&_rd_list_mutex); if (_dtok_rd_list.empty()) _rd_list_cv.wait(); if (!_dtok_rd_list.empty()) @@ -267,13 +267,13 @@ std::size_t xsize = 0; bool tr = false; bool ext = false; - rhm::journal::iores res = read_data_record(&dptr, dsize, &xptr, xsize, tr, + mrg::journal::iores res = read_data_record(&dptr, dsize, &xptr, xsize, tr, ext, dtokp); switch (res) { - case rhm::journal::RHM_IORES_SUCCESS: + case mrg::journal::RHM_IORES_SUCCESS: { - rhm::journal::slock sl(&_deq_list_mutex); + mrg::journal::slock sl(&_deq_list_mutex); _dtok_deq_list.push_back(dtokp); _deq_list_cv.broadcast(); } @@ -288,20 +288,20 @@ dptr = 0; xptr = 0; break; - case rhm::journal::RHM_IORES_PAGE_AIOWAIT: + case mrg::journal::RHM_IORES_PAGE_AIOWAIT: if (get_rd_events() == 0) { - rhm::journal::slock sl(&_rd_aio_mutex); + mrg::journal::slock sl(&_rd_aio_mutex); _rd_aio_cv.waitintvl(MAX_RD_WAIT * 1000000); // MAX_RD_WAIT in ms } break; default: std::ostringstream oss; oss << "ERROR: read operation in journal \"" << _jid; - oss << "\" returned " << rhm::journal::iores_str(res) << "."; + oss << "\" returned " << mrg::journal::iores_str(res) << "."; _tcrp->add_exception(oss.str()); { - rhm::journal::slock sl(&_deq_list_mutex); + mrg::journal::slock sl(&_deq_list_mutex); _deq_list_cv.broadcast(); // wake up deq thread } } @@ -310,7 +310,7 @@ } } } - catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); } + catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); } catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); } catch (...) { _tcrp->add_exception("Unknown exception"); panic(); } } @@ -326,7 +326,7 @@ { journal::data_tok* dtokp = 0; { - rhm::journal::slock sl(&_deq_list_mutex); + mrg::journal::slock sl(&_deq_list_mutex); if (_dtok_deq_list.empty()) _deq_list_cv.wait(); if (!_dtok_deq_list.empty()) @@ -337,12 +337,12 @@ } if (dtokp) { - rhm::journal::iores res; + mrg::journal::iores res; if (dtokp->has_xid()) res = dequeue_txn_data_record(dtokp, dtokp->xid()); else res = dequeue_data_record(dtokp); - if (res == rhm::journal::RHM_IORES_SUCCESS) + if (res == mrg::journal::RHM_IORES_SUCCESS) { _tcrp->incr_num_deq(); commit(dtokp); @@ -351,7 +351,7 @@ { std::ostringstream oss; oss << "ERROR: dequeue operation in journal \"" << _jid; - oss << "\" returned " << rhm::journal::iores_str(res) << "."; + oss << "\" returned " << mrg::journal::iores_str(res) << "."; _tcrp->add_exception(oss.str()); } } @@ -359,44 +359,44 @@ flush(true); } } - catch (const rhm::journal::jexception& e) { _tcrp->add_exception(e); panic(); } + catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); } catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); } catch (...) { _tcrp->add_exception("Unknown exception"); panic(); } } void -jrnl_instance::abort(const rhm::journal::data_tok* dtokp) +jrnl_instance::abort(const mrg::journal::data_tok* dtokp) { txn(dtokp, false); } void -jrnl_instance::commit(const rhm::journal::data_tok* dtokp) +jrnl_instance::commit(const mrg::journal::data_tok* dtokp) { txn(dtokp, true); } void -jrnl_instance::txn(const rhm::journal::data_tok* dtokp, const bool commit) +jrnl_instance::txn(const mrg::journal::data_tok* dtokp, const bool commit) { if (dtokp->has_xid()) { - rhm::journal::data_tok* p = prep_txn_dtok(dtokp); - rhm::journal::iores res = commit ? txn_commit(p, p->xid()) : txn_abort(p, p->xid()); - if (res != rhm::journal::RHM_IORES_SUCCESS) + mrg::journal::data_tok* p = prep_txn_dtok(dtokp); + mrg::journal::iores res = commit ? txn_commit(p, p->xid()) : txn_abort(p, p->xid()); + if (res != mrg::journal::RHM_IORES_SUCCESS) { std::ostringstream oss; oss << "ERROR: " << (commit ? "commit" : "abort") << " operation in journal \""; - oss << _jid << "\" returned " << rhm::journal::iores_str(res) << "."; + oss << _jid << "\" returned " << mrg::journal::iores_str(res) << "."; _tcrp->add_exception(oss.str()); } } } -rhm::journal::data_tok* -jrnl_instance::prep_txn_dtok(const rhm::journal::data_tok* dtokp) +mrg::journal::data_tok* +jrnl_instance::prep_txn_dtok(const mrg::journal::data_tok* dtokp) { - dtok_ptr p(new rhm::journal::data_tok); + dtok_ptr p(new mrg::journal::data_tok); _dtok_master_txn_list.push_back(p); p->set_xid(dtokp->xid()); return p.get(); @@ -429,4 +429,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,8 +21,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_jrnl_instance_hpp -#define rhm_jtt_jrnl_instance_hpp +#ifndef mrg_jtt_jrnl_instance_hpp +#define mrg_jtt_jrnl_instance_hpp #include "args.hpp" #include "jrnl_init_params.hpp" @@ -36,12 +36,12 @@ #include <list> #include <vector> -namespace rhm +namespace mrg { namespace jtt { - class jrnl_instance : public rhm::journal::jcntl + class jrnl_instance : public mrg::journal::jcntl { public: typedef boost::shared_ptr<jrnl_instance> shared_ptr; @@ -55,13 +55,13 @@ std::list<journal::data_tok*> _dtok_rd_list; std::list<journal::data_tok*> _dtok_deq_list; pthread_mutex_t _rd_aio_mutex; ///< Mutex for read aio wait conditions - rhm::journal::cvar _rd_aio_cv; ///< Condition var for read aio wait conditions + mrg::journal::cvar _rd_aio_cv; ///< Condition var for read aio wait conditions pthread_mutex_t _wr_full_mutex; ///< Mutex for write full conditions - rhm::journal::cvar _wr_full_cv; ///< Condition var for write full conditions + mrg::journal::cvar _wr_full_cv; ///< Condition var for write full conditions pthread_mutex_t _rd_list_mutex; ///< Mutex for _dtok_rd_list - rhm::journal::cvar _rd_list_cv; ///< Condition var for _dtok_rd_list + mrg::journal::cvar _rd_list_cv; ///< Condition var for _dtok_rd_list pthread_mutex_t _deq_list_mutex; ///< Mutex for _dtok_deq_list - rhm::journal::cvar _deq_list_cv; ///< Condition var for _dtok_deq_list + mrg::journal::cvar _deq_list_cv; ///< Condition var for _dtok_deq_list pthread_t _enq_thread; pthread_t _deq_thread; pthread_t _read_thread; @@ -88,36 +88,36 @@ private: inline void handle_rd_callback() { - rhm::journal::slock sl(&_rd_aio_mutex); + mrg::journal::slock sl(&_rd_aio_mutex); _rd_aio_cv.broadcast(); } static inline void handle_rd_callback(jcntl* jp) { static_cast<jrnl_instance*>(jp)->handle_rd_callback(); } - inline void handle_wr_callback(rhm::journal::data_tok* dtokp) + inline void handle_wr_callback(mrg::journal::data_tok* dtokp) { if (dtokp->wstate() == journal::data_tok::ENQ) { if (_args_ptr->read_mode.val() == read_arg::NONE) { - rhm::journal::slock sl(&_deq_list_mutex); + mrg::journal::slock sl(&_deq_list_mutex); _dtok_deq_list.push_back(dtokp); _deq_list_cv.broadcast(); } else { - rhm::journal::slock sl(&_rd_list_mutex); + mrg::journal::slock sl(&_rd_list_mutex); _dtok_rd_list.push_back(dtokp); _rd_list_cv.broadcast(); } } else // DEQ { - rhm::journal::slock sl(&_wr_full_mutex); + mrg::journal::slock sl(&_wr_full_mutex); _wr_full_cv.broadcast(); } } - static inline void handle_wr_callback(jcntl* jp, rhm::journal::data_tok* dtokp) + static inline void handle_wr_callback(jcntl* jp, mrg::journal::data_tok* dtokp) { static_cast<jrnl_instance*>(jp)->handle_wr_callback(dtokp); } void run_enq() throw (); @@ -132,10 +132,10 @@ inline static void* run_deq(void* p) { static_cast<jrnl_instance*>(p)->run_deq(); return 0; } - void abort(const rhm::journal::data_tok* dtokp); - void commit(const rhm::journal::data_tok* dtokp); - void txn(const rhm::journal::data_tok* dtokp, const bool commit); - rhm::journal::data_tok* prep_txn_dtok(const rhm::journal::data_tok* dtokp); + 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); + mrg::journal::data_tok* prep_txn_dtok(const mrg::journal::data_tok* dtokp); void panic(); @@ -145,6 +145,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_jrnl_instance_hpp +#endif // ifndef mrg_jtt_jrnl_instance_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/main.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -34,19 +34,19 @@ int main(int argc, char** argv) { - std::signal(SIGINT, rhm::jtt::test_mgr::signal_handler); - std::signal(SIGTERM, rhm::jtt::test_mgr::signal_handler); + std::signal(SIGINT, mrg::jtt::test_mgr::signal_handler); + std::signal(SIGTERM, mrg::jtt::test_mgr::signal_handler); std::cout << PACKAGE_NAME << " v." << VERSION << std::endl; std::ostringstream oss; oss << PACKAGE_NAME << " options"; - rhm::jtt::args args(oss.str()); + mrg::jtt::args args(oss.str()); if (args.parse(argc, argv)) return 1; try { - rhm::jtt::test_mgr tm(args); + mrg::jtt::test_mgr tm(args); tm.run(); } catch (const std::exception& e) Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <boost/program_options.hpp> namespace po = boost::program_options; -namespace rhm +namespace mrg { namespace jtt { @@ -92,4 +92,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/read_arg.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,13 +21,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_read_arg_hpp -#define rhm_jtt_read_arg_hpp +#ifndef mrg_jtt_read_arg_hpp +#define mrg_jtt_read_arg_hpp #include <string> #include <map> -namespace rhm +namespace mrg { namespace jtt { @@ -59,6 +59,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_read_arg_hpp +#endif // ifndef mrg_jtt_read_arg_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <iomanip> #include <sstream> -namespace rhm +namespace mrg { namespace jtt { @@ -178,4 +178,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,8 +21,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_test_case_hpp -#define rhm_jtt_test_case_hpp +#ifndef mrg_jtt_test_case_hpp +#define mrg_jtt_test_case_hpp #include <boost/shared_ptr.hpp> #include <cstddef> @@ -31,7 +31,7 @@ #include "test_case_result_agregation.hpp" #include <vector> -namespace rhm +namespace mrg { namespace jtt { @@ -107,6 +107,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_test_case_hpp +#endif // ifndef mrg_jtt_test_case_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -26,7 +26,7 @@ #include <iomanip> #include <sstream> -namespace rhm +namespace mrg { namespace jtt { @@ -200,4 +200,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,8 +21,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_test_case_result_hpp -#define rhm_jtt_test_case_result_hpp +#ifndef mrg_jtt_test_case_result_hpp +#define mrg_jtt_test_case_result_hpp #include <boost/shared_ptr.hpp> #include <deque> @@ -30,7 +30,7 @@ #include "jrnl/time_ns.hpp" #include <string> -namespace rhm +namespace mrg { namespace jtt { @@ -97,6 +97,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_test_case_result_hpp +#endif // ifndef mrg_jtt_test_case_result_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -26,7 +26,7 @@ #include <iomanip> #include <sstream> -namespace rhm +namespace mrg { namespace jtt { @@ -166,4 +166,4 @@ } } // namespace jtt -} // namespace rhm +} // 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 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result_agregation.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,14 +21,14 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_test_case_result_agregation_hpp -#define rhm_jtt_test_case_result_agregation_hpp +#ifndef mrg_jtt_test_case_result_agregation_hpp +#define mrg_jtt_test_case_result_agregation_hpp #include "test_case_result.hpp" #include <vector> -namespace rhm +namespace mrg { namespace jtt { @@ -75,6 +75,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_test_case_result_agregation_hpp +#endif // ifndef 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 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <fstream> #include <iostream> -namespace rhm +namespace mrg { namespace jtt { @@ -168,4 +168,4 @@ } } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,8 +21,8 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_test_case_set_hpp -#define rhm_jtt_test_case_set_hpp +#ifndef mrg_jtt_test_case_set_hpp +#define mrg_jtt_test_case_set_hpp #include "test_case.hpp" @@ -31,7 +31,7 @@ #include <map> #include <vector> -namespace rhm +namespace mrg { namespace jtt { @@ -96,6 +96,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_test_case_set_hpp +#endif // ifndef mrg_jtt_test_case_set_hpp Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -27,7 +27,7 @@ #include <iostream> #include "test_case_set.hpp" -namespace rhm +namespace mrg { namespace jtt { @@ -121,7 +121,7 @@ } if (!_args.recover_mode && !_args.keep_jrnls) for (ji_list_citr jii=_ji_list.begin(); jii!=_ji_list.end(); jii++) - try { rhm::journal::jdir::delete_dir((*jii)->jrnl_dir()); } + try { mrg::journal::jdir::delete_dir((*jii)->jrnl_dir()); } catch (...) {} // TODO - work out exception strategy for failure here... print_results(*tci, summary); @@ -190,4 +190,4 @@ volatile bool test_mgr::_abort = false; } // namespace jtt -} // namespace rhm +} // namespace mrg Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-09-10 18:20:45 UTC (rev 2437) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-09-10 19:43:56 UTC (rev 2438) @@ -21,15 +21,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#ifndef rhm_jtt_test_mgr_hpp -#define rhm_jtt_test_mgr_hpp +#ifndef mrg_jtt_test_mgr_hpp +#define mrg_jtt_test_mgr_hpp #include "args.hpp" #include <csignal> #include <cstdlib> #include "jrnl_instance.hpp" -namespace rhm +namespace mrg { namespace jtt { @@ -62,6 +62,6 @@ }; } // namespace jtt -} // namespace rhm +} // namespace mrg -#endif // ifndef rhm_jtt_test_mgr_hpp +#endif // ifndef mrg_jtt_test_mgr_hpp