constexpr in sdw

Author: mrotteveel

src/jrd/sdw.cpp

@@ -325,14 +325,14 @@ void SDW_dump_pages(thread_db* tdbb)
 
 				CCH_FETCH(tdbb, &window, LCK_read, pag_undefined);
 
-				class Pio : public CryptoManager::IOCallback
+				class Pio final : public CryptoManager::IOCallback
 				{
 				public:
-					Pio(Shadow* s, BufferDesc* b)
+					Pio(Shadow* s, BufferDesc* b) noexcept
 						: shadow(s), bdb(b)
 					{ }
 
-					bool callback(thread_db* tdbb, FbStatusVector* status, Ods::pag* page)
+					bool callback(thread_db* tdbb, FbStatusVector* status, Ods::pag* page) override
 					{
 						return CCH_write_all_shadows(tdbb, shadow, bdb, page, status, false);
 					}
@@ -441,7 +441,7 @@ void SDW_init(thread_db* tdbb, bool activate, bool delete_files)
 	// set up the lock block for synchronizing addition of new shadows
 
 	header_page* header; // for sizeof here, used later
-	const USHORT key_length = sizeof(header->hdr_shadow_count);
+	constexpr USHORT key_length = sizeof(header->hdr_shadow_count);
 	Lock* lock = FB_NEW_RPT(*dbb->dbb_permanent, key_length)
 		Lock(tdbb, key_length, LCK_shadow, dbb, blocking_ast_shadowing);
 	dbb->dbb_shadow_lock = lock;
@@ -573,7 +573,7 @@ void SDW_notify(thread_db* tdbb)
 }
 
 
-bool SDW_rollover_to_shadow(thread_db* tdbb, jrd_file* file, const bool inAst)
+bool SDW_rollover_to_shadow(thread_db* tdbb, const jrd_file* file, const bool inAst)
 {
 /**************************************
  *
@@ -926,7 +926,7 @@ static void activate_shadow(thread_db* tdbb)
  *
  **************************************/
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	CHECK_DBB(dbb);
 
 	gds__log("activating shadow file %s", dbb->dbb_filename.c_str());
@@ -1043,7 +1043,7 @@ static bool check_for_file(thread_db* tdbb, const SCHAR* name, USHORT length)
  **************************************/
 
 	SET_TDBB(tdbb);
-	Database* dbb = tdbb->getDatabase();
+	const Database* dbb = tdbb->getDatabase();
 	const Firebird::PathName path(name, length);
 
 	try {

src/jrd/sdw.h

@@ -42,21 +42,21 @@ class Shadow : public pool_alloc<type_sdw>
 
 // sdw_flags
 
-const USHORT SDW_dumped	= 1;			// bit set when file has been copied
-const USHORT SDW_shutdown	= 2;		// stop shadowing on next cache flush
-const USHORT SDW_manual	= 4;			// shadow is a manual shadow--don't delete
-const USHORT SDW_delete	= 8;			// delete the shadow at the next shutdown
-const USHORT SDW_found		= 16;		// flag to mark shadow found in database
-const USHORT SDW_rollover	= 32;		// this shadow was rolled over to when the main db file went away
-const USHORT SDW_conditional	= 64;	// shadow to be used if another shadow becomes unavailable
-
-/* these macros are a convenient combination of switches:
+inline constexpr USHORT SDW_dumped		= 1;	// bit set when file has been copied
+inline constexpr USHORT SDW_shutdown	= 2;	// stop shadowing on next cache flush
+inline constexpr USHORT SDW_manual		= 4;	// shadow is a manual shadow--don't delete
+inline constexpr USHORT SDW_delete		= 8;	// delete the shadow at the next shutdown
+inline constexpr USHORT SDW_found		= 16;	// flag to mark shadow found in database
+inline constexpr USHORT SDW_rollover	= 32;	// this shadow was rolled over to when the main db file went away
+inline constexpr USHORT SDW_conditional	= 64;	// shadow to be used if another shadow becomes unavailable
+
+/* these constants are a convenient combination of switches:
    the first specifies the shadow is invalid for writing to;
    the second specifies that the shadow no SLONGer exists and the
    shadow block simply hasn't been cleared out yet */
 
-const USHORT SDW_INVALID	= (SDW_shutdown | SDW_delete | SDW_rollover | SDW_conditional);
-const USHORT SDW_IGNORE	= (SDW_shutdown | SDW_delete);
+inline constexpr USHORT SDW_INVALID	= (SDW_shutdown | SDW_delete | SDW_rollover | SDW_conditional);
+inline constexpr USHORT SDW_IGNORE	= (SDW_shutdown | SDW_delete);
 
 } //namespace Jrd
 

src/jrd/sdw_proto.h

@@ -37,7 +37,7 @@ void	SDW_get_shadows(Jrd::thread_db* tdbb);
 void	SDW_init(Jrd::thread_db* tdbb, bool, bool);
 bool	SDW_lck_update(Jrd::thread_db*, SLONG);
 void	SDW_notify(Jrd::thread_db* tdbb);
-bool	SDW_rollover_to_shadow(Jrd::thread_db* tdbb, Jrd::jrd_file*, const bool);
+bool	SDW_rollover_to_shadow(Jrd::thread_db* tdbb, const Jrd::jrd_file*, const bool);
 // It's never called directly, but through SDW_check().
 //void	SDW_shutdown_shadow(Jrd::Shadow*);
 void	SDW_start(Jrd::thread_db* tdbb, const TEXT*, USHORT, USHORT, bool);