constexpr + noexcept in Attachment

Author: mrotteveel

src/jrd/Attachment.h

@@ -149,34 +149,34 @@ struct DdlTriggerContext
 
 // Attachment flags
 
-const ULONG ATT_no_cleanup			= 0x00001L;	// Don't expunge, purge, or garbage collect
-const ULONG ATT_shutdown			= 0x00002L;	// attachment has been shutdown
-const ULONG ATT_shutdown_manager	= 0x00004L;	// attachment requesting shutdown
-const ULONG ATT_exclusive			= 0x00008L;	// attachment wants exclusive database access
-const ULONG ATT_attach_pending		= 0x00010L;	// Indicate attachment is only pending
-const ULONG ATT_exclusive_pending	= 0x00020L;	// Indicate exclusive attachment pending
-const ULONG ATT_notify_gc			= 0x00040L;	// Notify garbage collector to expunge, purge ..
-const ULONG ATT_garbage_collector	= 0x00080L;	// I'm a garbage collector
-const ULONG ATT_cancel_raise		= 0x00100L;	// Cancel currently running operation
-const ULONG ATT_cancel_disable		= 0x00200L;	// Disable cancel operations
-const ULONG ATT_no_db_triggers		= 0x00400L;	// Don't execute database triggers
-const ULONG ATT_manual_lock			= 0x00800L;	// Was locked manually
-const ULONG ATT_async_manual_lock	= 0x01000L;	// Async mutex was locked manually
-const ULONG ATT_overwrite_check		= 0x02000L;	// Attachment checks is it possible to overwrite DB
-const ULONG ATT_system				= 0x04000L; // Special system attachment
-const ULONG ATT_creator				= 0x08000L; // This attachment created the DB
-const ULONG ATT_monitor_disabled	= 0x10000L; // Monitoring lock is downgraded
-const ULONG ATT_security_db			= 0x20000L; // Attachment used for security purposes
-const ULONG ATT_mapping				= 0x40000L; // Attachment used for mapping auth block
-const ULONG ATT_from_thread			= 0x80000L; // Attachment from internal special thread (sweep, crypt)
-const ULONG ATT_monitor_init		= 0x100000L; // Attachment is registered in monitoring
-const ULONG ATT_repl_reset			= 0x200000L; // Replication set has been reset
-const ULONG ATT_replicating			= 0x400000L; // Replication is active
-const ULONG ATT_resetting			= 0x800000L; // Session reset is in progress
-const ULONG ATT_worker				= 0x1000000L; // Worker attachment, managed by the engine
-const ULONG ATT_gbak_restore_has_schema = 0x2000000L;
-
-const ULONG ATT_NO_CLEANUP			= (ATT_no_cleanup | ATT_notify_gc);
+inline constexpr ULONG ATT_no_cleanup			= 0x00001L;	// Don't expunge, purge, or garbage collect
+inline constexpr ULONG ATT_shutdown				= 0x00002L;	// attachment has been shutdown
+inline constexpr ULONG ATT_shutdown_manager		= 0x00004L;	// attachment requesting shutdown
+inline constexpr ULONG ATT_exclusive			= 0x00008L;	// attachment wants exclusive database access
+inline constexpr ULONG ATT_attach_pending		= 0x00010L;	// Indicate attachment is only pending
+inline constexpr ULONG ATT_exclusive_pending	= 0x00020L;	// Indicate exclusive attachment pending
+inline constexpr ULONG ATT_notify_gc			= 0x00040L;	// Notify garbage collector to expunge, purge ..
+inline constexpr ULONG ATT_garbage_collector	= 0x00080L;	// I'm a garbage collector
+inline constexpr ULONG ATT_cancel_raise			= 0x00100L;	// Cancel currently running operation
+inline constexpr ULONG ATT_cancel_disable		= 0x00200L;	// Disable cancel operations
+inline constexpr ULONG ATT_no_db_triggers		= 0x00400L;	// Don't execute database triggers
+inline constexpr ULONG ATT_manual_lock			= 0x00800L;	// Was locked manually
+inline constexpr ULONG ATT_async_manual_lock	= 0x01000L;	// Async mutex was locked manually
+inline constexpr ULONG ATT_overwrite_check		= 0x02000L;	// Attachment checks is it possible to overwrite DB
+inline constexpr ULONG ATT_system				= 0x04000L; // Special system attachment
+inline constexpr ULONG ATT_creator				= 0x08000L; // This attachment created the DB
+inline constexpr ULONG ATT_monitor_disabled		= 0x10000L; // Monitoring lock is downgraded
+inline constexpr ULONG ATT_security_db			= 0x20000L; // Attachment used for security purposes
+inline constexpr ULONG ATT_mapping				= 0x40000L; // Attachment used for mapping auth block
+inline constexpr ULONG ATT_from_thread			= 0x80000L; // Attachment from internal special thread (sweep, crypt)
+inline constexpr ULONG ATT_monitor_init			= 0x100000L; // Attachment is registered in monitoring
+inline constexpr ULONG ATT_repl_reset			= 0x200000L; // Replication set has been reset
+inline constexpr ULONG ATT_replicating			= 0x400000L; // Replication is active
+inline constexpr ULONG ATT_resetting			= 0x800000L; // Session reset is in progress
+inline constexpr ULONG ATT_worker				= 0x1000000L; // Worker attachment, managed by the engine
+inline constexpr ULONG ATT_gbak_restore_has_schema = 0x2000000L;
+
+inline constexpr ULONG ATT_NO_CLEANUP			= (ATT_no_cleanup | ATT_notify_gc);
 
 class Attachment;
 class DatabaseOptions;
