You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2013/11/18 18:44:34 UTC
svn commit: r1543093 [1/2] - in /qpid/trunk/qpid/cpp/src/qpid/linearstore:
./ journal/
Author: kpvdr
Date: Mon Nov 18 17:44:32 2013
New Revision: 1543093
URL: http://svn.apache.org/r1543093
Log:
QPID-4984: Cleanup of #includes
Removed:
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/cvar.h
Modified:
qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/StoreException.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jdir.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jrec.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/slock.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp Mon Nov 18 17:44:32 2013
@@ -21,25 +21,14 @@
#include "qpid/linearstore/JournalImpl.h"
+#include "qpid/linearstore/DataTokenImpl.h"
#include "qpid/linearstore/JournalLogImpl.h"
-#include "qpid/linearstore/journal/jerrno.h"
#include "qpid/linearstore/journal/jexception.h"
-#include "qpid/linearstore/journal/EmptyFilePool.h"
#include "qpid/linearstore/StoreException.h"
-#include "qpid/log/Statement.h"
#include "qpid/management/ManagementAgent.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/sys/Timer.h"
-#include "qmf/org/apache/qpid/linearstore/EventCreated.h"
-#include "qmf/org/apache/qpid/linearstore/EventEnqThresholdExceeded.h"
-#include "qmf/org/apache/qpid/linearstore/EventFull.h"
-#include "qmf/org/apache/qpid/linearstore/EventRecovered.h"
-
-using namespace qpid::linearstore::journal;
-using namespace qpid::linearstore;
-using qpid::management::ManagementAgent;
-namespace _qmf = qmf::org::apache::qpid::linearstore;
+namespace qpid {
+namespace linearstore {
InactivityFireEvent::InactivityFireEvent(JournalImpl* p, const qpid::sys::Duration timeout):
qpid::sys::TimerTask(timeout, "JournalInactive:"+p->id()), _parent(p) {}
@@ -87,7 +76,7 @@ JournalImpl::~JournalImpl()
if (deleteCallback) deleteCallback(*this);
if (_init_flag && !_stop_flag){
try { stop(true); } // NOTE: This will *block* until all outstanding disk aio calls are complete!
- catch (const jexception& e) { QLS_LOG2(error, _jid, e.what()); }
+ catch (const qpid::linearstore::journal::jexception& e) { QLS_LOG2(error, _jid, e.what()); }
}
getEventsFireEventsPtr->cancel();
inactivityFireEventPtr->cancel();
@@ -106,8 +95,8 @@ JournalImpl::initManagement(qpid::manage
_agent = a;
if (_agent != 0)
{
- _mgmtObject = _qmf::Journal::shared_ptr (
- new _qmf::Journal(_agent, this));
+ _mgmtObject = ::qmf::org::apache::qpid::linearstore::Journal::shared_ptr (
+ new ::qmf::org::apache::qpid::linearstore::Journal(_agent, this));
_mgmtObject->set_name(_jid);
_mgmtObject->set_directory(_jdir.dirname());
@@ -163,11 +152,7 @@ JournalImpl::initialize(qpid::linearstor
}
void
-JournalImpl::recover(/*const uint16_t num_jfiles,
- const bool auto_expand,
- const uint16_t ae_max_jfiles,
- const uint32_t jfsize_sblks,*/
- boost::shared_ptr<qpid::linearstore::journal::EmptyFilePoolManager> efpm,
+JournalImpl::recover(boost::shared_ptr<qpid::linearstore::journal::EmptyFilePoolManager> efpm,
const uint16_t wcache_num_pages,
const uint32_t wcache_pgsize_sblks,
qpid::linearstore::journal::aio_callback* const cbp,
@@ -211,8 +196,8 @@ JournalImpl::recover(/*const uint16_t nu
if (prep_tx_list_ptr)
{
for (PreparedTransaction::list::iterator i = prep_tx_list_ptr->begin(); i != prep_tx_list_ptr->end(); i++) {
- txn_data_list tdl = _tmap.get_tdata_list(i->xid); // tdl will be empty if xid not found
- for (tdl_itr tdl_itr = tdl.begin(); tdl_itr < tdl.end(); tdl_itr++) {
+ qpid::linearstore::journal::txn_data_list tdl = _tmap.get_tdata_list(i->xid); // tdl will be empty if xid not found
+ for (qpid::linearstore::journal::tdl_itr tdl_itr = tdl.begin(); tdl_itr < tdl.end(); tdl_itr++) {
if (tdl_itr->enq_flag_) { // enqueue op
i->enqueues->add(queue_id, tdl_itr->rid_);
} else { // dequeue op
@@ -253,7 +238,7 @@ JournalImpl::recover_complete()
void
JournalImpl::enqueue_data_record(const void* const data_buff, const size_t tot_data_len,
- const size_t this_data_len, data_tok* dtokp, const bool transient)
+ const size_t this_data_len, qpid::linearstore::journal::data_tok* dtokp, const bool transient)
{
handleIoResult(jcntl::enqueue_data_record(data_buff, tot_data_len, this_data_len, dtokp, transient));
@@ -265,7 +250,7 @@ JournalImpl::enqueue_data_record(const v
}
void
-JournalImpl::enqueue_extern_data_record(const size_t tot_data_len, data_tok* dtokp,
+JournalImpl::enqueue_extern_data_record(const size_t tot_data_len, qpid::linearstore::journal::data_tok* dtokp,
const bool transient)
{
handleIoResult(jcntl::enqueue_extern_data_record(tot_data_len, dtokp, transient));
@@ -279,7 +264,7 @@ JournalImpl::enqueue_extern_data_record(
void
JournalImpl::enqueue_txn_data_record(const void* const data_buff, const size_t tot_data_len,
- const size_t this_data_len, data_tok* dtokp, const std::string& xid, const bool transient)
+ const size_t this_data_len, qpid::linearstore::journal::data_tok* dtokp, const std::string& xid, const bool transient)
{
bool txn_incr = _mgmtObject.get() != 0 ? _tmap.in_map(xid) : false;
@@ -296,7 +281,7 @@ JournalImpl::enqueue_txn_data_record(con
}
void
-JournalImpl::enqueue_extern_txn_data_record(const size_t tot_data_len, data_tok* dtokp,
+JournalImpl::enqueue_extern_txn_data_record(const size_t tot_data_len, qpid::linearstore::journal::data_tok* dtokp,
const std::string& xid, const bool transient)
{
bool txn_incr = _mgmtObject.get() != 0 ? _tmap.in_map(xid) : false;
@@ -314,7 +299,7 @@ JournalImpl::enqueue_extern_txn_data_rec
}
void
-JournalImpl::dequeue_data_record(data_tok* const dtokp, const bool txn_coml_commit)
+JournalImpl::dequeue_data_record(qpid::linearstore::journal::data_tok* const dtokp, const bool txn_coml_commit)
{
handleIoResult(jcntl::dequeue_data_record(dtokp, txn_coml_commit));
@@ -327,7 +312,7 @@ JournalImpl::dequeue_data_record(data_to
}
void
-JournalImpl::dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid, const bool txn_coml_commit)
+JournalImpl::dequeue_txn_data_record(qpid::linearstore::journal::data_tok* const dtokp, const std::string& xid, const bool txn_coml_commit)
{
bool txn_incr = _mgmtObject.get() != 0 ? _tmap.in_map(xid) : false;
@@ -344,7 +329,7 @@ JournalImpl::dequeue_txn_data_record(dat
}
void
-JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid)
+JournalImpl::txn_abort(qpid::linearstore::journal::data_tok* const dtokp, const std::string& xid)
{
handleIoResult(jcntl::txn_abort(dtokp, xid));
@@ -356,7 +341,7 @@ JournalImpl::txn_abort(data_tok* const d
}
void
-JournalImpl::txn_commit(data_tok* const dtokp, const std::string& xid)
+JournalImpl::txn_commit(qpid::linearstore::journal::data_tok* const dtokp, const std::string& xid)
{
handleIoResult(jcntl::txn_commit(dtokp, xid));
@@ -381,10 +366,10 @@ JournalImpl::stop(bool block_till_aio_cm
}
}
-iores
+qpid::linearstore::journal::iores
JournalImpl::flush(const bool block_till_aio_cmpl)
{
- const iores res = jcntl::flush(block_till_aio_cmpl);
+ const qpid::linearstore::journal::iores res = jcntl::flush(block_till_aio_cmpl);
{
qpid::sys::Mutex::ScopedLock sl(_getf_lock);
if (_wmgr.get_aio_evt_rem() && !getEventsTimerSetFlag) { setGetEventTimer(); }
@@ -420,20 +405,20 @@ JournalImpl::flushFire()
}
void
-JournalImpl::wr_aio_cb(std::vector<data_tok*>& dtokl)
+JournalImpl::wr_aio_cb(std::vector<qpid::linearstore::journal::data_tok*>& dtokl)
{
- for (std::vector<data_tok*>::const_iterator i=dtokl.begin(); i!=dtokl.end(); i++)
+ for (std::vector<qpid::linearstore::journal::data_tok*>::const_iterator i=dtokl.begin(); i!=dtokl.end(); i++)
{
DataTokenImpl* dtokp = static_cast<DataTokenImpl*>(*i);
if (/*!is_stopped() &&*/ dtokp->getSourceMessage())
{
switch (dtokp->wstate())
{
- case data_tok::ENQ:
+ case qpid::linearstore::journal::data_tok::ENQ:
//std::cout << "<<<>>> JournalImpl::wr_aio_cb() ENQ dtokp rid=0x" << std::hex << dtokp->rid() << std::dec << std::endl << std::flush; // DEBUG
dtokp->getSourceMessage()->enqueueComplete();
break;
- case data_tok::DEQ:
+ case qpid::linearstore::journal::data_tok::DEQ:
//std::cout << "<<<>>> JournalImpl::wr_aio_cb() DEQ dtokp rid=0x" << std::hex << dtokp->rid() << std::dec << std::endl << std::flush; // DEBUG
/* Don't need to signal until we have a way to ack completion of dequeue in AMQP
dtokp->getSourceMessage()->dequeueComplete();
@@ -458,7 +443,7 @@ JournalImpl::createStore() {
}
void
-JournalImpl::handleIoResult(const iores r)
+JournalImpl::handleIoResult(const qpid::linearstore::journal::iores r)
{
writeActivityFlag = true;
switch (r)
@@ -496,3 +481,5 @@ qpid::management::Manageable::status_t J
return status;
}
+
+}}
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.h Mon Nov 18 17:44:32 2013
@@ -22,33 +22,27 @@
#ifndef QPID_LINEARSTORE_JOURNALIMPL_H
#define QPID_LINEARSTORE_JOURNALIMPL_H
-#include <set>
-#include "qpid/linearstore/journal/enums.h"
-#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
+#include <boost/ptr_container/ptr_list.hpp>
+#include "qpid/broker/PersistableQueue.h"
+#include "qpid/linearstore/journal/aio_callback.h"
#include "qpid/linearstore/journal/jcntl.h"
-#include "qpid/linearstore/DataTokenImpl.h"
#include "qpid/linearstore/PreparedTransaction.h"
-#include "qpid/broker/PersistableQueue.h"
#include "qpid/sys/Timer.h"
-#include "qpid/sys/Time.h"
-#include <boost/ptr_container/ptr_list.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include "qpid/management/Manageable.h"
+
#include "qmf/org/apache/qpid/linearstore/Journal.h"
namespace qpid{
namespace sys {
-class Timer;
+//class Timer;
}
namespace linearstore{
-
-class JournalImpl;
-class JournalLogImpl;
namespace journal {
- class EmptyFilePool;
+// class EmptyFilePool;
}
+class JournalImpl;
+class JournalLogImpl;
class InactivityFireEvent : public qpid::sys::TimerTask
{
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp Mon Nov 18 17:44:32 2013
@@ -21,6 +21,8 @@
#include "qpid/linearstore/JournalLogImpl.h"
+#include "qpid/log/Statement.h"
+
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h Mon Nov 18 17:44:32 2013
@@ -23,7 +23,6 @@
#define QPID_LINEARSTORE_LOG_H
#include "qpid/linearstore/journal/JournalLog.h"
-#include "qpid/log/Statement.h"
#define QLS_LOG(level, msg) QPID_LOG(level, "Linear Store: " << msg)
#define QLS_LOG2(level, queue, msg) QPID_LOG(level, "Linear Store: Journal \"" << queue << "\":" << msg)
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp Mon Nov 18 17:44:32 2013
@@ -21,28 +21,29 @@
#include "qpid/linearstore/MessageStoreImpl.h"
-#include "db-inc.h"
-#include "qpid/broker/QueueSettings.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/framing/FieldValue.h"
#include "qpid/linearstore/BindingDbt.h"
#include "qpid/linearstore/BufferValue.h"
+#include "qpid/linearstore/Cursor.h"
+#include "qpid/linearstore/DataTokenImpl.h"
#include "qpid/linearstore/IdDbt.h"
+#include "qpid/linearstore/JournalImpl.h"
#include "qpid/linearstore/journal/EmptyFilePoolManager.h"
-#include "qpid/linearstore/journal/txn_map.h"
-#include "qpid/framing/FieldValue.h"
-#include "qmf/org/apache/qpid/linearstore/Package.h"
#include "qpid/linearstore/StoreException.h"
-#include <dirent.h>
+#include "qpid/linearstore/TxnCtxt.h"
+#include "qpid/log/Statement.h"
+#include "qmf/org/apache/qpid/linearstore/Package.h"
#define MAX_AIO_SLEEPS 100000 // tot: ~1 sec
#define AIO_SLEEP_TIME_US 10 // 0.01 ms
-namespace _qmf = qmf::org::apache::qpid::linearstore;
+//namespace _qmf = qmf::org::apache::qpid::linearstore;
namespace qpid{
namespace linearstore{
-
const std::string MessageStoreImpl::storeTopLevelDir("qls"); // Sets the top-level store dir name
// FIXME aconway 2010-03-09: was 10
@@ -147,9 +148,9 @@ void MessageStoreImpl::initManagement ()
if (broker != 0) {
agent = broker->getManagementAgent();
if (agent != 0) {
- _qmf::Package packageInitializer(agent);
- mgmtObject = _qmf::Store::shared_ptr (
- new _qmf::Store(agent, this, broker));
+ qmf::org::apache::qpid::linearstore::Package packageInitializer(agent);
+ mgmtObject = qmf::org::apache::qpid::linearstore::Store::shared_ptr (
+ new qmf::org::apache::qpid::linearstore::Store(agent, this, broker));
mgmtObject->set_location(storeDir);
mgmtObject->set_tplIsInitialized(false);
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h Mon Nov 18 17:44:32 2013
@@ -23,22 +23,14 @@
#define QPID_LINEARSTORE_MESSAGESTOREIMPL_H
#include <iomanip>
-#include <string>
-
-#include "db-inc.h"
-#include "qpid/linearstore/Cursor.h"
-#include "qpid/linearstore/IdDbt.h"
+#include "qpid/broker/MessageStore.h"
#include "qpid/linearstore/IdSequence.h"
-#include "qpid/linearstore/JournalImpl.h"
#include "qpid/linearstore/JournalLogImpl.h"
#include "qpid/linearstore/journal/jcfg.h"
#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
#include "qpid/linearstore/PreparedTransaction.h"
-#include "qpid/broker/Broker.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/management/Manageable.h"
+
#include "qmf/org/apache/qpid/linearstore/Store.h"
-#include "qpid/linearstore/TxnCtxt.h"
// Assume DB_VERSION_MAJOR == 4
#if (DB_VERSION_MINOR == 2)
@@ -46,15 +38,28 @@
#define DB_BUFFER_SMALL ENOMEM
#endif
-namespace qpid { namespace sys {
-class Timer;
-}}
-
-namespace qpid{
-namespace qls_jrnl {
-class EmptyFilePoolManager;
+class Db;
+class DbEnv;
+class Dbt;
+class DbTxn;
+
+namespace qpid {
+namespace broker {
+ class Broker;
+}
+namespace sys {
+ class Timer;
}
namespace linearstore{
+namespace journal {
+ class EmptyFilePool;
+ class EmptyFilePoolManager;
+}
+
+class IdDbt;
+class JournalImpl;
+class TplJournalImpl;
+class TxnCtxt;
/**
* An implementation of the MessageStore interface based on Berkeley DB
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp Mon Nov 18 17:44:32 2013
@@ -20,10 +20,9 @@
*/
#include "qpid/linearstore/PreparedTransaction.h"
-#include <algorithm>
-using namespace qpid::linearstore;
-using std::string;
+namespace qpid {
+namespace linearstore {
void LockedMappings::add(queue_id queue, message_id message)
{
@@ -79,3 +78,4 @@ PreparedTransaction::PreparedTransaction
: xid(_xid), enqueues(_enqueues), dequeues(_dequeues) {}
+}}
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h Mon Nov 18 17:44:32 2013
@@ -22,13 +22,11 @@
#ifndef QPID_LINEARSTORE_PREPAREDTRANSACTION_H
#define QPID_LINEARSTORE_PREPAREDTRANSACTION_H
+#include <boost/ptr_container/ptr_list.hpp>
+#include <boost/shared_ptr.hpp>
#include <list>
#include <map>
-#include <set>
#include <stdint.h>
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_list.hpp>
namespace qpid{
namespace linearstore{
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/StoreException.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/StoreException.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/StoreException.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/StoreException.h Mon Nov 18 17:44:32 2013
@@ -22,8 +22,8 @@
#ifndef QPID_LINEARSTORE_STOREEXCEPTION_H
#define QPID_LINEARSTORE_STOREEXCEPTION_H
-#include "qpid/linearstore/IdDbt.h"
#include <boost/format.hpp>
+#include "db-inc.h"
namespace qpid{
namespace linearstore{
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp Mon Nov 18 17:44:32 2013
@@ -25,6 +25,7 @@
#include "qpid/DataDir.h"
#include "qpid/linearstore/JournalLogImpl.h"
#include "qpid/linearstore/MessageStoreImpl.h"
+#include "qpid/log/Statement.h"
using qpid::linearstore::MessageStoreImpl;
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp Mon Nov 18 17:44:32 2013
@@ -21,9 +21,8 @@
#include "qpid/linearstore/TxnCtxt.h"
-#include <sstream>
-
-#include "qpid/linearstore/journal/jexception.h"
+#include "qpid/linearstore/DataTokenImpl.h"
+#include "qpid/linearstore/JournalImpl.h"
#include "qpid/linearstore/StoreException.h"
namespace qpid{
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/TxnCtxt.h Mon Nov 18 17:44:32 2013
@@ -22,23 +22,21 @@
#ifndef QPID_LINEARSTORE_TXNCTXT_H
#define QPID_LINEARSTORE_TXNCTXT_H
-#include "db-inc.h"
-#include <memory>
-#include <set>
-#include <string>
-
-#include "qpid/linearstore/DataTokenImpl.h"
-#include "qpid/linearstore/IdSequence.h"
-#include "qpid/linearstore/JournalImpl.h"
-#include "qpid/broker/PersistableQueue.h"
+#include <boost/intrusive_ptr.hpp>
#include "qpid/broker/TransactionalStore.h"
-#include "qpid/sys/Mutex.h"
+#include "qpid/linearstore/IdSequence.h"
#include "qpid/sys/uuid.h"
-#include <boost/intrusive_ptr.hpp>
+class DbEnv;
+class DbTxn;
-namespace qpid{
+namespace qpid {
+namespace broker {
+ class ExternalQueueStore;
+}
namespace linearstore{
+ class DataTokenImpl;
+ class JournalImpl;
class TxnCtxt : public qpid::broker::TransactionContext
{
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp Mon Nov 18 17:44:32 2013
@@ -21,12 +21,10 @@
#include "EmptyFilePool.h"
-#include <cctype>
#include <fstream>
#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
#include "qpid/linearstore/journal/jcfg.h"
#include "qpid/linearstore/journal/jdir.h"
-#include "qpid/linearstore/journal/JournalFile.h"
#include "qpid/linearstore/journal/JournalLog.h"
#include "qpid/linearstore/journal/slock.h"
#include "qpid/linearstore/journal/utils/file_hdr.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h Mon Nov 18 17:44:32 2013
@@ -31,7 +31,6 @@ namespace journal {
#include <deque>
#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
#include "qpid/linearstore/journal/smutex.h"
-#include <string>
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp Mon Nov 18 17:44:32 2013
@@ -21,12 +21,11 @@
#include "EmptyFilePoolManager.h"
-#include <dirent.h>
+#include "qpid/linearstore/journal/EmptyFilePool.h"
#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
#include "qpid/linearstore/journal/jdir.h"
#include "qpid/linearstore/journal/JournalLog.h"
#include "qpid/linearstore/journal/slock.h"
-#include <vector>
//#include <iostream> // DEBUG
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h Mon Nov 18 17:44:32 2013
@@ -23,13 +23,18 @@
#define QPID_QLS_JRNL_EMPTYFILEPOOLMANAGER_H_
#include <map>
-#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
+#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
#include "qpid/linearstore/journal/smutex.h"
+#include <vector>
namespace qpid {
namespace linearstore {
namespace journal {
+class EmptyFilePool;
+class EmptyFilePoolPartition;
+class JournalLog;
+
class EmptyFilePoolManager
{
protected:
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp Mon Nov 18 17:44:32 2013
@@ -21,11 +21,9 @@
#include "qpid/linearstore/journal/EmptyFilePoolPartition.h"
-#include <dirent.h>
#include <iomanip>
+#include "qpid/linearstore/journal/EmptyFilePool.h"
#include "qpid/linearstore/journal/jdir.h"
-#include "qpid/linearstore/journal/jerrno.h"
-#include "qpid/linearstore/journal/jexception.h"
#include "qpid/linearstore/journal/slock.h"
//#include <iostream> // DEBUG
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h Mon Nov 18 17:44:32 2013
@@ -22,22 +22,17 @@
#ifndef QPID_LINEARSTORE_JOURNAL_EMPTYFILEPOOLPARTITION_H_
#define QPID_LINEARSTORE_JOURNAL_EMPTYFILEPOOLPARTITION_H_
-namespace qpid {
-namespace linearstore {
-namespace journal {
- class EmptyFilePoolPartition;
-}}}
-
-#include "qpid/linearstore/journal/EmptyFilePool.h"
+#include <map>
#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
#include "qpid/linearstore/journal/smutex.h"
#include <string>
-#include <map>
#include <vector>
namespace qpid {
namespace linearstore {
namespace journal {
+
+class EmptyFilePool;
class JournalLog;
class EmptyFilePoolPartition
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h Mon Nov 18 17:44:32 2013
@@ -24,7 +24,6 @@
#include <iostream>
#include <stdint.h>
-#include <utility> // std::pair
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp Mon Nov 18 17:44:32 2013
@@ -23,7 +23,6 @@
#include <fcntl.h>
#include "qpid/linearstore/journal/jcfg.h"
-#include "qpid/linearstore/journal/jexception.h"
#include "qpid/linearstore/journal/pmgr.h"
#include "qpid/linearstore/journal/utils/file_hdr.h"
#include <unistd.h>
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h Mon Nov 18 17:44:32 2013
@@ -25,8 +25,6 @@
#include "qpid/linearstore/journal/aio.h"
#include "qpid/linearstore/journal/AtomicCounter.h"
#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
-#include <stdint.h>
-#include <string>
class file_hdr_t;
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp Mon Nov 18 17:44:32 2013
@@ -20,6 +20,7 @@
*/
#include "qpid/linearstore/journal/JournalLog.h"
+
#include <iostream>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp Mon Nov 18 17:44:32 2013
@@ -21,13 +21,9 @@
#include "qpid/linearstore/journal/LinearFileController.h"
-#include <fstream>
#include "qpid/linearstore/journal/EmptyFilePool.h"
-#include "qpid/linearstore/journal/jcfg.h"
#include "qpid/linearstore/journal/jcntl.h"
#include "qpid/linearstore/journal/JournalFile.h"
-#include "qpid/linearstore/journal/slock.h"
-#include "qpid/linearstore/journal/utils/file_hdr.h"
//#include <iostream> // DEBUG
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h Mon Nov 18 17:44:32 2013
@@ -23,13 +23,10 @@
#define QPID_LINEARSTORE_JOURNAL_LINEARFILECONTROLLER_H_
#include <deque>
+#include "qpid/linearstore/journal/aio.h"
#include "qpid/linearstore/journal/AtomicCounter.h"
#include "qpid/linearstore/journal/EmptyFilePoolTypes.h"
-// libaio forward declares
-typedef struct io_context* io_context_t;
-typedef struct iocb aio_cb;
-
namespace qpid {
namespace linearstore {
namespace journal {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp Mon Nov 18 17:44:32 2013
@@ -26,6 +26,7 @@
#include <iomanip>
#include "qpid/linearstore/journal/data_tok.h"
#include "qpid/linearstore/journal/deq_rec.h"
+#include "qpid/linearstore/journal/EmptyFilePool.h"
#include "qpid/linearstore/journal/EmptyFilePoolManager.h"
#include "qpid/linearstore/journal/enq_map.h"
#include "qpid/linearstore/journal/enq_rec.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/aio.h Mon Nov 18 17:44:32 2013
@@ -24,7 +24,6 @@
#include <libaio.h>
#include <cstring>
-#include <string.h>
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp Mon Nov 18 17:44:32 2013
@@ -22,10 +22,7 @@
#include "qpid/linearstore/journal/data_tok.h"
#include <iomanip>
-#include "qpid/linearstore/journal/jerrno.h"
-#include "qpid/linearstore/journal/jexception.h"
#include "qpid/linearstore/journal/slock.h"
-#include <sstream>
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/data_tok.h Mon Nov 18 17:44:32 2013
@@ -29,10 +29,7 @@ class data_tok;
}}}
#include <cassert>
-#include <cstddef>
#include "qpid/linearstore/journal/smutex.h"
-#include <pthread.h>
-#include <string>
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp Mon Nov 18 17:44:32 2013
@@ -23,7 +23,6 @@
#include <cassert>
#include <cstring>
-#include <iomanip>
#include "qpid/linearstore/journal/jexception.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp Mon Nov 18 17:44:32 2013
@@ -21,11 +21,7 @@
#include "qpid/linearstore/journal/enq_map.h"
-#include <iomanip>
-#include "qpid/linearstore/journal/jerrno.h"
#include "qpid/linearstore/journal/slock.h"
-#include <sstream>
-
namespace qpid {
namespace linearstore {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_map.h Mon Nov 18 17:44:32 2013
@@ -22,88 +22,79 @@
#ifndef QPID_LINEARSTORE_JOURNAL_ENQ_MAP_H
#define QPID_LINEARSTORE_JOURNAL_ENQ_MAP_H
-namespace qpid {
-namespace linearstore {
-namespace journal {
-class enq_map;
-}}}
-
-#include "qpid/linearstore/journal/jexception.h"
#include "qpid/linearstore/journal/smutex.h"
-#include <map>
-#include <pthread.h>
#include <vector>
namespace qpid {
namespace linearstore {
namespace journal {
- /**
- * \class enq_map
- * \brief Class for storing the physical file id (pfid) and a transaction locked flag for each enqueued
- * data block using the record id (rid) as a key. This is the primary mechanism for
- * deterimining the enqueue low water mark: if a pfid exists in this map, then there is
- * at least one still-enqueued record in that file. (The transaction map must also be
- * clear, however.)
- *
- * Map rids against pfid and lock status. As records are enqueued, they are added to this
- * map, and as they are dequeued, they are removed. An enqueue is locked when a transactional
- * dequeue is pending that has been neither committed nor aborted.
- * <pre>
- * key data
- *
- * rid1 --- [ pfid, txn_lock ]
- * rid2 --- [ pfid, txn_lock ]
- * rid3 --- [ pfid, txn_lock ]
- * ...
- * </pre>
- */
- class enq_map
- {
- public:
- // return/error codes
- static short EMAP_DUP_RID;
- static short EMAP_LOCKED;
- static short EMAP_RID_NOT_FOUND;
- static short EMAP_OK;
- static short EMAP_FALSE;
- static short EMAP_TRUE;
-
- typedef struct emap_data_struct_t {
- uint64_t _pfid;
- std::streampos _file_posn;
- bool _lock;
- emap_data_struct_t() : _pfid(0), _file_posn(0), _lock(false) {}
- emap_data_struct_t(const uint64_t pfid, const std::streampos file_posn, const bool lock) : _pfid(pfid), _file_posn(file_posn), _lock(lock) {}
- } emqp_data_struct_t;
- typedef std::pair<uint64_t, emap_data_struct_t> emap_param;
- typedef std::map<uint64_t, emap_data_struct_t> emap;
- typedef emap::iterator emap_itr;
-
- private:
- emap _map;
- smutex _mutex;
-
- public:
- enq_map();
- virtual ~enq_map();
-
- short insert_pfid(const uint64_t rid, const uint64_t pfid, const std::streampos file_posn); // 0=ok; -3=duplicate rid;
- short insert_pfid(const uint64_t rid, const uint64_t pfid, const std::streampos file_posn, const bool locked); // 0=ok; -3=duplicate rid;
- short get_pfid(const uint64_t rid, uint64_t& pfid); // >=0=pfid; -1=rid not found; -2=locked
- short get_remove_pfid(const uint64_t rid, uint64_t& pfid, const bool txn_flag = false); // >=0=pfid; -1=rid not found; -2=locked
- short get_file_posn(const uint64_t rid, std::streampos& file_posn); // -1=rid not found; -2=locked
- short get_data(const uint64_t rid, emap_data_struct_t& eds);
- bool is_enqueued(const uint64_t rid, bool ignore_lock = false);
- short lock(const uint64_t rid); // 0=ok; -1=rid not found
- short unlock(const uint64_t rid); // 0=ok; -1=rid not found
- short is_locked(const uint64_t rid); // 1=true; 0=false; -1=rid not found
- inline void clear() { _map.clear(); }
- inline bool empty() const { return _map.empty(); }
- inline uint32_t size() const { return uint32_t(_map.size()); }
- void rid_list(std::vector<uint64_t>& rv);
- void pfid_list(std::vector<uint64_t>& fv);
- };
+/**
+* \class enq_map
+* \brief Class for storing the physical file id (pfid) and a transaction locked flag for each enqueued
+* data block using the record id (rid) as a key. This is the primary mechanism for
+* deterimining the enqueue low water mark: if a pfid exists in this map, then there is
+* at least one still-enqueued record in that file. (The transaction map must also be
+* clear, however.)
+*
+* Map rids against pfid and lock status. As records are enqueued, they are added to this
+* map, and as they are dequeued, they are removed. An enqueue is locked when a transactional
+* dequeue is pending that has been neither committed nor aborted.
+* <pre>
+* key data
+*
+* rid1 --- [ pfid, txn_lock ]
+* rid2 --- [ pfid, txn_lock ]
+* rid3 --- [ pfid, txn_lock ]
+* ...
+* </pre>
+*/
+class enq_map
+{
+public:
+ // return/error codes
+ static short EMAP_DUP_RID;
+ static short EMAP_LOCKED;
+ static short EMAP_RID_NOT_FOUND;
+ static short EMAP_OK;
+ static short EMAP_FALSE;
+ static short EMAP_TRUE;
+
+ typedef struct emap_data_struct_t {
+ uint64_t _pfid;
+ std::streampos _file_posn;
+ bool _lock;
+ emap_data_struct_t() : _pfid(0), _file_posn(0), _lock(false) {}
+ emap_data_struct_t(const uint64_t pfid, const std::streampos file_posn, const bool lock) : _pfid(pfid), _file_posn(file_posn), _lock(lock) {}
+ } emqp_data_struct_t;
+ typedef std::pair<uint64_t, emap_data_struct_t> emap_param;
+ typedef std::map<uint64_t, emap_data_struct_t> emap;
+ typedef emap::iterator emap_itr;
+
+private:
+ emap _map;
+ smutex _mutex;
+
+public:
+ enq_map();
+ virtual ~enq_map();
+
+ short insert_pfid(const uint64_t rid, const uint64_t pfid, const std::streampos file_posn); // 0=ok; -3=duplicate rid;
+ short insert_pfid(const uint64_t rid, const uint64_t pfid, const std::streampos file_posn, const bool locked); // 0=ok; -3=duplicate rid;
+ short get_pfid(const uint64_t rid, uint64_t& pfid); // >=0=pfid; -1=rid not found; -2=locked
+ short get_remove_pfid(const uint64_t rid, uint64_t& pfid, const bool txn_flag = false); // >=0=pfid; -1=rid not found; -2=locked
+ short get_file_posn(const uint64_t rid, std::streampos& file_posn); // -1=rid not found; -2=locked
+ short get_data(const uint64_t rid, emap_data_struct_t& eds);
+ bool is_enqueued(const uint64_t rid, bool ignore_lock = false);
+ short lock(const uint64_t rid); // 0=ok; -1=rid not found
+ short unlock(const uint64_t rid); // 0=ok; -1=rid not found
+ short is_locked(const uint64_t rid); // 1=true; 0=false; -1=rid not found
+ inline void clear() { _map.clear(); }
+ inline bool empty() const { return _map.empty(); }
+ inline uint32_t size() const { return uint32_t(_map.size()); }
+ void rid_list(std::vector<uint64_t>& rv);
+ void pfid_list(std::vector<uint64_t>& fv);
+};
}}}
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp Mon Nov 18 17:44:32 2013
@@ -23,7 +23,6 @@
#include <cassert>
#include <cstring>
-#include <iomanip>
#include "qpid/linearstore/journal/jexception.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/enums.h Mon Nov 18 17:44:32 2013
@@ -26,32 +26,32 @@ namespace qpid {
namespace linearstore {
namespace journal {
- // TODO: Change this to flags, as multiple of these conditions may exist simultaneously
- /**
- * \brief Enumeration of possible return states from journal read and write operations.
- */
- enum _iores
- {
- RHM_IORES_SUCCESS = 0, ///< Success: IO operation completed noramlly.
- RHM_IORES_PAGE_AIOWAIT, ///< IO operation suspended - next page is waiting for AIO.
- RHM_IORES_FILE_AIOWAIT, ///< IO operation suspended - next file is waiting for AIO.
- RHM_IORES_EMPTY, ///< During read operations, nothing further is available to read.
- RHM_IORES_TXPENDING ///< Operation blocked by pending transaction.
- };
- typedef _iores iores;
+// TODO: Change this to flags, as multiple of these conditions may exist simultaneously
+/**
+* \brief Enumeration of possible return states from journal read and write operations.
+*/
+enum _iores
+{
+ RHM_IORES_SUCCESS = 0, ///< Success: IO operation completed noramlly.
+ RHM_IORES_PAGE_AIOWAIT, ///< IO operation suspended - next page is waiting for AIO.
+ RHM_IORES_FILE_AIOWAIT, ///< IO operation suspended - next file is waiting for AIO.
+ RHM_IORES_EMPTY, ///< During read operations, nothing further is available to read.
+ RHM_IORES_TXPENDING ///< Operation blocked by pending transaction.
+};
+typedef _iores iores;
- static inline const char* iores_str(iores res)
+static inline const char* iores_str(iores res)
+{
+ switch (res)
{
- switch (res)
- {
- case RHM_IORES_SUCCESS: return "RHM_IORES_SUCCESS";
- case RHM_IORES_PAGE_AIOWAIT: return "RHM_IORES_PAGE_AIOWAIT";
- case RHM_IORES_FILE_AIOWAIT: return "RHM_IORES_FILE_AIOWAIT";
- case RHM_IORES_EMPTY: return "RHM_IORES_EMPTY";
- case RHM_IORES_TXPENDING: return "RHM_IORES_TXPENDING";
- }
- return "<iores unknown>";
+ case RHM_IORES_SUCCESS: return "RHM_IORES_SUCCESS";
+ case RHM_IORES_PAGE_AIOWAIT: return "RHM_IORES_PAGE_AIOWAIT";
+ case RHM_IORES_FILE_AIOWAIT: return "RHM_IORES_FILE_AIOWAIT";
+ case RHM_IORES_EMPTY: return "RHM_IORES_EMPTY";
+ case RHM_IORES_TXPENDING: return "RHM_IORES_TXPENDING";
}
+ return "<iores unknown>";
+}
}}}
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp?rev=1543093&r1=1543092&r2=1543093&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp Mon Nov 18 17:44:32 2013
@@ -21,22 +21,8 @@
#include "qpid/linearstore/journal/jcntl.h"
-#include <algorithm>
-#include <cassert>
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <qpid/linearstore/journal/EmptyFilePool.h>
-#include <qpid/linearstore/journal/EmptyFilePoolManager.h>
-#include "qpid/linearstore/journal/jerrno.h"
+#include "qpid/linearstore/journal/data_tok.h"
#include "qpid/linearstore/journal/JournalLog.h"
-#include "qpid/linearstore/journal/utils/enq_hdr.h"
-#include <limits>
-#include <sstream>
-#include <unistd.h>
namespace qpid {
namespace linearstore {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org