const/constexpr in tra

Author: mrotteveel

src/jrd/tra.cpp

@@ -79,7 +79,7 @@
 #include "firebird/impl/msg_helper.h"
 
 
-const int DYN_MSG_FAC	= 8;
+constexpr int DYN_MSG_FAC = FB_IMPL_MSG_FACILITY_DYN;
 
 using namespace Jrd;
 using namespace Ods;
@@ -97,7 +97,7 @@ static void retain_context(thread_db* tdbb, jrd_tra* transaction, bool commit, i
 static void expand_view_lock(thread_db* tdbb, jrd_tra*, jrd_rel*, UCHAR lock_type,
 	const char* option_name, RelationLockTypeMap& lockmap, const int level);
 static tx_inv_page* fetch_inventory_page(thread_db*, WIN* window, ULONG sequence, USHORT lock_level);
-static const char* get_lockname_v3(const UCHAR lock);
+static constexpr const char* get_lockname_v3(const UCHAR lock) noexcept;
 static ULONG inventory_page(thread_db*, ULONG);
 static int limbo_transaction(thread_db*, TraNumber id);
 static void release_temp_tables(thread_db*, jrd_tra*);
@@ -109,7 +109,7 @@ static void transaction_flush(thread_db* tdbb, USHORT flush_flag, TraNumber tra_
 static void transaction_options(thread_db*, jrd_tra*, const UCHAR*, USHORT);
 static void transaction_start(thread_db* tdbb, jrd_tra* temp);
 
-static const UCHAR sweep_tpb[] =
+static constexpr UCHAR sweep_tpb[] =
 {
 	isc_tpb_version1, isc_tpb_read,
 	isc_tpb_read_committed, isc_tpb_rec_version
@@ -149,7 +149,7 @@ void TRA_setup_request_snapshot(Jrd::thread_db* tdbb, Jrd::Request* request)
 	// This function is called whenever request is started in a transaction.
 	// Setup context to preserve read consistency in READ COMMITTED transactions.
 
-	Jrd::jrd_tra* transaction = request->req_transaction;
+	const Jrd::jrd_tra* transaction = request->req_transaction;
 
 	// We assume that request is already attached to a transaction
 	fb_assert(transaction);
@@ -448,7 +448,7 @@ void TRA_commit(thread_db* tdbb, jrd_tra* transaction, const bool retaining_flag
 
 	EDS::Transaction::jrdTransactionEnd(tdbb, transaction, true, retaining_flag, false);
 
-	jrd_tra* const sysTran = tdbb->getAttachment()->getSysTransaction();
+	const jrd_tra* const sysTran = tdbb->getAttachment()->getSysTransaction();
 
 	// If this is a commit retaining, and no updates have been performed,
 	// and no events have been posted (via stored procedures etc)
@@ -626,7 +626,7 @@ int TRA_fetch_state(thread_db* tdbb, TraNumber number)
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	// locate and fetch the proper TIP page
@@ -665,7 +665,7 @@ void TRA_get_inventory(thread_db* tdbb, UCHAR* bit_vector, TraNumber base, TraNu
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	// It does not make sence to call this function without bit_vector now
@@ -1002,7 +1002,7 @@ void TRA_post_resources(thread_db* tdbb, jrd_tra* transaction, ResourceList& res
 				case Resource::rsc_collation:
 					rsc->rsc_coll->incUseCount(tdbb);
 					break;
-				default:   // shut up compiler warning
+				default:
 					break;
 				}
 			}
@@ -1030,7 +1030,7 @@ bool TRA_is_active(thread_db* tdbb, TraNumber number)
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	Lock temp_lock(tdbb, sizeof(TraNumber), LCK_tra);
@@ -1107,7 +1107,7 @@ void TRA_prepare(thread_db* tdbb, jrd_tra* transaction, USHORT length, const UCH
 	DFW_perform_work(tdbb, transaction);
 
 	// Flush pages if transaction logically modified data
-	jrd_tra* sysTran = tdbb->getAttachment()->getSysTransaction();
+	const jrd_tra* sysTran = tdbb->getAttachment()->getSysTransaction();
 
 	if (transaction->tra_flags & TRA_write)
 		transaction_flush(tdbb, FLUSH_TRAN, transaction->tra_number);
@@ -1142,7 +1142,7 @@ jrd_tra* TRA_reconnect(thread_db* tdbb, const UCHAR* id, USHORT length)
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* const dbb = tdbb->getDatabase();
+	const Database* const dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 	Jrd::Attachment* const attachment = tdbb->getAttachment();
 
@@ -1242,7 +1242,7 @@ void TRA_release_transaction(thread_db* tdbb, jrd_tra* transaction, Jrd::TraceTr
 				}
 				else
 				{
-					ULONG temp_id = current->bli_temp_id;
+					const ULONG temp_id = current->bli_temp_id;
 					current->bli_blob_object->BLB_cancel(tdbb);
 					if (!transaction->tra_blobs->locate(Firebird::locGreat, temp_id))
 						break;
@@ -1466,7 +1466,7 @@ void TRA_rollback(thread_db* tdbb, jrd_tra* transaction, const bool retaining_fl
 		state = tra_committed;
 	}
 
-	jrd_tra* const sysTran = tdbb->getAttachment()->getSysTransaction();
+	const jrd_tra* const sysTran = tdbb->getAttachment()->getSysTransaction();
 	if (sysTran->tra_flags & TRA_write)
 		transaction_flush(tdbb, FLUSH_SYSTEM, 0);
 
@@ -1499,7 +1499,7 @@ void TRA_set_state(thread_db* tdbb, jrd_tra* transaction, TraNumber number, int
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	// If it is a ReadOnly DB, set the new state in the TIP cache and return
@@ -1662,12 +1662,12 @@ int TRA_snapshot_state(thread_db* tdbb, const jrd_tra* trans, TraNumber number,
 		if ((trans->tra_flags & TRA_read_consistency) && state == tra_committed)
 		{
 			// GC thread accesses data directly without any request
-			if (Request* current_request = tdbb->getRequest())
+			if (const Request* current_request = tdbb->getRequest())
 			{
 				// Notes:
 				// 1) There is no request snapshot when we build expression index
 				// 2) Disable read committed snapshot after we encountered update conflict
-				Request* snapshot_request = current_request->req_snapshot.m_owner;
+				const Request* snapshot_request = current_request->req_snapshot.m_owner;
 				if (snapshot_request && !(snapshot_request->req_flags & req_update_conflict))
 				{
 					if (stateCn > snapshot_request->req_snapshot.m_number)
@@ -1708,7 +1708,7 @@ jrd_tra* TRA_start(thread_db* tdbb, ULONG flags, SSHORT lock_timeout, Jrd::jrd_t
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* const dbb = tdbb->getDatabase();
+	const Database* const dbb = tdbb->getDatabase();
 	Jrd::Attachment* const attachment = tdbb->getAttachment();
 
 	// Starting new transactions should be allowed for threads which
@@ -1765,7 +1765,7 @@ jrd_tra* TRA_start(thread_db* tdbb, int tpb_length, const UCHAR* tpb, Jrd::jrd_t
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	Jrd::Attachment* attachment = tdbb->getAttachment();
 
 	// Starting new transactions should be allowed for threads which
@@ -1807,7 +1807,7 @@ jrd_tra* TRA_start(thread_db* tdbb, int tpb_length, const UCHAR* tpb, Jrd::jrd_t
 }
 
 
-int TRA_state(const UCHAR* bit_vector, TraNumber oldest, TraNumber number)
+int TRA_state(const UCHAR* bit_vector, TraNumber oldest, TraNumber number) noexcept
 {
 /**************************************
  *
@@ -1984,7 +1984,7 @@ int TRA_wait(thread_db* tdbb, jrd_tra* trans, TraNumber number, jrd_tra::wait_t
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	// Create, wait on, and release lock on target transaction.  If
@@ -2320,7 +2320,7 @@ static tx_inv_page* fetch_inventory_page(thread_db* tdbb,
 }
 
 
-static const char* get_lockname_v3(const UCHAR lock)
+static constexpr const char* get_lockname_v3(const UCHAR lock) noexcept
 {
 /**************************************
  *
@@ -2333,24 +2333,20 @@ static const char* get_lockname_v3(const UCHAR lock)
  *	This is for TPB versions 1 & 3.
  *
  **************************************/
-	const char* typestr = "unknown";
 	switch (lock)
 	{
 	case LCK_none:
 	case LCK_SR:
-		typestr = "isc_tpb_lock_read, isc_tpb_shared";
-		break;
+		return "isc_tpb_lock_read, isc_tpb_shared";
 	case LCK_PR:
-		typestr = "isc_tpb_lock_read, isc_tpb_protected/isc_tpb_exclusive";
-		break;
+		return "isc_tpb_lock_read, isc_tpb_protected/isc_tpb_exclusive";
 	case LCK_SW:
-		typestr = "isc_tpb_lock_write, isc_tpb_shared";
-		break;
+		return "isc_tpb_lock_write, isc_tpb_shared";
 	case LCK_EX:
-		typestr = "isc_tpb_lock_write, isc_tpb_protected/isc_tpb_exclusive";
-		break;
+		return "isc_tpb_lock_write, isc_tpb_protected/isc_tpb_exclusive";
+	default:
+		return "unknown";
 	}
-	return typestr;
 }
 
 
@@ -2420,7 +2416,7 @@ static int limbo_transaction(thread_db* tdbb, TraNumber id)
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	const ULONG trans_per_tip = dbb->dbb_page_manager.transPerTIP;
@@ -2456,7 +2452,7 @@ void jrd_tra::unlinkFromAttachment()
 }
 
 
-void jrd_tra::linkToAttachment(Attachment* attachment)
+void jrd_tra::linkToAttachment(Attachment* attachment) noexcept
 {
 /**************************************
  *
@@ -2619,7 +2615,7 @@ static void retain_context(thread_db* tdbb, jrd_tra* transaction, bool commit, i
 		const bool dontWrite = (dbb->dbb_flags & DBB_shared) &&
 			(transaction->tra_flags & TRA_readonly);
 
-		const auto header = bump_transaction_id(tdbb, &window, dontWrite);
+		const auto* header = bump_transaction_id(tdbb, &window, dontWrite);
 		new_number = header->hdr_next_transaction;
 	}
 #endif
@@ -2707,10 +2703,10 @@ static void retain_context(thread_db* tdbb, jrd_tra* transaction, bool commit, i
 
 
 namespace {
-	class SweepParameter : public GlobalStorage
+	class SweepParameter final : public GlobalStorage
 	{
 	public:
-		SweepParameter(Database* d)
+		SweepParameter(Database* d) noexcept
 			: dbb(d)
 		{ }
 
@@ -2741,12 +2737,12 @@ namespace {
 			status.check();
 			dpb->insertString(&status, isc_dpb_user_name, "sweeper");
 			status.check();
-			UCHAR byte = isc_dpb_records;
+			constexpr UCHAR byte = isc_dpb_records;
 			dpb->insertBytes(&status, isc_dpb_sweep, &byte, 1);
 			status.check();
 			const UCHAR* dpbBytes = dpb->getBuffer(&status);
 			status.check();
-			unsigned dpbLen = dpb->getBufferLength(&status);
+			const unsigned dpbLen = dpb->getBufferLength(&status);
 			status.check();
 
 			AutoRelease<IAttachment> att(prov->attachDatabase(&status, dbName.c_str(), dpbLen, dpbBytes));
@@ -2771,7 +2767,7 @@ namespace {
 			}
 		}
 
-		static void cleanup(SweepParameter* par)
+		static void cleanup(SweepParameter* par) noexcept
 		{
 			SPTHR_DEBUG(fprintf(stderr, "Cleanup dbb=%p par=%p\n", par->dbb, par));
 			delete par;
@@ -3584,7 +3580,7 @@ static void transaction_start(thread_db* tdbb, jrd_tra* trans)
 		const bool dontWrite = (dbb->dbb_flags & DBB_shared) &&
 			(trans->tra_flags & TRA_readonly);
 
-		const auto header = bump_transaction_id(tdbb, &window, dontWrite);
+		const auto* header = bump_transaction_id(tdbb, &window, dontWrite);
 		number = header->hdr_next_transaction;
 		oldest = header->hdr_oldest_transaction;
 		oldest_active = header->hdr_oldest_active;
@@ -3675,7 +3671,7 @@ static void transaction_start(thread_db* tdbb, jrd_tra* trans)
 		for (; active < number; active++)
 		{
 			//oldest_state = TPC_cache_state(tdbb, active);
-			const ULONG mask = (1 << tra_active);
+			constexpr ULONG mask = (1 << tra_active);
 			active = TPC_find_states(tdbb, active, number, mask, oldest_state);
 			if (!active)
 			{
@@ -3755,7 +3751,7 @@ static void transaction_start(thread_db* tdbb, jrd_tra* trans)
 		for (oldest = trans->tra_oldest; oldest < number; oldest++)
 		{
 			//oldest_state = TPC_cache_state(tdbb, oldest);
-			const ULONG mask = ~((1 << tra_committed) | (1 << tra_precommitted));
+			constexpr ULONG mask = ~((1 << tra_committed) | (1 << tra_precommitted));
 			oldest = TPC_find_states(tdbb, trans->tra_oldest, number, mask, oldest_state);
 			if (!oldest)
 			{
@@ -3889,7 +3885,7 @@ JTransaction* jrd_tra::getInterface(bool create)
 }
 
 
-void jrd_tra::setInterface(JTransaction* jt)
+void jrd_tra::setInterface(JTransaction* jt) noexcept
 {
 	fb_assert(tra_interface == NULL || tra_interface == jt);
 	tra_interface = jt;
@@ -3931,7 +3927,7 @@ DbCreatorsList* jrd_tra::getDbCreatorsList()
 }
 
 
-jrd_tra* jrd_tra::getOuter()
+jrd_tra* jrd_tra::getOuter() noexcept
 {
 	jrd_tra* tra = this;
 
@@ -4237,7 +4233,7 @@ TraceSweepEvent::TraceSweepEvent(thread_db* tdbb)
 	m_tdbb = tdbb;
 
 	WIN window(HEADER_PAGE_NUMBER);
-	Ods::header_page* header = (Ods::header_page*) CCH_FETCH(m_tdbb, &window, LCK_read, pag_header);
+	const Ods::header_page* header = (Ods::header_page*) CCH_FETCH(m_tdbb, &window, LCK_read, pag_header);
 
 	m_sweep_info.update(header);
 	CCH_RELEASE(m_tdbb, &window);
@@ -4352,7 +4348,7 @@ void TraceSweepEvent::report(ntrace_process_state_t state)
 	if (!m_need_trace)
 		return;
 
-	Database* dbb = m_tdbb->getDatabase();
+	const Database* dbb = m_tdbb->getDatabase();
 	TraceManager* trace_mgr = att->att_trace_manager;
 
 	TraceConnectionImpl conn(att);
@@ -4361,7 +4357,7 @@ void TraceSweepEvent::report(ntrace_process_state_t state)
 	if (state != ITracePlugin::SWEEP_STATE_PROGRESS)
 		m_base_stats.reset();
 
-	jrd_tra* tran = m_tdbb->getTransaction();
+	const jrd_tra* tran = m_tdbb->getTransaction();
 
 	TraceRuntimeStats stats(att, &m_base_stats, &att->att_stats, finiTime, 0);
 
@@ -4372,7 +4368,7 @@ void TraceSweepEvent::report(ntrace_process_state_t state)
 		m_need_trace = false;
 }
 
-SecDbContext::SecDbContext(IAttachment* a, ITransaction* t)
+SecDbContext::SecDbContext(IAttachment* a, ITransaction* t) noexcept
 	: att(a), tra(t), savePoint(0)
 { }
 
@@ -4392,7 +4388,7 @@ SecDbContext::~SecDbContext()
 	}
 }
 
-SecDbContext* jrd_tra::getSecDbContext()
+SecDbContext* jrd_tra::getSecDbContext() noexcept
 {
 	return tra_sec_db_context;
 }
@@ -4405,7 +4401,7 @@ SecDbContext* jrd_tra::setSecDbContext(IAttachment* att, ITransaction* tra)
 	return tra_sec_db_context;
 }
 
-void jrd_tra::eraseSecDbContext()
+void jrd_tra::eraseSecDbContext() noexcept
 {
 	delete tra_sec_db_context;
 	tra_sec_db_context = NULL;