constexpr + noexcept TraceLog

Author: mrotteveel

src/jrd/trace/TraceLog.cpp

@@ -52,8 +52,8 @@ using namespace Firebird;
 
 namespace Jrd {
 
-const unsigned int INIT_LOG_SIZE = 1024*1024;	// 1MB
-const unsigned int FREE_SPACE_THRESHOLD = INIT_LOG_SIZE / 4;
+constexpr unsigned int INIT_LOG_SIZE = 1024*1024;	// 1MB
+constexpr unsigned int FREE_SPACE_THRESHOLD = INIT_LOG_SIZE / 4;
 
 TraceLog::TraceLog(MemoryPool& pool, const PathName& fileName, bool reader) :
 	m_reader(reader),
@@ -268,7 +268,7 @@ void TraceLog::extend(FB_SIZE_T size)
 
 FB_SIZE_T TraceLog::getUsed()
 {
-	TraceLogHeader* header = m_sharedMemory->getHeader();
+	const TraceLogHeader* header = m_sharedMemory->getHeader();
 
 	if (header->readPos < header->writePos)
 		return (header->writePos - header->readPos);
@@ -280,14 +280,14 @@ FB_SIZE_T TraceLog::getUsed()
 
 FB_SIZE_T TraceLog::getFree(bool useMax)
 {
-	TraceLogHeader* header = m_sharedMemory->getHeader();
+	const TraceLogHeader* header = m_sharedMemory->getHeader();
 	return (useMax ? header->maxSize : header->allocated) - sizeof(TraceLogHeader) - getUsed() - 1;
 }
 
 bool TraceLog::isFull()
 {
 	TraceLogGuard guard(this);
-	TraceLogHeader* header = m_sharedMemory->getHeader();
+	const TraceLogHeader* header = m_sharedMemory->getHeader();
 	return header->flags & FLAG_FULL;
 }
 

src/jrd/trace/TraceLog.h

@@ -33,9 +33,9 @@
 
 namespace Jrd {
 
-struct TraceLogHeader : public Firebird::MemoryHeader
+struct TraceLogHeader final : public Firebird::MemoryHeader
 {
-	static const USHORT TRACE_LOG_VERSION = 2;
+	static constexpr USHORT TRACE_LOG_VERSION = 2;
 
 	ULONG readPos;
 	ULONG writePos;
@@ -44,7 +44,7 @@ struct TraceLogHeader : public Firebird::MemoryHeader
 	ULONG flags;
 };
 
-class TraceLog : public Firebird::IpcObject
+class TraceLog final : public Firebird::IpcObject
 {
 public:
 	TraceLog(Firebird::MemoryPool& pool, const Firebird::PathName& fileName, bool reader);
@@ -58,8 +58,8 @@ class TraceLog : public Firebird::IpcObject
 
 private:
 	// flags in header
-	const ULONG FLAG_FULL = 0x0001;		// log is full, set by writer, reset by reader
-	const ULONG FLAG_DONE = 0x0002;		// set when reader is gone
+	static constexpr ULONG FLAG_FULL = 0x0001;	// log is full, set by writer, reset by reader
+	static constexpr ULONG FLAG_DONE = 0x0002;	// set when reader is gone
 
 	void mutexBug(int osErrorCode, const char* text) override;
 	bool initialize(Firebird::SharedMemoryBase*, bool) override;