Author: kpvdr Date: 2007-12-07 14:17:58 -0500 (Fri, 07 Dec 2007) New Revision: 1443 Modified: store/trunk/cpp/lib/BdbMessageStore.cpp store/trunk/cpp/lib/JournalImpl.cpp store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/lib/TxnCtxt.h store/trunk/cpp/lib/jrnl/data_tok.cpp store/trunk/cpp/lib/jrnl/data_tok.hpp store/trunk/cpp/lib/jrnl/deq_rec.cpp store/trunk/cpp/lib/jrnl/deq_rec.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/file_hdr.cpp 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/jexception.cpp 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/lfh.cpp store/trunk/cpp/lib/jrnl/lfh.hpp store/trunk/cpp/lib/jrnl/nlfh.cpp store/trunk/cpp/lib/jrnl/nlfh.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/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/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/jrnl/unit_test_file_hdr.cpp store/trunk/cpp/tests/jrnl/unit_test_jinf.cpp Log: Tidyup: Removed all explicit throw (jexception) declarations on functions that throw. Modified: store/trunk/cpp/lib/BdbMessageStore.cpp =================================================================== --- store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -26,6 +26,7 @@ #include <qpid/broker/Message.h> #include <qpid/framing/Buffer.h> #include <algorithm> +#include <iomanip> #include <sstream> #include "BindingDbt.h" #include "IdPairDbt.h" Modified: store/trunk/cpp/lib/JournalImpl.cpp =================================================================== --- store/trunk/cpp/lib/JournalImpl.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/JournalImpl.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -24,6 +24,7 @@ #include "JournalImpl.h" #include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <qpid/sys/Monitor.h> using namespace rhm::bdbstore; @@ -77,7 +78,7 @@ JournalImpl::recover(std::deque<data_tok*>* rd_dtokl, const aio_cb rd_cb, std::deque<data_tok*>* wr_dtokl, const aio_cb wr_cb, boost::ptr_list<bdbstore::PreparedTransaction>& prep_tx_list, u_int64_t& highest_rid, - u_int64_t queue_id) throw (jexception) + u_int64_t queue_id) { // Create list of prepared xids std::vector<std::string> prep_xid_list; @@ -113,7 +114,6 @@ #define AIO_SLEEP_TIME 1000000 const bool JournalImpl::loadMsgContent(u_int64_t rid, std::string& data, size_t offset, size_t length) - throw (journal::jexception) { if (_dtok.rid() != rid) { @@ -171,7 +171,6 @@ const iores 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) - throw (jexception) { //std::cout << " " << _jid << ":E" << std::flush; return handleInactivityTimer(jcntl::enqueue_data_record(data_buff, tot_data_len, @@ -180,7 +179,7 @@ const iores JournalImpl::enqueue_extern_data_record(const size_t tot_data_len, data_tok* dtokp, - const bool transient) throw (jexception) + const bool transient) { //std::cout << " " << _jid << ":E-ext" << std::flush; return handleInactivityTimer(jcntl::enqueue_extern_data_record(tot_data_len, dtokp, @@ -190,7 +189,7 @@ const iores 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) throw (jexception) + const bool transient) { //std::cout << " " << _jid << ":E-tx" << std::flush; return handleInactivityTimer(jcntl::enqueue_txn_data_record(data_buff, tot_data_len, @@ -199,7 +198,7 @@ const iores JournalImpl::enqueue_extern_txn_data_record(const size_t tot_data_len, data_tok* dtokp, - const std::string& xid, const bool transient) throw (jexception) + const std::string& xid, const bool transient) { //std::cout << " " << _jid << ":E-tx-ext" << std::flush; return handleInactivityTimer(jcntl::enqueue_extern_txn_data_record(tot_data_len, dtokp, xid, @@ -207,7 +206,7 @@ } const iores -JournalImpl::dequeue_data_record(data_tok* const dtokp) throw (jexception) +JournalImpl::dequeue_data_record(data_tok* const dtokp) { //std::cout << " " << _jid << ":D" << std::flush; return handleInactivityTimer(jcntl::dequeue_data_record(dtokp)); @@ -215,35 +214,34 @@ const iores JournalImpl::dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid) - throw (jexception) { //std::cout << " " << _jid << ":D-tx" << std::flush; return handleInactivityTimer(jcntl::dequeue_txn_data_record(dtokp, xid)); } const iores -JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid) throw (jexception) +JournalImpl::txn_abort(data_tok* const dtokp, const std::string& xid) { //std::cout << " " << _jid << ":A-tx" << std::flush; return handleInactivityTimer(jcntl::txn_abort(dtokp, xid)); } const iores -JournalImpl::txn_commit(data_tok* const dtokp, const std::string& xid) throw (jexception) +JournalImpl::txn_commit(data_tok* const dtokp, const std::string& xid) { //std::cout << " " << _jid << ":C-tx" << std::flush; return handleInactivityTimer(jcntl::txn_commit(dtokp, xid)); } void -JournalImpl::stop(bool block_till_aio_cmpl) throw (jexception) +JournalImpl::stop(bool block_till_aio_cmpl) { (dynamic_cast<InactivityFireEvent*>(inactivityFireEventPtr.get()))->cancel(); jcntl::stop(block_till_aio_cmpl); } void -JournalImpl::flush() throw (jexception) +JournalImpl::flush() { jcntl::flush(); if (_wmgr.get_aio_evt_rem() && !getEventsTimerSetFlag) { @@ -291,7 +289,7 @@ } const iores -JournalImpl::handleInactivityTimer(const iores r) throw (jexception) +JournalImpl::handleInactivityTimer(const iores r) { writeActivityFlag = true; return r; Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/JournalImpl.h 2007-12-07 19:17:58 UTC (rev 1443) @@ -94,10 +94,10 @@ void recover(std::deque<journal::data_tok*>* rd_dtokl, const journal::aio_cb rd_cb, std::deque<journal::data_tok*>* wr_dtokl, const journal::aio_cb wr_cb, boost::ptr_list<bdbstore::PreparedTransaction>& prep_tx_list, - u_int64_t& highest_rid, u_int64_t queue_id) throw (journal::jexception); + u_int64_t& highest_rid, u_int64_t queue_id); void recover(boost::ptr_list<bdbstore::PreparedTransaction>& prep_tx_list, - u_int64_t& highest_rid, u_int64_t queue_id) throw (journal::jexception) + u_int64_t& highest_rid, u_int64_t queue_id) { recover(&_aio_rd_cmpl_dtok_list, &aio_rd_callback, &_aio_wr_cmpl_dtok_list, &aio_wr_callback, prep_tx_list, highest_rid, queue_id); @@ -107,50 +107,43 @@ // in chunks. To be replaced when coding to do this direct from the journal is ready. // Returns true if the record is extern, false if local. const bool loadMsgContent(u_int64_t rid, std::string& data, size_t offset, - size_t length) throw (journal::jexception); + size_t length); // Overrides for write inactivity timer const journal::iores enqueue_data_record(const void* const data_buff, const size_t tot_data_len, const size_t this_data_len, journal::data_tok* dtokp, - const bool transient = false) throw (journal::jexception); + const bool transient = false); const journal::iores enqueue_extern_data_record(const size_t tot_data_len, - journal::data_tok* dtokp, const bool transient = false) - throw (journal::jexception); + journal::data_tok* dtokp, const bool transient = false); const journal::iores enqueue_txn_data_record(const void* const data_buff, const size_t tot_data_len, const size_t this_data_len, journal::data_tok* dtokp, - const std::string& xid, const bool transient = false) - throw (journal::jexception); + const std::string& xid, const bool transient = false); const journal::iores enqueue_extern_txn_data_record(const size_t tot_data_len, - journal::data_tok* dtokp, const std::string& xid, const bool transient = false) - throw (journal::jexception); + journal::data_tok* dtokp, const std::string& xid, const bool transient = false); - const journal::iores dequeue_data_record(journal::data_tok* const dtokp) - throw (journal::jexception); + const journal::iores dequeue_data_record(journal::data_tok* const dtokp); const journal::iores dequeue_txn_data_record(journal::data_tok* const dtokp, - const std::string& xid) throw (journal::jexception); + const std::string& xid); - const journal::iores txn_abort(journal::data_tok* const dtokp, const std::string& xid) - throw (journal::jexception); + const journal::iores txn_abort(journal::data_tok* const dtokp, const std::string& xid); - const journal::iores txn_commit(journal::data_tok* const dtokp, const std::string& xid) - throw (journal::jexception); + const journal::iores txn_commit(journal::data_tok* const dtokp, const std::string& xid); - void stop(bool block_till_aio_cmpl = false) throw (journal::jexception); + void stop(bool block_till_aio_cmpl = false); // Overrides for get_events timer - void flush() throw (journal::jexception); + void flush(); // TimerTask callback void getEventsFire(); void flushFire(); private: - const journal::iores handleInactivityTimer(const journal::iores r) - throw (journal::jexception); + const journal::iores handleInactivityTimer(const journal::iores r); }; // class JournalImpl } // namespace bdbstore Modified: store/trunk/cpp/lib/TxnCtxt.h =================================================================== --- store/trunk/cpp/lib/TxnCtxt.h 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/TxnCtxt.h 2007-12-07 19:17:58 UTC (rev 1443) @@ -34,6 +34,7 @@ #include "DataTokenImpl.h" #include <boost/format.hpp> #include <boost/intrusive_ptr.hpp> +#include <jrnl/jexception.hpp> namespace rhm{ namespace bdbstore{ Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -33,8 +33,8 @@ #include <jrnl/data_tok.hpp> #include <sstream> -#include <iostream> #include <jrnl/jerrno.hpp> +#include <jrnl/jexception.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/data_tok.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/data_tok.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -54,7 +54,6 @@ #include <qpid/broker/PersistableMessage.h> #include <qpid/RefCounted.h> #include <sys/types.h> -#include <jrnl/jexception.hpp> namespace rhm { @@ -156,7 +155,7 @@ inline void set_fid(const u_int16_t fid) { _fid = fid; } inline const u_int64_t rid() const { return _rid; } inline void set_rid(const u_int64_t rid) { _rid = rid; } - inline const u_int64_t dequeue_rid() const throw (jexception) {return _dequeue_rid; } + inline const u_int64_t dequeue_rid() const {return _dequeue_rid; } inline void set_dequeue_rid(const u_int64_t rid) { _dequeue_rid = rid; } inline const bool has_xid() const { return !_xid.empty(); } Modified: store/trunk/cpp/lib/jrnl/deq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/deq_rec.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -37,6 +37,7 @@ #include <iomanip> #include <sstream> #include <jrnl/jerrno.hpp> +#include <jrnl/jexception.hpp> namespace rhm { @@ -88,7 +89,7 @@ } const u_int32_t -deq_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) throw (jexception) +deq_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) { assert(wptr != NULL); assert(max_size_dblks > 0); @@ -201,7 +202,6 @@ const u_int32_t deq_rec::decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception) { assert(rptr != NULL); assert(max_size_dblks > 0); @@ -317,7 +317,7 @@ } const bool -deq_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception) +deq_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) { if (rec_offs == 0) { @@ -410,7 +410,7 @@ } void -deq_rec::chk_hdr() const throw (jexception) +deq_rec::chk_hdr() const { jrec::chk_hdr(_deq_hdr._hdr); if (_deq_hdr._hdr._magic != RHM_JDAT_DEQ_MAGIC) @@ -425,14 +425,14 @@ } void -deq_rec::chk_hdr(u_int64_t rid) const throw (jexception) +deq_rec::chk_hdr(u_int64_t rid) const { chk_hdr(); jrec::chk_rid(_deq_hdr._hdr, rid); } void -deq_rec::chk_tail() const throw (jexception) +deq_rec::chk_tail() const { jrec::chk_tail(_deq_tail, _deq_hdr._hdr); } Modified: store/trunk/cpp/lib/jrnl/deq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/deq_rec.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -73,12 +73,11 @@ // Prepare instance for use in writing data to journal void reset(const u_int64_t rid, const u_int64_t drid, const void* const xidp, const size_t xidlen, const bool owi); - const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception); + const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks); const u_int32_t decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, - u_int32_t max_size_dblks) throw (jexception); + u_int32_t max_size_dblks); // Decode used for recover - const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception); + const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs); inline const u_int64_t rid() const { return _deq_hdr._hdr._rid; } inline const u_int64_t deq_rid() const { return _deq_hdr._deq_rid; } @@ -89,9 +88,9 @@ const size_t rec_size() const; private: - virtual void chk_hdr() const throw (jexception); - virtual void chk_hdr(u_int64_t rid) const throw (jexception); - virtual void chk_tail() const throw (jexception); + virtual void chk_hdr() const; + virtual void chk_hdr(u_int64_t rid) const; + virtual void chk_tail() const; virtual void clean(); }; // class deq_rec Modified: store/trunk/cpp/lib/jrnl/enq_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/enq_map.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -53,13 +53,13 @@ } void -enq_map::insert_fid(const u_int64_t rid, const u_int16_t fid) throw (jexception) +enq_map::insert_fid(const u_int64_t rid, const u_int16_t fid) { insert_fid(rid, fid, false); } void -enq_map::insert_fid(const u_int64_t rid, const u_int16_t fid, const bool locked) throw (jexception) +enq_map::insert_fid(const u_int64_t rid, const u_int16_t fid, const bool locked) { fid_lock_pair rec(fid, locked); pthread_mutex_lock(&_mutex); @@ -74,7 +74,7 @@ } const u_int16_t -enq_map::get_fid(const u_int64_t rid) throw (jexception) +enq_map::get_fid(const u_int64_t rid) { pthread_mutex_lock(&_mutex); emap_itr itr = _map.find(rid); @@ -95,7 +95,7 @@ } const u_int16_t -enq_map::get_remove_fid(const u_int64_t rid, const bool txn_flag) throw (jexception) +enq_map::get_remove_fid(const u_int64_t rid, const bool txn_flag) { pthread_mutex_lock(&_mutex); emap_itr itr = _map.find(rid); @@ -133,7 +133,7 @@ } void -enq_map::lock(const u_int64_t rid) throw (jexception) +enq_map::lock(const u_int64_t rid) { pthread_mutex_lock(&_mutex); emap_itr itr = _map.find(rid); @@ -149,7 +149,7 @@ } void -enq_map::unlock(const u_int64_t rid) throw (jexception) +enq_map::unlock(const u_int64_t rid) { pthread_mutex_lock(&_mutex); emap_itr itr = _map.find(rid); @@ -165,7 +165,7 @@ } const bool -enq_map::is_locked(const u_int64_t rid) throw (jexception) +enq_map::is_locked(const u_int64_t rid) { pthread_mutex_lock(&_mutex); emap_itr itr = _map.find(rid); Modified: store/trunk/cpp/lib/jrnl/enq_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/enq_map.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -41,10 +41,10 @@ } } +#include <jrnl/jexception.hpp> #include <map> -#include <vector> #include <pthread.h> -#include <jrnl/jexception.hpp> +#include <vector> namespace rhm { @@ -71,16 +71,14 @@ enq_map(); virtual ~enq_map(); - void insert_fid(const u_int64_t rid, const u_int16_t fid) throw (jexception); - void insert_fid(const u_int64_t rid, const u_int16_t fid, const bool locked) - throw (jexception); - const u_int16_t get_fid(const u_int64_t rid) throw (jexception); - const u_int16_t get_remove_fid(const u_int64_t rid, const bool txn_flag = false) - throw (jexception); + void insert_fid(const u_int64_t rid, const u_int16_t fid); + void insert_fid(const u_int64_t rid, const u_int16_t fid, const bool locked); + const u_int16_t get_fid(const u_int64_t rid); + const u_int16_t get_remove_fid(const u_int64_t rid, const bool txn_flag = false); const bool is_enqueued(const u_int64_t rid); - void lock(const u_int64_t rid) throw (jexception); - void unlock(const u_int64_t rid) throw (jexception); - const bool is_locked(const u_int64_t rid) throw (jexception); + void lock(const u_int64_t rid); + void unlock(const u_int64_t rid); + const bool is_locked(const u_int64_t rid); inline void clear() { _map.clear(); } inline const bool empty() const { return _map.empty(); } inline const u_int16_t size() const { return (u_int16_t)_map.size(); } Modified: store/trunk/cpp/lib/jrnl/enq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/enq_rec.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -35,8 +35,9 @@ #include <assert.h> #include <errno.h> #include <iomanip> +#include <jrnl/jerrno.hpp> +#include <jrnl/jexception.hpp> #include <sstream> -#include <jrnl/jerrno.hpp> namespace rhm { @@ -105,7 +106,7 @@ } const u_int32_t -enq_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) throw (jexception) +enq_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) { assert(wptr != NULL); assert(max_size_dblks > 0); @@ -251,7 +252,6 @@ const u_int32_t enq_rec::decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception) { assert(rptr != NULL); assert(max_size_dblks > 0); @@ -432,7 +432,7 @@ } const bool -enq_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception) +enq_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) { if (rec_offs == 0) { @@ -578,7 +578,7 @@ } void -enq_rec::chk_hdr() const throw (jexception) +enq_rec::chk_hdr() const { jrec::chk_hdr(_enq_hdr._hdr); if (_enq_hdr._hdr._magic != RHM_JDAT_ENQ_MAGIC) @@ -593,14 +593,14 @@ } void -enq_rec::chk_hdr(u_int64_t rid) const throw (jexception) +enq_rec::chk_hdr(u_int64_t rid) const { chk_hdr(); jrec::chk_rid(_enq_hdr._hdr, rid); } void -enq_rec::chk_tail() const throw (jexception) +enq_rec::chk_tail() const { jrec::chk_tail(_enq_tail, _enq_hdr._hdr); } Modified: store/trunk/cpp/lib/jrnl/enq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/enq_rec.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -85,12 +85,11 @@ const void* const xidp, const size_t xidlen, const bool owi, const bool transient, const bool external); - const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception); + const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks); const u_int32_t decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, - u_int32_t max_size_dblks) throw (jexception); + u_int32_t max_size_dblks); // Decode used for recover - const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception); + const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs); const size_t get_xid(void** const xidpp); const size_t get_data(void** const datapp); @@ -104,9 +103,9 @@ void set_rid(const u_int64_t rid); private: - void chk_hdr() const throw (jexception); - void chk_hdr(u_int64_t rid) const throw (jexception); - void chk_tail() const throw (jexception); + void chk_hdr() const; + void chk_hdr(u_int64_t rid) const; + void chk_tail() const; virtual void clean(); }; // class enq_rec Modified: store/trunk/cpp/lib/jrnl/file_hdr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/file_hdr.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/file_hdr.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -144,8 +144,7 @@ {} file_hdr::file_hdr(const u_int32_t magic, const u_int8_t version, const u_int64_t rid, - const u_int32_t fid, const size_t fro, const bool owi, const bool settime) - throw (jexception): + const u_int32_t fid, const size_t fro, const bool owi, const bool settime): _hdr(magic, version, rid, owi), _fid(fid), _res(0), @@ -185,7 +184,7 @@ } void -file_hdr::set_time() throw (jexception) +file_hdr::set_time() { // TODO: Standardize on a method for getting time that does not requrie a context switch. timespec ts; Modified: store/trunk/cpp/lib/jrnl/file_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/file_hdr.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/file_hdr.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -43,6 +43,8 @@ } #include <jrnl/jcfg.hpp> + +#include <sys/types.h> #include <jrnl/jexception.hpp> namespace rhm @@ -238,8 +240,7 @@ * \brief Convenience constructor which initializes values during construction. */ file_hdr(const u_int32_t magic, const u_int8_t version, const u_int64_t rid, - const u_int32_t fid, const size_t fro, const bool owi, const bool settime = false) - throw (jexception); + const u_int32_t fid, const size_t fro, const bool owi, const bool settime = false); inline const bool get_owi() const { return _hdr._uflag & hdr::HDR_OVERWRITE_INDICATOR_MASK; } void set_owi(const bool owi); @@ -247,7 +248,7 @@ /** * \brief Gets the current time from the system clock and sets the timestamp in the struct. */ - void set_time() throw (jexception); + void set_time(); /** * \brief Sets the timestamp in the struct to the provided value (in seconds and Modified: store/trunk/cpp/lib/jrnl/jcfg.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcfg.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jcfg.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -33,8 +33,8 @@ #ifndef rhm_journal_jcfg_hpp #define rhm_journal_jcfg_hpp -#include <iomanip> // for debug only -#include <iostream> // for debug only +// #include <iomanip> // for debug only +// #include <iostream> // for debug only #if defined(__i386__) /* little endian, 32 bits */ #define JRNL_LITTLE_ENDIAN Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -90,7 +90,7 @@ void jcntl::initialize(std::deque<data_tok*>* rdtoklp, const aio_cb rd_cb, - std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb) throw (jexception) + std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb) { // Prepare journal dir, journal files and file handles _jdir.clear_dir(); @@ -133,7 +133,6 @@ void jcntl::recover(std::deque<data_tok*>* rdtoklp, const aio_cb rd_cb, std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb, const std::vector<std::string>& prep_txn_list, u_int64_t& highest_rid) - throw (jexception) { // Verify journal dir and journal files _jdir.verify_dir(); @@ -182,7 +181,7 @@ } void -jcntl::recover_complete() throw (jexception) +jcntl::recover_complete() { if (!_readonly_flag) throw jexception(jerrno::JERR_JCNTL_NOTRECOVERED, "jcntl", "recover_complete"); @@ -196,7 +195,7 @@ } void -jcntl::delete_jrnl_files() throw (jexception) +jcntl::delete_jrnl_files() { stop(true); // wait for AIO to complete _jdir.delete_dir(); @@ -206,7 +205,6 @@ const iores jcntl::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) - throw (jexception) { iores res; check_wstatus("enqueue_data_record"); @@ -223,7 +221,6 @@ const iores jcntl::enqueue_extern_data_record(const size_t tot_data_len, data_tok* dtokp, const bool transient) - throw (jexception) { iores res; check_wstatus("enqueue_extern_data_record"); @@ -240,7 +237,7 @@ const iores jcntl::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) throw (jexception) + const bool transient) { iores res; check_wstatus("enqueue_tx_data_record"); @@ -257,7 +254,7 @@ const iores jcntl::enqueue_extern_txn_data_record(const size_t tot_data_len, data_tok* dtokp, - const std::string& xid, const bool transient) throw (jexception) + const std::string& xid, const bool transient) { iores res; check_wstatus("enqueue_extern_txn_data_record"); @@ -273,14 +270,14 @@ const iores jcntl::get_data_record(const u_int64_t& rid, const size_t& dsize, const size_t& dsize_avail, - const void** const data, bool auto_discard) throw (jexception) + const void** const data, bool auto_discard) { check_rstatus("get_data_record"); return _rmgr.get(rid, dsize, dsize_avail, data, auto_discard); } const iores -jcntl::discard_data_record(data_tok* const dtokp) throw (jexception) +jcntl::discard_data_record(data_tok* const dtokp) { check_rstatus("discard_data_record"); return _rmgr.discard(dtokp); @@ -288,14 +285,14 @@ const iores jcntl::read_data_record(void** const datapp, size_t& dsize, void** const xidpp, size_t& xidsize, - bool& transient, bool& external, data_tok* const dtokp) throw (jexception) + bool& transient, bool& external, data_tok* const dtokp) { check_rstatus("read_data"); return _rmgr.read(datapp, dsize, xidpp, xidsize, transient, external, dtokp); } const iores -jcntl::dequeue_data_record(data_tok* const dtokp) throw (jexception) +jcntl::dequeue_data_record(data_tok* const dtokp) { iores res; check_wstatus("dequeue_data"); @@ -307,7 +304,7 @@ } const iores -jcntl::dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid) throw (jexception) +jcntl::dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid) { iores res; check_wstatus("dequeue_data"); @@ -319,7 +316,7 @@ } const iores -jcntl::txn_abort(data_tok* const dtokp, const std::string& xid) throw (jexception) +jcntl::txn_abort(data_tok* const dtokp, const std::string& xid) { iores res; check_wstatus("txn_abort"); @@ -331,7 +328,7 @@ } const iores -jcntl::txn_commit(data_tok* const dtokp, const std::string& xid) throw (jexception) +jcntl::txn_commit(data_tok* const dtokp, const std::string& xid) { iores res; check_wstatus("txn_commit"); @@ -343,13 +340,13 @@ } const bool -jcntl::is_txn_synced(const std::string& xid) throw (jexception) +jcntl::is_txn_synced(const std::string& xid) { return _wmgr.is_txn_synced(xid); } const u_int32_t -jcntl::get_wr_events() throw (jexception) +jcntl::get_wr_events() { u_int32_t res; int ret = pthread_mutex_trylock(&_mutex); @@ -370,13 +367,13 @@ } const u_int32_t -jcntl::get_rd_events() throw (jexception) +jcntl::get_rd_events() { return _rmgr.get_events(); } void -jcntl::stop(bool block_till_aio_cmpl) throw (jexception) +jcntl::stop(bool block_till_aio_cmpl) { if (_readonly_flag) check_rstatus("stop"); @@ -392,7 +389,7 @@ } void -jcntl::flush() throw (jexception) +jcntl::flush() { if (!_init_flag) return; @@ -407,7 +404,7 @@ // Private functions void -jcntl::check_wstatus(const char* fn_name) const throw (jexception) +jcntl::check_wstatus(const char* fn_name) const { if (!_init_flag) throw jexception(jerrno::JERR__NINIT, "jcntl", fn_name); @@ -418,7 +415,7 @@ } void -jcntl::check_rstatus(const char* fn_name) const throw (jexception) +jcntl::check_rstatus(const char* fn_name) const { if (!_init_flag) throw jexception(jerrno::JERR__NINIT, "jcntl", fn_name); @@ -427,7 +424,7 @@ } void -jcntl::write_infofile() const throw (jexception) +jcntl::write_infofile() const { timespec ts; if (::clock_gettime(CLOCK_REALTIME, &ts)) @@ -444,7 +441,7 @@ #define MAX_AIO_CMPL_SLEEPS 1000 // Total: 10 sec void -jcntl::aio_cmpl_wait() throw (jexception) +jcntl::aio_cmpl_wait() { u_int32_t cnt = 0; while (_wmgr.get_aio_evt_rem()) @@ -457,7 +454,7 @@ } void -jcntl::rcvr_janalyze(rcvdat& rd, const std::vector<std::string>& prep_txn_list) throw (jexception) +jcntl::rcvr_janalyze(rcvdat& rd, const std::vector<std::string>& prep_txn_list) { jinf ji(_jdir.dirname() + "/" + _base_filename + "." + JRNL_INFO_EXTENSION, true); @@ -515,7 +512,7 @@ } const bool -jcntl::rcvr_get_next_record(u_int16_t& fid, std::ifstream* ifsp, rcvdat& rd) throw (jexception) +jcntl::rcvr_get_next_record(u_int16_t& fid, std::ifstream* ifsp, rcvdat& rd) { size_t cum_size_read = 0; void* xidp = NULL; @@ -732,7 +729,6 @@ const bool jcntl::check_owi(const u_int16_t fid, hdr& h, rcvdat& rd, std::streampos& read_pos) - throw (jexception) { if (rd._ffid ? h.get_owi() == rd._owi : h.get_owi() != rd._owi) // Overwrite indicator changed { @@ -760,7 +756,6 @@ void jcntl::check_journal_alignment(const u_int16_t fid, std::streampos& rec_offset) - throw (jexception) { unsigned sblk_offs = rec_offset % (JRNL_DBLK_SIZE * JRNL_SBLK_SIZE); if (sblk_offs) Modified: store/trunk/cpp/lib/jrnl/jcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jcntl.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -190,7 +190,7 @@ * \exception TODO */ void initialize(std::deque<data_tok*>* rdtoklp, const aio_cb rd_cb, - std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb) throw (jexception); + std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb); /** * \brief Initialize using internal default callbacks and data_tok lists. @@ -199,7 +199,7 @@ * * \exception TODO */ - void initialize() throw (jexception) + void initialize() { initialize(&_aio_rd_cmpl_dtok_list, &aio_rd_callback, &_aio_wr_cmpl_dtok_list, &aio_wr_callback ); @@ -232,7 +232,7 @@ */ void recover(std::deque<data_tok*>* rdtoklp, const aio_cb rd_cb, std::deque<data_tok*>* wdtoklp, const aio_cb wr_cb, - const std::vector<std::string>& prep_txn_list, u_int64_t& highest_rid) throw (jexception); + const std::vector<std::string>& prep_txn_list, u_int64_t& highest_rid); /** * \brief Recover using internal default callbacks and data_tok lists. @@ -242,7 +242,6 @@ * \exception TODO */ void recover(const std::vector<std::string>& prep_txn_list, u_int64_t& highest_rid) - throw (jexception) { recover(&_aio_rd_cmpl_dtok_list, &aio_rd_callback, &_aio_wr_cmpl_dtok_list, &aio_wr_callback, prep_txn_list, highest_rid); @@ -259,7 +258,7 @@ * * \exception TODO */ - void recover_complete() throw (jexception); + void recover_complete(); /** * \brief Stops journal and deletes all journal files. @@ -268,7 +267,7 @@ * * \exception TODO */ - void delete_jrnl_files() throw (jexception); + void delete_jrnl_files(); /** * \brief Enqueue data. @@ -308,10 +307,10 @@ * \exception TODO */ const iores 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 = false) - throw (jexception); + const size_t this_data_len, data_tok* dtokp, const bool transient = false); + const iores enqueue_extern_data_record(const size_t tot_data_len, data_tok* dtokp, - const bool transient = false) throw (jexception); + const bool transient = false); /** * \brief Enqueue data. @@ -328,9 +327,9 @@ */ const iores 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 = false) throw (jexception); + const bool transient = false); const iores enqueue_extern_txn_data_record(const size_t tot_data_len, data_tok* dtokp, - const std::string& xid, const bool transient = false) throw (jexception); + const std::string& xid, const bool transient = false); /** * \brief Retrieve details of next record to be read without consuming the record. @@ -391,8 +390,7 @@ */ // *** NOT YET IMPLEMENTED *** const iores get_data_record(const u_int64_t& rid, const size_t& dsize, - const size_t& dsize_avail, const void** const data, bool auto_discard = false) - throw (jexception); + const size_t& dsize_avail, const void** const data, bool auto_discard = false); /** * \brief Discard (skip) next record to be read without reading or retrieving it. @@ -400,7 +398,7 @@ * \exception TODO */ // *** NOT YET IMPLEMENTED *** - const iores discard_data_record(data_tok* const dtokp) throw (jexception); + const iores discard_data_record(data_tok* const dtokp); /** * \brief Reads data from the journal. It is the responsibility of the reader to free @@ -436,8 +434,7 @@ * \exception TODO */ const iores read_data_record(void** const datapp, size_t& dsize, void** const xidpp, - size_t& xidsize, bool& transient, bool& external, data_tok* const dtokp) - throw (jexception); + size_t& xidsize, bool& transient, bool& external, data_tok* const dtokp); /** * \brief Dequeues (marks as no longer needed) data record in journal. @@ -453,7 +450,7 @@ * * \exception TODO */ - const iores dequeue_data_record(data_tok* const dtokp) throw (jexception); + const iores dequeue_data_record(data_tok* const dtokp); /** * \brief Dequeues (marks as no longer needed) data record in journal. @@ -471,8 +468,7 @@ * * \exception TODO */ - const iores dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid) - throw (jexception); + const iores dequeue_txn_data_record(data_tok* const dtokp, const std::string& xid); /** * \brief Abort the transaction for all records enqueued or dequeued with the matching xid. @@ -487,7 +483,7 @@ * * \exception TODO */ - const iores txn_abort(data_tok* const dtokp, const std::string& xid) throw (jexception); + const iores txn_abort(data_tok* const dtokp, const std::string& xid); /** * \brief Commit the transaction for all records enqueued or dequeued with the matching xid. @@ -502,7 +498,7 @@ * * \exception TODO */ - const iores txn_commit(data_tok* const dtokp, const std::string& xid) throw (jexception); + const iores txn_commit(data_tok* const dtokp, const std::string& xid); /** * \brief Check whether all the enqueue records for the given xid have reached disk. @@ -511,7 +507,7 @@ * * \exception TODO */ - const bool is_txn_synced(const std::string& xid) throw (jexception); + const bool is_txn_synced(const std::string& xid); /** * \brief Forces a check for returned AIO write events. @@ -520,7 +516,7 @@ * dequeue() operations, but if these operations cease, then this call needs to be made to * force the processing of any outstanding AIO operations. */ - const u_int32_t get_wr_events() throw (jexception); + const u_int32_t get_wr_events(); /** * \brief Forces a check for returned AIO read events. @@ -529,7 +525,7 @@ * operations, but if these operations cease, then this call needs to be made to force the * processing of any outstanding AIO operations. */ - const u_int32_t get_rd_events() throw (jexception); + const u_int32_t get_rd_events(); /** * \brief Stop the journal from accepting any further requests to read or write data. @@ -544,12 +540,12 @@ * \param block_till_aio_cmpl If true, will block the thread while waiting for all * outstanding AIO operations to complete. */ - void stop(bool block_till_aio_cmpl = false) throw (jexception); + void stop(bool block_till_aio_cmpl = false); /** * \brief Force a flush of the write page cache, creating a single AIO write operation. */ - void flush() throw (jexception); + void flush(); inline const u_int32_t get_enq_cnt() const { return _emap.size(); } inline const u_int32_t get_wr_outstanding_aio_dblks() const @@ -621,31 +617,29 @@ /** * \brief Check status of journal before allowing write operations. */ - void check_wstatus(const char* fn_name) const throw (jexception); + void check_wstatus(const char* fn_name) const; /** * \brief Check status of journal before allowing read operations. */ - void check_rstatus(const char* fn_name) const throw (jexception); + void check_rstatus(const char* fn_name) const; /** * \brief Write info file &lt;basefilename&gt;.jinf to disk */ - void write_infofile() const throw (jexception); + void write_infofile() const; /** * \brief Call that blocks while waiting for all outstanding AIOs to complete */ - void aio_cmpl_wait() throw (jexception); + void aio_cmpl_wait(); /** * \brief Analyze journal for recovery. */ - void rcvr_janalyze(rcvdat& rd, const std::vector<std::string>& prep_txn_list) - throw (jexception); + void rcvr_janalyze(rcvdat& rd, const std::vector<std::string>& prep_txn_list); - const bool rcvr_get_next_record(u_int16_t& fid, std::ifstream* ifsp, rcvdat& rd) - throw (jexception); + const bool rcvr_get_next_record(u_int16_t& fid, std::ifstream* ifsp, rcvdat& rd); const bool decode(jrec& rec, u_int16_t& fid, std::ifstream* ifsp, size_t& cum_size_read, hdr& h, rcvdat& rd, std::streampos& rec_offset); @@ -653,32 +647,19 @@ const bool jfile_cycle(u_int16_t& fid, std::ifstream* ifsp, rcvdat& rd, const bool jump_fro); - const bool check_owi(const u_int16_t fid, hdr& h, rcvdat& rd, std::streampos& read_pos) - throw (jexception); + const bool check_owi(const u_int16_t fid, hdr& h, rcvdat& rd, std::streampos& read_pos); - void check_journal_alignment(const u_int16_t fid, std::streampos& rec_offset) - throw (jexception); + void check_journal_alignment(const u_int16_t fid, std::streampos& rec_offset); + /** + * Intenal callback write + */ + static void aio_wr_callback(jcntl* journal, u_int32_t num_dtoks); - /** - * \brief Analyze a particular journal file for recovery. - * - * \return <b><i>true</i></b> if end of journal (eoj) found; <b><i>false</i></b> otherwise. - */ -// const bool rcvr_fanalyze(u_int16_t fid, rcvdat& jrs, -// const std::vector<std::string>& prep_txn_list) throw (jexception); - - /** - * Intenal callback write - */ - static void aio_wr_callback(jcntl* journal, u_int32_t num_dtoks); - - /** - * Intenal callback write - */ - static void aio_rd_callback(jcntl* journal, u_int32_t num_dtoks); - - + /** + * Intenal callback write + */ + static void aio_rd_callback(jcntl* journal, u_int32_t num_dtoks); }; } // namespace journal Modified: store/trunk/cpp/lib/jrnl/jdir.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jdir.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -35,13 +35,13 @@ #include <dirent.h> #include <cerrno> -//#include <fstream> #include <iomanip> #include <sstream> #include <sys/stat.h> #include <jrnl/jcfg.hpp> #include <jrnl/jerrno.hpp> -#include <iostream>// debug only +#include <jrnl/jexception.hpp> + namespace rhm { namespace journal @@ -58,21 +58,21 @@ // === create_dir === void -jdir::create_dir() throw (jexception) +jdir::create_dir() { create_dir(_dirname); } void -jdir::create_dir(const char* dirname) throw (jexception) +jdir::create_dir(const char* dirname) { create_dir(std::string(dirname)); } void -jdir::create_dir(const std::string& dirname) throw (jexception) +jdir::create_dir(const std::string& dirname) { size_t fdp = dirname.find_last_of('/'); if (fdp != std::string::npos) @@ -96,14 +96,13 @@ // === clear_dir === void -jdir::clear_dir(const bool create_flag) throw (jexception) +jdir::clear_dir(const bool create_flag) { clear_dir(_dirname, _base_filename, create_flag); } void jdir::clear_dir(const char* dirname, const char* base_filename, const bool create_flag) - throw (jexception) { clear_dir(std::string(dirname), std::string(base_filename), create_flag); } @@ -114,7 +113,7 @@ #ifndef RHM_JOWRITE base_filename #endif - , const bool create_flag) throw (jexception) + , const bool create_flag) { DIR* dir = ::opendir(dirname.c_str()); if (!dir) @@ -184,20 +183,20 @@ // === verify_dir === void -jdir::verify_dir() throw (jexception) +jdir::verify_dir() { verify_dir(_dirname, _base_filename); } void -jdir::verify_dir(const char* dirname, const char* base_filename) throw (jexception) +jdir::verify_dir(const char* dirname, const char* base_filename) { verify_dir(std::string(dirname), std::string(base_filename)); } void -jdir::verify_dir(const std::string& dirname, const std::string& base_filename) throw (jexception) +jdir::verify_dir(const std::string& dirname, const std::string& base_filename) { if (!is_dir(dirname)) { @@ -223,19 +222,19 @@ // === delete_dir === void -jdir::delete_dir(bool children_only) throw (jexception) +jdir::delete_dir(bool children_only) { delete_dir(_dirname, children_only); } void -jdir::delete_dir(const char* dirname, bool children_only) throw (jexception) +jdir::delete_dir(const char* dirname, bool children_only) { delete_dir(std::string(dirname), children_only); } void -jdir::delete_dir(const std::string& dirname, bool children_only) throw (jexception) +jdir::delete_dir(const std::string& dirname, bool children_only) { struct dirent* entry; struct stat s; @@ -320,7 +319,6 @@ std::string jdir::create_bak_dir(const std::string& dirname, const std::string& base_filename) - throw (jexception) { DIR* dir = ::opendir(dirname.c_str()); long dir_num = 0L; @@ -378,7 +376,7 @@ } const bool -jdir::is_dir(const char* name) throw (jexception) +jdir::is_dir(const char* name) { struct stat s; if (::stat(name, &s)) @@ -391,13 +389,13 @@ } const bool -jdir::is_dir(const std::string& name) throw (jexception) +jdir::is_dir(const std::string& name) { return is_dir(name.c_str()); } const bool -jdir::exists(const char* name) throw (jexception) +jdir::exists(const char* name) { struct stat s; if (::stat(name, &s)) @@ -413,7 +411,7 @@ } const bool -jdir::exists(const std::string& name) throw (jexception) +jdir::exists(const std::string& name) { return exists(name.c_str()); } Modified: store/trunk/cpp/lib/jrnl/jdir.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jdir.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -42,7 +42,6 @@ } } -#include <jrnl/jexception.hpp> #include <jrnl/jinf.hpp> namespace rhm @@ -80,7 +79,7 @@ * * \exception ?? */ - void create_dir() throw (jexception); + void create_dir(); /** * \brief Static function to create a directory. Recursive creation is supported. @@ -89,7 +88,7 @@ * * \exception ?? */ - static void create_dir(const char* dirname) throw (jexception); + static void create_dir(const char* dirname); /** * \brief Static function to create a directory. Recursive creation is supported. @@ -98,7 +97,7 @@ * * \exception ?? */ - static void create_dir(const std::string& dirname) throw (jexception); + static void create_dir(const std::string& dirname); /** @@ -114,7 +113,7 @@ * directory failed. * \exception The directory handle could not be closed. */ - void clear_dir(const bool create_flag = true) throw (jexception); + void clear_dir(const bool create_flag = true); /** * \brief Clear the directory dirname of journal files matching base_filename @@ -132,7 +131,7 @@ * \exception The directory handle could not be closed. */ static void clear_dir(const char* dirname, const char* base_filename, - const bool create_flag = true) throw (jexception); + const bool create_flag = true); /** * \brief Clear the directory dirname of journal files matching base_filename @@ -150,7 +149,7 @@ * \exception The directory handle could not be closed. */ static void clear_dir(const std::string& dirname, const std::string& base_filename, - const bool create_flag = true) throw (jexception); + const bool create_flag = true); /** @@ -158,7 +157,7 @@ * * \exception ?? */ - void verify_dir() throw (jexception); + void verify_dir(); /** * \brief ?? @@ -169,7 +168,7 @@ * * \exception ?? */ - static void verify_dir(const char* dirname, const char* base_filename) throw (jexception); + static void verify_dir(const char* dirname, const char* base_filename); /** * \brief ?? @@ -180,8 +179,7 @@ * * \exception ?? */ - static void verify_dir(const std::string& dirname, const std::string& base_filename) - throw (jexception); + static void verify_dir(const std::string& dirname, const std::string& base_filename); /** * \brief Delete the journal directory and all files and sub--directories that it may @@ -196,7 +194,7 @@ * directory failed. * \exception The directory handle could not be closed. */ - void delete_dir(bool children_only = false ) throw (jexception); + void delete_dir(bool children_only = false ); /** * \brief Delete the journal directory and all files and sub--directories that it may @@ -212,7 +210,7 @@ * directory failed. * \exception The directory handle could not be closed. */ - static void delete_dir(const char* dirname, bool children_only = false) throw (jexception); + static void delete_dir(const char* dirname, bool children_only = false); /** * \brief Delete the journal directory and all files and sub--directories that it may @@ -228,8 +226,7 @@ * directory failed. * \exception The directory handle could not be closed. */ - static void delete_dir(const std::string& dirname, bool children_only = false) - throw (jexception); + static void delete_dir(const std::string& dirname, bool children_only = false); /** * \brief Create bakup directory that is next in sequence and move all journal files @@ -247,7 +244,7 @@ * \exception ?? */ static std::string create_bak_dir(const std::string& dirname, - const std::string& base_filename) throw (jexception); + const std::string& base_filename); /** * \brief Return the directory name as a string. @@ -267,7 +264,7 @@ * otherwise. * \exception The stat() operation failed on the named file. */ - const static bool is_dir(const char* name) throw (jexception); + const static bool is_dir(const char* name); /** * \brief Test whether the named file is a directory. @@ -277,7 +274,7 @@ * otherwise. * \exception The stat() operation failed on the named file. */ - const static bool is_dir(const std::string& name) throw (jexception); + const static bool is_dir(const std::string& name); /** @@ -292,7 +289,7 @@ * otherwise. * \exception The stat() operation failed on the named entity. */ - const static bool exists(const char* name) throw (jexception); + const static bool exists(const char* name); /** * \brief Test whether the named entity exists on the filesystem. @@ -306,7 +303,7 @@ * otherwise. * \exception The stat() operation failed on the named entity. */ - const static bool exists(const std::string& name) throw (jexception); + const static bool exists(const std::string& name); public: Modified: store/trunk/cpp/lib/jrnl/jexception.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jexception.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -33,7 +33,6 @@ #include <jrnl/jexception.hpp> #include <iomanip> -#include <iostream> // debug only #include <sstream> #include <jrnl/jerrno.hpp> Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -43,7 +43,7 @@ namespace journal { -jinf::jinf(const std::string& jinf_filename, bool validate_flag) throw (jexception): +jinf::jinf(const std::string& jinf_filename, bool validate_flag): _jver(0), _num_jfiles(0), _jfsize_sblks(0), @@ -90,7 +90,7 @@ {} void -jinf::validate() throw (jexception) +jinf::validate() { bool err = false; std::stringstream ss; @@ -154,7 +154,7 @@ } const u_int16_t -jinf::analyze() throw (jexception) +jinf::analyze() { u_int16_t fid = 0xffff; bool owi = false; @@ -208,7 +208,7 @@ } const u_int16_t -jinf::get_start_file() throw (jexception) +jinf::get_start_file() { if (!_analyzed_flag) analyze(); @@ -216,7 +216,7 @@ } const bool -jinf::get_initial_owi() throw (jexception) +jinf::get_initial_owi() { if (!_analyzed_flag) analyze(); @@ -287,7 +287,7 @@ } void -jinf::read(const std::string& jinf_filename) throw (jexception) +jinf::read(const std::string& jinf_filename) { // FIXME: This is *not* an XML reader, rather for simplicity, it is a brute-force // line reader which relies on string recognition. @@ -335,26 +335,26 @@ } const u_int16_t -jinf::u_int16_value(char* line) const throw (jexception) +jinf::u_int16_value(char* line) const { return ::atoi(find_value(line)); } const u_int32_t -jinf::u_int32_value(char* line) const throw (jexception) +jinf::u_int32_value(char* line) const { return ::atol(find_value(line)); } const std::string& -jinf::string_value(std::string& str, char* line) const throw (jexception) +jinf::string_value(std::string& str, char* line) const { str.assign(find_value(line)); return str; } const char* -jinf::find_value(char* line) const throw (jexception) +jinf::find_value(char* line) const { const char* target1_str = "value=\""; int target2_char = '\"'; Modified: store/trunk/cpp/lib/jrnl/jinf.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jinf.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -32,9 +32,7 @@ #ifndef rhm_journal_jinf_hpp #define rhm_journal_jinf_hpp -//#include <sstream> -//#include <jrnl/file_hdr.hpp> -#include <jrnl/jexception.hpp> +#include <string> namespace rhm { @@ -68,14 +66,14 @@ public: // constructor for reading existing jinf file - jinf(const std::string& jinf_filename, bool validate_flag) throw (jexception); + jinf(const std::string& jinf_filename, bool validate_flag); // constructor for writing jinf file jinf(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 timespec& ts); virtual ~jinf(); - void validate() throw (jexception); - const u_int16_t analyze() throw (jexception); + void validate(); + const u_int16_t analyze(); void write(); inline const u_int8_t jver() const { return _jver; } @@ -91,18 +89,18 @@ inline const u_int32_t wmgr_num_pages() const { return _wmgr_num_pages; } inline const u_int32_t rmgr_page_size_dblks() const { return _rmgr_page_size_dblks; } inline const u_int32_t rmgr_num_pages() const { return _rmgr_num_pages; } - const u_int16_t get_start_file() throw (jexception); - const bool get_initial_owi() throw (jexception); + const u_int16_t get_start_file(); + const bool get_initial_owi(); const std::string to_string() const; const std::string xml_str() const; private: - void read(const std::string& jinf_filename) throw (jexception); - const u_int16_t u_int16_value(char* line) const throw (jexception); - const u_int32_t u_int32_value(char* line) const throw (jexception); - const std::string& string_value(std::string& str, char* line) const throw (jexception); - const char* find_value(char* line) const throw (jexception); + void read(const std::string& jinf_filename); + const u_int16_t u_int16_value(char* line) const; + const u_int32_t u_int32_value(char* line) const; + const std::string& string_value(std::string& str, char* line) const; + const char* find_value(char* line) const; }; } // namespace journal Modified: store/trunk/cpp/lib/jrnl/jrec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jrec.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -46,7 +46,7 @@ jrec::~jrec() {} void -jrec::chk_hdr(const hdr& hdr) throw (jexception) +jrec::chk_hdr(const hdr& hdr) { if (hdr._magic == 0) { @@ -81,7 +81,7 @@ } void -jrec::chk_rid(const hdr& hdr, const u_int64_t rid) throw (jexception) +jrec::chk_rid(const hdr& hdr, const u_int64_t rid) { if (hdr._rid != rid) { @@ -94,7 +94,7 @@ } void -jrec::chk_tail(const rec_tail& tail, const hdr& hdr) throw (jexception) +jrec::chk_tail(const rec_tail& tail, const hdr& hdr) { if (tail._xmagic != ~hdr._magic) { Modified: store/trunk/cpp/lib/jrnl/jrec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/jrec.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -115,7 +115,7 @@ * \returns Number of data-blocks encoded. */ virtual const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, - u_int32_t max_size_dblks) throw (jexception) = 0; + u_int32_t max_size_dblks) = 0; /** * \brief Decode into this instance of jrec from the read buffer at the disk-block-aligned @@ -148,10 +148,9 @@ * \returns Number of data-blocks read (consumed). */ virtual const u_int32_t decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, - u_int32_t max_size_dblks) throw (jexception) = 0; + u_int32_t max_size_dblks) = 0; - virtual const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) - throw (jexception) = 0; + virtual const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) = 0; virtual std::string& str(std::string& str) const = 0; virtual const size_t data_size() const = 0; @@ -166,12 +165,12 @@ { return (size + blksize - 1)/blksize; } protected: - virtual void chk_hdr() const throw (jexception) = 0; - virtual void chk_hdr(u_int64_t rid) const throw (jexception) = 0; - virtual void chk_tail() const throw (jexception) = 0; - static void chk_hdr(const hdr& hdr) throw (jexception); - static void chk_rid(const hdr& hdr, u_int64_t rid) throw (jexception); - static void chk_tail(const rec_tail& tail, const hdr& hdr) throw (jexception); + virtual void chk_hdr() const = 0; + virtual void chk_hdr(u_int64_t rid) const = 0; + virtual void chk_tail() const = 0; + static void chk_hdr(const hdr& hdr); + static void chk_rid(const hdr& hdr, u_int64_t rid); + static void chk_tail(const rec_tail& tail, const hdr& hdr); virtual void clean() = 0; }; // class jrec Modified: store/trunk/cpp/lib/jrnl/lfh.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/lfh.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/lfh.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -43,7 +43,7 @@ {} lfh::lfh(const std::string& fbasename, const u_int16_t fid, const u_int32_t jfsize_sblks, - rcvdat const * const ro) throw (jexception): + rcvdat const * const ro): nlfh(fbasename, fid, jfsize_sblks, ro) {} Modified: store/trunk/cpp/lib/jrnl/lfh.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/lfh.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/lfh.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -57,7 +57,7 @@ public: lfh(const u_int32_t jfsize_sblks); lfh(const std::string& fbasename, const u_int16_t fid, const u_int32_t jfsize_sblks, - rcvdat const * const ro) throw (jexception); + rcvdat const * const ro); virtual ~lfh(); }; Modified: store/trunk/cpp/lib/jrnl/nlfh.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/nlfh.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/nlfh.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -64,7 +64,7 @@ {} nlfh::nlfh(const std::string& fbasename, const u_int16_t fid, const u_int32_t jfsize_sblks, - const rcvdat* const ro) throw (jexception): + const rcvdat* const ro): _fname(), _fid(fid), _ffull_dblks(JRNL_SBLK_SIZE * (jfsize_sblks + 1)), @@ -92,7 +92,7 @@ void nlfh::initialize(const std::string& fbasename, const u_int16_t fid, - const u_int32_t jfsize_sblks, const rcvdat* const ro) throw (jexception) + const u_int32_t jfsize_sblks, const rcvdat* const ro) { std::stringstream ss; @@ -235,28 +235,28 @@ } const u_int32_t -nlfh::decr_enqcnt() throw (jexception) +nlfh::decr_enqcnt() { if (_rec_enqcnt == 0) - throw jexception (jerrno::JERR__UNDERFLOW, "nlfh", "decr_enqcnt"); + throw jexception(jerrno::JERR__UNDERFLOW, "nlfh", "decr_enqcnt"); return --_rec_enqcnt; } const u_int32_t -nlfh::subtr_enqcnt(u_int32_t s) throw (jexception) +nlfh::subtr_enqcnt(u_int32_t s) { if (_rec_enqcnt < s) { std::stringstream ss; ss << "_rec_enqcnt=" << _rec_enqcnt << " decr=" << s; - throw jexception (jerrno::JERR__UNDERFLOW, ss.str().c_str(), "nlfh", "subtr_enqcnt"); + throw jexception(jerrno::JERR__UNDERFLOW, ss.str().c_str(), "nlfh", "subtr_enqcnt"); } _rec_enqcnt -= s; return _rec_enqcnt; } const u_int32_t -nlfh::add_rd_subm_cnt_dblks(u_int32_t a) throw (jexception) +nlfh::add_rd_subm_cnt_dblks(u_int32_t a) { if (_rd_subm_cnt_dblks + a > _wr_subm_cnt_dblks) { @@ -271,7 +271,7 @@ } const u_int32_t -nlfh::add_rd_cmpl_cnt_dblks(u_int32_t a) throw (jexception) +nlfh::add_rd_cmpl_cnt_dblks(u_int32_t a) { if (_rd_cmpl_cnt_dblks + a > _rd_subm_cnt_dblks) { @@ -286,7 +286,7 @@ } const u_int32_t -nlfh::add_wr_subm_cnt_dblks(u_int32_t a) throw (jexception) +nlfh::add_wr_subm_cnt_dblks(u_int32_t a) { if (_wr_subm_cnt_dblks + a > _ffull_dblks) // Allow for file header { @@ -301,7 +301,7 @@ } const u_int32_t -nlfh::add_wr_cmpl_cnt_dblks(u_int32_t a) throw (jexception) +nlfh::add_wr_cmpl_cnt_dblks(u_int32_t a) { if (_wr_cmpl_cnt_dblks + a > _wr_subm_cnt_dblks) { @@ -329,7 +329,7 @@ // Private functions void -nlfh::open_fh() throw (jexception) +nlfh::open_fh() { _rd_fh = ::open(_fname.c_str(), O_RDONLY | O_DIRECT); if (_rd_fh < 0) Modified: store/trunk/cpp/lib/jrnl/nlfh.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/nlfh.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/nlfh.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -73,11 +73,11 @@ nlfh(const u_int32_t jfsize_sblks); // Constructors with implicit initialize() and open() nlfh(const std::string& fbasename, const u_int16_t fid, const u_int32_t jfsize_sblks, - const rcvdat* const ro) throw (jexception); + const rcvdat* const ro); virtual ~nlfh(); virtual void initialize(const std::string& fbasename, const u_int16_t fid, - const u_int32_t jfsize_sblks, const rcvdat* const ro) throw (jexception); + const u_int32_t jfsize_sblks, const rcvdat* const ro); virtual bool reset(const rcvdat* const ro = NULL); inline const std::string& fname() const { return _fname; } @@ -87,24 +87,24 @@ inline const u_int32_t enqcnt() const { return _rec_enqcnt; } inline const u_int32_t incr_enqcnt() { return ++_rec_enqcnt; } const u_int32_t add_enqcnt(u_int32_t a); - const u_int32_t decr_enqcnt() throw (jexception); - const u_int32_t subtr_enqcnt(u_int32_t s) throw (jexception); + const u_int32_t decr_enqcnt(); + const u_int32_t subtr_enqcnt(u_int32_t s); inline const u_int32_t rd_subm_cnt_dblks() const { return _rd_subm_cnt_dblks; } inline const size_t rd_subm_offs() const { return _rd_subm_cnt_dblks * JRNL_DBLK_SIZE; } - const u_int32_t add_rd_subm_cnt_dblks(u_int32_t a) throw (jexception); + const u_int32_t add_rd_subm_cnt_dblks(u_int32_t a); inline const u_int32_t rd_cmpl_cnt_dblks() const { return _rd_cmpl_cnt_dblks; } inline const size_t rd_cmpl_offs() const { return _rd_cmpl_cnt_dblks * JRNL_DBLK_SIZE; } - const u_int32_t add_rd_cmpl_cnt_dblks(u_int32_t a) throw (jexception); + const u_int32_t add_rd_cmpl_cnt_dblks(u_int32_t a); inline const u_int32_t wr_subm_cnt_dblks() const { return _wr_subm_cnt_dblks; } inline const size_t wr_subm_offs() const { return _wr_subm_cnt_dblks * JRNL_DBLK_SIZE; } - const u_int32_t add_wr_subm_cnt_dblks(u_int32_t a) throw (jexception); + const u_int32_t add_wr_subm_cnt_dblks(u_int32_t a); inline const u_int32_t wr_cmpl_cnt_dblks() const { return _wr_cmpl_cnt_dblks; } inline const size_t wr_cmpl_offs() const { return _wr_cmpl_cnt_dblks * JRNL_DBLK_SIZE; } - const u_int32_t add_wr_cmpl_cnt_dblks(u_int32_t a) throw (jexception); + const u_int32_t add_wr_cmpl_cnt_dblks(u_int32_t a); // Derived helper functions @@ -131,7 +131,7 @@ const std::string& status_str(std::string& s) const; protected: - virtual void open_fh() throw (jexception); + virtual void open_fh(); virtual void close_fh(); }; Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/pmgr.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -98,7 +98,7 @@ {} pmgr::pmgr(jcntl* jc, enq_map& emap, txn_map& tmap, const u_int32_t pagesize, const u_int16_t pages, - std::deque<data_tok*>* const dtoklp) throw (jexception): + std::deque<data_tok*>* const dtoklp): _pagesize(pagesize), _pages(pages), _jc(jc), @@ -129,7 +129,7 @@ } void -pmgr::initialize() throw (jexception) +pmgr::initialize() { std::stringstream ss; Modified: store/trunk/cpp/lib/jrnl/pmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/pmgr.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -140,16 +140,16 @@ pmgr(jcntl* jc, enq_map& emap, txn_map& tmap, const u_int32_t pagesize, const u_int16_t pages); pmgr(jcntl* jc, enq_map& emap, txn_map& tmap, const u_int32_t pagesize, - const u_int16_t pages, std::deque<data_tok*>* const dtoklp) throw (jexception); + const u_int16_t pages, std::deque<data_tok*>* const dtoklp); virtual ~pmgr(); - virtual const u_int32_t get_events(page_state state) throw (jexception) = 0; + virtual const u_int32_t get_events(page_state state) = 0; inline const u_int32_t get_aio_evt_rem() const { return _aio_evt_rem; } static const char* page_state_str(page_state ps); static const char* iores_str(iores res); protected: - virtual void initialize() throw (jexception); + virtual void initialize(); virtual void rotate_page() = 0; virtual void clean(); }; Modified: store/trunk/cpp/lib/jrnl/rcvdat.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rcvdat.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/rcvdat.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -32,6 +32,8 @@ #ifndef rhm_journal_rcvdat_hpp #define rhm_journal_rcvdat_hpp +#include <iostream> +#include <iomanip> #include <map> #include <vector> Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -50,7 +50,7 @@ {} rmgr::rmgr(jcntl* jc, enq_map& emap, txn_map& tmap, rrfc& rrfc, - std::deque<data_tok*>* const dtokl) throw (jexception): + std::deque<data_tok*>* const dtokl): pmgr(jc, emap, tmap, JRNL_RMGR_PAGE_SIZE, JRNL_RMGR_PAGES, dtokl), _rrfc(rrfc), _hdr() @@ -61,7 +61,6 @@ void rmgr::initialize(std::deque<data_tok*>* const dtoklp, const aio_cb rd_cb, size_t fro) - throw (jexception) { _dtoklp = dtoklp; _cb = rd_cb; @@ -72,7 +71,7 @@ const iores rmgr::get(const u_int64_t& /*rid*/, const size_t& /*dsize*/, const size_t& /*dsize_avail*/, - const void** const /*data*/, bool /*auto_discard*/) throw (jexception) + const void** const /*data*/, bool /*auto_discard*/) { //std::cout << " rmgr::get()" << std::flush; iores res = pre_read_check(NULL); @@ -166,7 +165,7 @@ } const iores -rmgr::discard(data_tok* dtokp) throw (jexception) +rmgr::discard(data_tok* dtokp) { //std::cout << " rmgr::get()" << std::flush; iores res = pre_read_check(dtokp); @@ -217,7 +216,7 @@ const iores rmgr::read(void** const datapp, size_t& dsize, void** const xidpp, size_t& xidsize, bool& transient, - bool& external, data_tok* dtokp) throw (jexception) + bool& external, data_tok* dtokp) { iores res = pre_read_check(dtokp); if (res != RHM_IORES_SUCCESS) @@ -383,7 +382,7 @@ } const u_int32_t -rmgr::get_events(page_state state) throw (jexception) +rmgr::get_events(page_state state) { int ret = 0; if ((ret = ::io_getevents(_ioctx, 0, JRNL_RMGR_PAGES + JRNL_WMGR_PAGES, _ioevt_arr, NULL)) < 0) @@ -452,13 +451,13 @@ } void -rmgr::initialize() throw (jexception) +rmgr::initialize() { pmgr::initialize(); } const iores -rmgr::pre_read_check(data_tok* dtokp) throw (jexception) +rmgr::pre_read_check(data_tok* dtokp) { if (_aio_evt_rem) get_events(); @@ -489,7 +488,6 @@ const iores rmgr::read_enq(hdr& h, void* rptr, data_tok* dtokp) - throw (jexception) { if (_page_cb_arr[_pg_index]._state != AIO_COMPLETE) { @@ -531,7 +529,7 @@ } void -rmgr::consume_xid_rec(hdr& h, void* rptr, data_tok* dtokp) throw (jexception) +rmgr::consume_xid_rec(hdr& h, void* rptr, data_tok* dtokp) { if (h._magic == RHM_JDAT_ENQ_MAGIC) { @@ -568,7 +566,7 @@ } void -rmgr::consume_filler() throw (jexception) +rmgr::consume_filler() { // Filler (Magic "RHMx") is one dblk by definition _pg_offset_dblks++; @@ -577,7 +575,7 @@ } const iores -rmgr::skip(data_tok* dtokp) throw (jexception) +rmgr::skip(data_tok* dtokp) { u_int32_t dsize_dblks = jrec::size_dblks(dtokp->dsize()); u_int32_t tot_dblk_cnt = dtokp->dblocks_read(); @@ -621,7 +619,7 @@ } void -rmgr::aio_cycle() throw (jexception) +rmgr::aio_cycle() { int16_t first_uninit = -1; u_int16_t num_uninit = 0; @@ -653,7 +651,7 @@ } void -rmgr::init_aio_reads(const int16_t first_uninit, const u_int16_t num_uninit) throw (jexception) +rmgr::init_aio_reads(const int16_t first_uninit, const u_int16_t num_uninit) { for (int16_t i=0; i<num_uninit; i++) { @@ -697,7 +695,7 @@ } void -rmgr::consume_fhdr() throw (jexception) +rmgr::consume_fhdr() { // If in the future it should become necessary to read each file header, this is where it would // happen. Modified: store/trunk/cpp/lib/jrnl/rmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/rmgr.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -64,30 +64,28 @@ public: rmgr(jcntl* jc, enq_map& emap, txn_map& tmap, rrfc& rrfc); rmgr(jcntl* jc, enq_map& emap, txn_map& tmap, rrfc& rrfc, - std::deque<data_tok*>* const dtokl) throw (jexception); + std::deque<data_tok*>* const dtokl); virtual ~rmgr(); - void initialize(std::deque<data_tok*>* const dtoklp, const aio_cb rd_cb, size_t fro) - throw (jexception); + void initialize(std::deque<data_tok*>* const dtoklp, const aio_cb rd_cb, size_t fro); const iores get(const u_int64_t& rid, const size_t& dsize, const size_t& dsize_avail, - const void** const data, bool auto_discard) throw (jexception); - const iores discard(data_tok* dtok) throw (jexception); + const void** const data, bool auto_discard); + const iores discard(data_tok* dtok); const iores read(void** const datapp, size_t& dsize, void** const xidpp, size_t& xidsize, - bool& transient, bool& external, data_tok* dtokp) throw (jexception); - const u_int32_t get_events(page_state state = AIO_COMPLETE) throw (jexception); + bool& transient, bool& external, data_tok* dtokp); + const u_int32_t get_events(page_state state = AIO_COMPLETE); void recover_complete(size_t fro); private: - void initialize() throw (jexception); - const iores pre_read_check(data_tok* dtokp) throw (jexception); - const iores read_enq(hdr& h, void* rptr, data_tok* dtokp) throw (jexception); - void consume_xid_rec(hdr& h, void* rptr, data_tok* dtokp) throw (jexception); - void consume_filler() throw (jexception); - const iores skip(data_tok* dtokp) throw (jexception); - void aio_cycle() throw (jexception); - void init_aio_reads(const int16_t first_uninit, const u_int16_t num_uninit) - throw (jexception); - void consume_fhdr() throw (jexception); + void initialize(); + const iores pre_read_check(data_tok* dtokp); + const iores read_enq(hdr& h, void* rptr, data_tok* dtokp); + void consume_xid_rec(hdr& h, void* rptr, data_tok* dtokp); + void consume_filler(); + const iores skip(data_tok* dtokp); + void aio_cycle(); + void init_aio_reads(const int16_t first_uninit, const u_int16_t num_uninit); + void consume_fhdr(); void rotate_page(); const u_int32_t dblks_rem() const; void set_params_null(void** const datapp, size_t& dsize, void** const xidpp, Modified: store/trunk/cpp/lib/jrnl/rrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/rrfc.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -50,7 +50,7 @@ rrfc::~rrfc() {} void -rrfc::initialize(u_int32_t nfiles, nlfh** fh_arr, u_int32_t fh_index) throw (jexception) +rrfc::initialize(u_int32_t nfiles, nlfh** fh_arr, u_int32_t fh_index) { _nfiles = nfiles; _fh_arr = fh_arr; @@ -59,7 +59,7 @@ } bool -rrfc::rotate() throw (jexception) +rrfc::rotate() { if (!_nfiles) throw jexception(jerrno::JERR__NINIT, "rrfc", "rotate"); Modified: store/trunk/cpp/lib/jrnl/rrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/rrfc.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -71,14 +71,13 @@ * each of which correspond to one of the physical files. * \param fh_index Initial index of journal file. Default = 0. */ - void initialize(u_int32_t nfiles, nlfh** fh_arr, u_int32_t fh_index = 0) - throw (jexception); + void initialize(u_int32_t nfiles, nlfh** fh_arr, u_int32_t fh_index = 0); /** * \brief Rotate active file handle to next file in rotating file group. * \exception jerrno::JERR__NINIT if called before calling initialize(). */ - bool rotate() throw (jexception); + bool rotate(); /** * \brief Returns the index of the currently active file within the rotating @@ -114,12 +113,12 @@ inline const u_int32_t subm_cnt_dblks() const { return _curr_fh->rd_subm_cnt_dblks(); } inline const size_t subm_offs() const { return _curr_fh->rd_subm_offs(); } - inline const u_int32_t add_subm_cnt_dblks(u_int32_t a) throw (jexception) + inline const u_int32_t add_subm_cnt_dblks(u_int32_t a) { return _curr_fh->add_rd_subm_cnt_dblks(a); } inline const u_int32_t cmpl_cnt_dblks() const { return _curr_fh->rd_cmpl_cnt_dblks(); } inline const size_t cmpl_offs() const { return _curr_fh->rd_cmpl_offs(); } - inline const u_int32_t add_cmpl_cnt_dblks(u_int32_t a) throw (jexception) + inline const u_int32_t add_cmpl_cnt_dblks(u_int32_t a) { return _curr_fh->add_rd_cmpl_cnt_dblks(a); } inline const bool empty() const { return _curr_fh->rd_empty(); } Modified: store/trunk/cpp/lib/jrnl/txn_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/txn_map.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -35,9 +35,8 @@ #include <iomanip> #include <sstream> #include <jrnl/jerrno.hpp> +#include <jrnl/jexception.hpp> -#include <iostream> // for debug - namespace rhm { namespace journal @@ -64,7 +63,7 @@ } const bool -txn_map::insert_txn_data(const std::string& xid, const txn_data& td) throw (jexception) +txn_map::insert_txn_data(const std::string& xid, const txn_data& td) { bool ok = true; pthread_mutex_lock(&_mutex); @@ -84,7 +83,7 @@ } const txn_data_list -txn_map::get_tdata_list(const std::string& xid) throw (jexception) +txn_map::get_tdata_list(const std::string& xid) { pthread_mutex_lock(&_mutex); xmap_itr itr = _map.find(xid); @@ -99,7 +98,7 @@ } const txn_data_list -txn_map::get_remove_tdata_list(const std::string& xid) throw (jexception) +txn_map::get_remove_tdata_list(const std::string& xid) { pthread_mutex_lock(&_mutex); xmap_itr itr = _map.find(xid); @@ -129,7 +128,7 @@ } const u_int32_t -txn_map::get_rid_count(const std::string& xid) throw (jexception) +txn_map::get_rid_count(const std::string& xid) { pthread_mutex_lock(&_mutex); xmap_itr itr = _map.find(xid); @@ -144,7 +143,7 @@ } const bool -txn_map::is_txn_synced(const std::string& xid) throw (jexception) +txn_map::is_txn_synced(const std::string& xid) { pthread_mutex_lock(&_mutex); xmap_itr itr = _map.find(xid); @@ -171,7 +170,7 @@ } const bool -txn_map::set_aio_compl(const std::string& xid, const u_int64_t rid) throw (jexception) +txn_map::set_aio_compl(const std::string& xid, const u_int64_t rid) { bool ok = true; bool found = false; Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -44,7 +44,6 @@ #include <map> #include <pthread.h> #include <vector> -#include <jrnl/jexception.hpp> namespace rhm { @@ -79,13 +78,13 @@ txn_map(); virtual ~txn_map(); - const bool insert_txn_data(const std::string& xid, const txn_data& td) throw (jexception); - const txn_data_list get_tdata_list(const std::string& xid) throw (jexception); - const txn_data_list get_remove_tdata_list(const std::string& xid) throw (jexception); + const bool insert_txn_data(const std::string& xid, const txn_data& td); + const txn_data_list get_tdata_list(const std::string& xid); + const txn_data_list get_remove_tdata_list(const std::string& xid); const bool in_map(const std::string& xid); - const u_int32_t get_rid_count(const std::string& xid) throw (jexception); - const bool is_txn_synced(const std::string& xid) throw (jexception); - const bool set_aio_compl(const std::string& xid, const u_int64_t rid) throw (jexception); + const u_int32_t get_rid_count(const std::string& xid); + const bool is_txn_synced(const std::string& xid); + const bool set_aio_compl(const std::string& xid, const u_int64_t rid); inline void clear() { _map.clear(); } inline const bool empty() const { return _map.empty(); } inline const u_int16_t size() const { return (u_int16_t)_map.size(); } Modified: store/trunk/cpp/lib/jrnl/txn_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/txn_rec.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -92,7 +92,7 @@ } const u_int32_t -txn_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) throw (jexception) +txn_rec::encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) { assert(wptr != NULL); assert(max_size_dblks > 0); @@ -201,7 +201,6 @@ const u_int32_t txn_rec::decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception) { assert(rptr != NULL); assert(max_size_dblks > 0); @@ -312,7 +311,7 @@ } const bool -txn_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception) +txn_rec::rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) { if (rec_offs == 0) { @@ -400,7 +399,7 @@ } void -txn_rec::chk_hdr() const throw (jexception) +txn_rec::chk_hdr() const { jrec::chk_hdr(_txn_hdr._hdr); if (_txn_hdr._hdr._magic != RHM_JDAT_TXA_MAGIC && _txn_hdr._hdr._magic != RHM_JDAT_TXC_MAGIC) @@ -416,14 +415,14 @@ } void -txn_rec::chk_hdr(u_int64_t rid) const throw (jexception) +txn_rec::chk_hdr(u_int64_t rid) const { chk_hdr(); jrec::chk_rid(_txn_hdr._hdr, rid); } void -txn_rec::chk_tail() const throw (jexception) +txn_rec::chk_tail() const { jrec::chk_tail(_txn_tail, _txn_hdr._hdr); } Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -73,12 +73,11 @@ // Prepare instance for use in writing data to journal void reset(const u_int32_t magic, const u_int64_t rid, const void* const xidp, const size_t xidlen, const bool owi); - const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks) - throw (jexception); + const u_int32_t encode(void* wptr, u_int32_t rec_offs_dblks, u_int32_t max_size_dblks); const u_int32_t decode(hdr& h, void* rptr, u_int32_t rec_offs_dblks, - u_int32_t max_size_dblks) throw (jexception); + u_int32_t max_size_dblks); // Decode used for recover - const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs) throw (jexception); + const bool rcv_decode(hdr h, std::ifstream* ifsp, size_t& rec_offs); const size_t get_xid(void** const xidpp); std::string& str(std::string& str) const; @@ -87,9 +86,9 @@ const size_t rec_size() const; private: - void chk_hdr() const throw (jexception); - void chk_hdr(u_int64_t rid) const throw (jexception); - void chk_tail() const throw (jexception); + void chk_hdr() const; + void chk_hdr(u_int64_t rid) const; + void chk_tail() const; virtual void clean(); }; // class txn_rec Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -64,7 +64,7 @@ } wmgr::wmgr(jcntl* jc, enq_map& emap, txn_map& tmap, wrfc& wrfc, std::deque<data_tok*>* const dtoklp, - const u_int32_t max_dtokpp, const u_int32_t max_iowait_us) throw (jexception): + const u_int32_t max_dtokpp, const u_int32_t max_iowait_us): pmgr(jc, emap, tmap, JRNL_WMGR_PAGE_SIZE, JRNL_WMGR_PAGES, dtoklp), _wrfc(wrfc), _max_dtokpp(max_dtokpp), @@ -91,7 +91,7 @@ void wmgr::initialize(std::deque<data_tok*>* dtoklp, const aio_cb wr_cb, const u_int32_t max_dtokpp, - const u_int32_t max_iowait_us, size_t eo) throw (jexception) + const u_int32_t max_iowait_us, size_t eo) { _dtoklp = dtoklp; _max_dtokpp = max_dtokpp; @@ -110,7 +110,7 @@ const iores wmgr::enqueue(const void* const data_buff, const size_t tot_data_len, const size_t this_data_len, data_tok* dtokp, const void* const xid_ptr, const size_t xid_len, const bool transient, - const bool external) throw (jexception) + const bool external) { if (xid_len) assert(xid_ptr != NULL); @@ -249,7 +249,7 @@ } const iores -wmgr::dequeue(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) throw (jexception) +wmgr::dequeue(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) { if (xid_len) assert(xid_ptr != NULL); @@ -400,7 +400,7 @@ } const iores -wmgr::abort(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) throw (jexception) +wmgr::abort(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) { // commit and abort MUST have a valid xid assert(xid_ptr != NULL && xid_len > 0); @@ -546,7 +546,7 @@ } const iores -wmgr::commit(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) throw (jexception) +wmgr::commit(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) { // commit and abort MUST have a valid xid assert(xid_ptr != NULL && xid_len > 0); @@ -760,7 +760,7 @@ } const u_int32_t -wmgr::get_events(page_state state) throw (jexception) +wmgr::get_events(page_state state) { int ret = 0; if ((ret = ::io_getevents(_ioctx, 0, JRNL_RMGR_PAGES + JRNL_WMGR_PAGES, _ioevt_arr, NULL)) < 0) @@ -879,7 +879,7 @@ } const bool -wmgr::is_txn_synced(const std::string& xid) throw (jexception) +wmgr::is_txn_synced(const std::string& xid) { bool is_synced = true; // Check for outstanding enqueues/dequeues @@ -896,7 +896,7 @@ } void -wmgr::initialize() throw (jexception) +wmgr::initialize() { const u_int16_t num_jfiles = _jc->num_jfiles(); pmgr::initialize(); @@ -925,7 +925,7 @@ } const iores -wmgr::pre_write_check(_op_type op, data_tok* dtokp) throw (jexception) +wmgr::pre_write_check(_op_type op, data_tok* dtokp) { // Check status of current file if (!_wrfc.is_reset()) @@ -1013,7 +1013,7 @@ } void -wmgr::write_fhdr(u_int64_t rid, u_int32_t fid, size_t fro) throw (jexception) +wmgr::write_fhdr(u_int64_t rid, u_int32_t fid, size_t fro) { file_hdr fhdr(RHM_JDAT_FILE_MAGIC, RHM_JDAT_VERSION, rid, fid, fro, _wrfc.owi(), true); ::memcpy(_fhdr_ptr_arr[fid], &fhdr, sizeof(fhdr)); Modified: store/trunk/cpp/lib/jrnl/wmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/wmgr.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -100,33 +100,29 @@ wmgr(jcntl* jc, enq_map& emap, txn_map& tmap, wrfc& wrfc); wmgr(jcntl* jc, enq_map& emap, txn_map& tmap, wrfc& wrfc, std::deque<data_tok*>* const dtoklp, const u_int32_t max_dtokpp, - const u_int32_t max_iowait_us) throw (jexception); + const u_int32_t max_iowait_us); virtual ~wmgr(); void initialize(std::deque<data_tok*>* const dtoklp, aio_cb wr_cb, - const u_int32_t max_dtokpp, const u_int32_t max_iowait_us, size_t eo = 0) - throw (jexception); + const u_int32_t max_dtokpp, const u_int32_t max_iowait_us, size_t eo = 0); const iores enqueue(const void* const data_buff, const size_t tot_data_len, const size_t this_data_len, data_tok* dtokp, const void* const xid_ptr, - const size_t xid_len, const bool transient, const bool external) throw (jexception); - const iores dequeue(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) - throw (jexception); - const iores abort(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) - throw (jexception); - const iores commit(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len) - throw (jexception); + const size_t xid_len, const bool transient, const bool external); + const iores dequeue(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len); + const iores abort(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len); + const iores commit(data_tok* dtokp, const void* const xid_ptr, const size_t xid_len); const iores flush(); - const u_int32_t get_events(page_state state) throw (jexception); - const bool is_txn_synced(const std::string& xid) throw (jexception); + const u_int32_t get_events(page_state state); + const bool is_txn_synced(const std::string& xid); private: - void initialize() throw (jexception); - const iores pre_write_check(_op_type op, data_tok* dtokp) throw (jexception); + void initialize(); + const iores pre_write_check(_op_type op, data_tok* dtokp); const u_int64_t initialize_rid(const bool cont, data_tok* dtokp); const iores write_flush(); const iores rotate_file(); void dblk_roundup(); - void write_fhdr(u_int64_t rid, u_int32_t fid, size_t fro) throw (jexception); + void write_fhdr(u_int64_t rid, u_int32_t fid, size_t fro); void rotate_page(); void clean(); Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -54,7 +54,7 @@ wrfc::~wrfc() {} void -wrfc::initialize(u_int32_t nfiles, nlfh** fh_arr, rcvdat* rdp) throw (jexception) +wrfc::initialize(u_int32_t nfiles, nlfh** fh_arr, rcvdat* rdp) { if (rdp) { @@ -75,7 +75,7 @@ } bool -wrfc::rotate() throw (jexception) +wrfc::rotate() { if (!_nfiles) throw jexception(jerrno::JERR__NINIT, "wrfc", "rotate"); Modified: store/trunk/cpp/lib/jrnl/wrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.hpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/lib/jrnl/wrfc.hpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -71,13 +71,13 @@ * \param rdp Struct carrying restore information. Optional for non-restore use, defaults to * NULL. */ - void initialize(u_int32_t nfiles, nlfh** fh_arr, rcvdat* rdp = NULL) throw (jexception); + void initialize(u_int32_t nfiles, nlfh** fh_arr, rcvdat* rdp = NULL); /** * \brief Rotate active file handle to next file in rotating file group. * \exception jerrno::JERR__NINIT if called before calling initialize(). */ - bool rotate() throw (jexception); + bool rotate(); inline const u_int64_t rid() const { return _rid; } inline const u_int64_t get_incr_rid() { return _rid++; } @@ -91,12 +91,12 @@ inline const u_int32_t subm_cnt_dblks() const { return _curr_fh->wr_subm_cnt_dblks(); } inline const size_t subm_offs() const { return _curr_fh->wr_subm_offs(); } - inline const u_int32_t add_subm_cnt_dblks(u_int32_t a) throw (jexception) + inline const u_int32_t add_subm_cnt_dblks(u_int32_t a) { return _curr_fh->add_wr_subm_cnt_dblks(a); } inline const u_int32_t cmpl_cnt_dblks() const { return _curr_fh->wr_cmpl_cnt_dblks(); } inline const size_t cmpl_offs() const { return _curr_fh->wr_cmpl_offs(); } - inline const u_int32_t add_cmpl_cnt_dblks(u_int32_t a) throw (jexception) + inline const u_int32_t add_cmpl_cnt_dblks(u_int32_t a) { return _curr_fh->add_wr_cmpl_cnt_dblks(a); } inline const bool empty() const { return _curr_fh->wr_empty(); } Modified: store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/tests/jrnl/unit_test_file_hdr.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -32,6 +32,7 @@ #include <boost/test/results_reporter.hpp> #include <boost/test/unit_test.hpp> #include <boost/test/unit_test_log.hpp> +#include <iostream> #include <jrnl/file_hdr.hpp> #include <jrnl/jcfg.hpp> Modified: store/trunk/cpp/tests/jrnl/unit_test_jinf.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/unit_test_jinf.cpp 2007-12-07 17:09:35 UTC (rev 1442) +++ store/trunk/cpp/tests/jrnl/unit_test_jinf.cpp 2007-12-07 19:17:58 UTC (rev 1443) @@ -33,6 +33,7 @@ #include <boost/test/unit_test.hpp> #include <boost/test/unit_test_log.hpp> #include <fstream> +#include <iomanip> #include <iostream> #include <jrnl/file_hdr.hpp> #include <jrnl/jcfg.hpp>