@@ -215,13 +215,13 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 	class Sync
 	{
 	public:
-		Sync()
+		Sync() noexcept
 			: waiters(0), threadId(0), totalLocksCounter(0), currentLocksCounter(0)
 		{ }
 
 		void enter(const char* aReason)
 		{
-			ThreadId curTid = getThreadId();
+			const ThreadId curTid = getThreadId();
 
 			if (threadId == curTid)
 			{
@@ -245,7 +245,7 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 
 		bool tryEnter(const char* aReason)
 		{
-			ThreadId curTid = getThreadId();
+			const ThreadId curTid = getThreadId();
 
 			if (threadId == curTid)
 			{
@@ -274,12 +274,12 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 			}
 		}
 
-		bool hasContention() const
+		bool hasContention() const noexcept
 		{
 			return (waiters.load(std::memory_order_relaxed) > 0);
 		}
 
-		FB_UINT64 getLockCounter() const
+		FB_UINT64 getLockCounter() const noexcept
 		{
 			return totalLocksCounter;
 		}
@@ -299,8 +299,8 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 
 	private:
 		// copying is prohibited
-		Sync(const Sync&);
-		Sync& operator=(const Sync&);
+		Sync(const Sync&) = delete;
+		Sync& operator=(const Sync&) = delete;
 
 		Firebird::Mutex syncMutex;
 		std::atomic<int> waiters;
@@ -318,7 +318,7 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 		return att;
 	}
 
-	JAttachment* getInterface()
+	JAttachment* getInterface() noexcept
 	{
 		return jAtt;
 	}
@@ -341,7 +341,7 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 		return useAsync ? &async : &mainSync;
 	}
 
-	Firebird::Mutex* getBlockingMutex()
+	Firebird::Mutex* getBlockingMutex() noexcept
 	{
 		return &blockingMutex;
 	}
@@ -367,13 +367,13 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
 	void manualUnlock(ULONG& flags);
 	void manualAsyncUnlock(ULONG& flags);
 
-	void setShutError(ISC_STATUS code)
+	void setShutError(ISC_STATUS code) noexcept
 	{
 		if (!shutError)
 			shutError = code;
 	}
 
-	ISC_STATUS getShutError() const
+	ISC_STATUS getShutError() const noexcept
 	{
 		return shutError;
 	}
@@ -430,8 +430,8 @@ class Attachment : public pool_alloc<type_att>
 
 	private:
 		// copying is prohibited
-		SyncGuard(const SyncGuard&);
-		SyncGuard& operator=(const SyncGuard&);
+		SyncGuard(const SyncGuard&) = delete;
+		SyncGuard& operator=(const SyncGuard&) = delete;
 
 		void init(const char* f, bool optional);
 
@@ -502,12 +502,12 @@ class Attachment : public pool_alloc<type_att>
 		void setInitialOptions(thread_db* tdbb, const DatabaseOptions& options);
 		void resetAttachment(Attachment* attachment) const;
 
-		CoercionArray *getBindings()
+		CoercionArray *getBindings() noexcept
 		{
 			return &bindings;
 		}
 
-		const CoercionArray *getBindings() const
+		const CoercionArray *getBindings() const noexcept
 		{
 			return &bindings;
 		}
@@ -523,12 +523,12 @@ class Attachment : public pool_alloc<type_att>
 	class DebugOptions
 	{
 	public:
-		bool getDsqlKeepBlr() const
+		bool getDsqlKeepBlr() const noexcept
 		{
 			return dsqlKeepBlr;
 		}
 
-		void setDsqlKeepBlr(bool value)
+		void setDsqlKeepBlr(bool value) noexcept
 		{
 			dsqlKeepBlr = value;
 		}
@@ -540,7 +540,7 @@ class Attachment : public pool_alloc<type_att>
 	class UseCountHolder
 	{
 	public:
-		explicit UseCountHolder(Attachment* a)
+		explicit UseCountHolder(Attachment* a) noexcept
 			: att(a)
 		{
 			if (att)
@@ -711,22 +711,22 @@ class Attachment : public pool_alloc<type_att>
 	/// former Database members - end
 
 	bool locksmith(thread_db* tdbb, SystemPrivilege sp) const;
-	jrd_tra* getSysTransaction();
-	void setSysTransaction(jrd_tra* trans);	// used only by TRA_init
+	jrd_tra* getSysTransaction() noexcept;
+	void setSysTransaction(jrd_tra* trans) noexcept;	// used only by TRA_init
 
-	bool isSystem() const
+	inline bool isSystem() const noexcept
 	{
 		return (att_flags & ATT_system);
 	}
 
-	bool isWorker() const
+	inline bool isWorker() const noexcept
 	{
 		return (att_flags & ATT_worker);
 	}
 
-	bool isGbak() const;
-	bool isRWGbak() const;
-	bool isUtility() const; // gbak, gfix and gstat.
+	bool isGbak() const noexcept;
+	bool isRWGbak() const noexcept;
+	bool isUtility() const noexcept; // gbak, gfix and gstat.
 
 	PreparedStatement* prepareStatement(thread_db* tdbb, jrd_tra* transaction,
 		const Firebird::string& text, Firebird::MemoryPool* pool = NULL);
@@ -772,24 +772,24 @@ class Attachment : public pool_alloc<type_att>
 
 	JAttachment* getInterface() noexcept;
 
-	unsigned int getIdleTimeout() const
+	unsigned int getIdleTimeout() const noexcept
 	{
 		return att_idle_timeout;
 	}
 
-	void setIdleTimeout(unsigned int timeOut)
+	void setIdleTimeout(unsigned int timeOut) noexcept
 	{
 		att_idle_timeout = timeOut;
 	}
 
 	unsigned int getActualIdleTimeout() const;
 
-	unsigned int getStatementTimeout() const
+	unsigned int getStatementTimeout() const noexcept
 	{
 		return att_stmt_timeout;
 	}
 
-	void setStatementTimeout(unsigned int timeOut)
+	void setStatementTimeout(unsigned int timeOut) noexcept
 	{
 		att_stmt_timeout = timeOut;
 	}
@@ -830,7 +830,7 @@ class Attachment : public pool_alloc<type_att>
 		return att_user ? att_user->getSqlRole() : emptyName;
 	}
 
-	const UserId* getEffectiveUserId() const
+	const UserId* getEffectiveUserId() const noexcept
 	{
 		if (att_ss_user)
 			return att_ss_user;
@@ -844,12 +844,13 @@ class Attachment : public pool_alloc<type_att>
 	}
 
 	void setInitialOptions(thread_db* tdbb, DatabaseOptions& options, bool newDb);
-	const CoercionArray* getInitialBindings() const
+
+	const CoercionArray* getInitialBindings() const noexcept
 	{
 		return att_initial_options.getBindings();
 	}
 
-	DebugOptions& getDebugOptions()
+	DebugOptions& getDebugOptions() noexcept
 	{
 		return att_debug_options;
 	}
@@ -899,32 +900,32 @@ inline bool Attachment::locksmith(thread_db* tdbb, SystemPrivilege sp) const
 	return (user && user->locksmith(tdbb, sp));
 }
 
-inline jrd_tra* Attachment::getSysTransaction()
+inline jrd_tra* Attachment::getSysTransaction() noexcept
 {
 	return att_sys_transaction;
 }
 
-inline void Attachment::setSysTransaction(jrd_tra* trans)
+inline void Attachment::setSysTransaction(jrd_tra* trans) noexcept
 {
 	att_sys_transaction = trans;
 }
 
 // Connection is from GBAK
-inline bool Attachment::isGbak() const
+inline bool Attachment::isGbak() const noexcept
 {
 	return (att_utility == UTIL_GBAK);
 }
 
 // Gbak changes objects when it's restoring (creating) a db.
 // Other attempts are fake. Gbak reconnects to change R/O status and other db-wide settings,
 // but it doesn't modify generators or tables that seconds time.
-inline bool Attachment::isRWGbak() const
+inline bool Attachment::isRWGbak() const noexcept
 {
 	return (isGbak() && (att_flags & ATT_creator));
 }
 
 // Any of the three original utilities: gbak, gfix or gstat.
-inline bool Attachment::isUtility() const
+inline bool Attachment::isUtility() const noexcept
 {
 	return (att_utility != UTIL_NONE);
 }
@@ -939,19 +940,19 @@ class AttachmentsRefHolder
 	class Iterator
 	{
 	public:
-		explicit Iterator(AttachmentsRefHolder& list)
+		explicit Iterator(AttachmentsRefHolder& list) noexcept
 			: m_list(list), m_index(0)
 		{}
 
-		StableAttachmentPart* operator*()
+		StableAttachmentPart* operator*() noexcept
 		{
 			if (m_index < m_list.m_attachments.getCount())
 				return m_list.m_attachments[m_index];
 
 			return NULL;
 		}
 
-		void operator++()
+		void operator++() noexcept
 		{
 			m_index++;
 		}
@@ -967,8 +968,8 @@ class AttachmentsRefHolder
 
 	private:
 		// copying is prohibited
-		Iterator(const Iterator&);
-		Iterator& operator=(const Iterator&);
+		Iterator(const Iterator&) = delete;
+		Iterator& operator=(const Iterator&) = delete;
 
 		AttachmentsRefHolder& m_list;
 		FB_SIZE_T m_index;