Fix conversion warnings, and mapHeader wrong error value

+ constexpr and some noexcepts

Author: mrotteveel

src/jrd/replication/ChangeLog.cpp

@@ -66,18 +66,18 @@ using namespace Replication;
 
 namespace
 {
-	const unsigned FLUSH_WAIT_INTERVAL = 1; // milliseconds
+	inline constexpr unsigned FLUSH_WAIT_INTERVAL = 1; // milliseconds
 
-	const unsigned NO_SPACE_TIMEOUT = 10;	// seconds
-	const unsigned NO_SPACE_RETRIES = 6;		// up to one minute
+	inline constexpr unsigned NO_SPACE_TIMEOUT = 10;	// seconds
+	inline constexpr unsigned NO_SPACE_RETRIES = 6;		// up to one minute
 
-	const unsigned COPY_BLOCK_SIZE = 64 * 1024; // 64 KB
+	inline constexpr unsigned COPY_BLOCK_SIZE = 64 * 1024; // 64 KB
 
-	const char* FILENAME_PATTERN = "%s.journal-%09" UQUADFORMAT;
+	inline constexpr const char* FILENAME_PATTERN = "%s.journal-%09" UQUADFORMAT;
 
-	const char* FILENAME_WILDCARD = "$(filename)";
-	const char* PATHNAME_WILDCARD = "$(pathname)";
-	const char* ARCHPATHNAME_WILDCARD = "$(archivepathname)";
+	inline constexpr const char* FILENAME_WILDCARD = "$(filename)";
+	inline constexpr const char* PATHNAME_WILDCARD = "$(pathname)";
+	inline constexpr const char* ARCHPATHNAME_WILDCARD = "$(archivepathname)";
 
 	static THREAD_ENTRY_DECLARE archiver_thread(THREAD_ENTRY_PARAM arg)
 	{
@@ -300,7 +300,7 @@ void ChangeLog::Segment::mapHeader()
 	m_mapping = CreateFileMapping((HANDLE) _get_osfhandle(m_handle), NULL, PAGE_READWRITE,
 								  0, sizeof(SegmentHeader), NULL);
 
-	if (m_mapping == INVALID_HANDLE_VALUE)
+	if (!m_mapping)
 		raiseError("Journal file %s mapping failed (error %d)", m_filename.c_str(), ERRNO);
 
 	auto address = MapViewOfFile(m_mapping, FILE_MAP_READ | FILE_MAP_WRITE,
@@ -323,7 +323,7 @@ void ChangeLog::Segment::unmapHeader()
 #ifdef WIN_NT
 	UnmapViewOfFile(m_header);
 	CloseHandle(m_mapping);
-	m_mapping = INVALID_HANDLE_VALUE;
+	m_mapping = 0;
 #else
 	munmap(m_header, sizeof(SegmentHeader));
 #endif
@@ -683,13 +683,13 @@ bool ChangeLog::archiveExecute(Segment* segment)
 		size_t pos;
 
 		while ( (pos = archiveCommand.find(FILENAME_WILDCARD)) != string::npos)
-			archiveCommand.replace(pos, strlen(FILENAME_WILDCARD), filename);
+			archiveCommand.replace(pos, fb_strlen(FILENAME_WILDCARD), filename);
 
 		while ( (pos = archiveCommand.find(PATHNAME_WILDCARD)) != string::npos)
-			archiveCommand.replace(pos, strlen(PATHNAME_WILDCARD), pathname);
+			archiveCommand.replace(pos, fb_strlen(PATHNAME_WILDCARD), pathname);
 
 		while ( (pos = archiveCommand.find(ARCHPATHNAME_WILDCARD)) != string::npos)
-			archiveCommand.replace(pos, strlen(ARCHPATHNAME_WILDCARD), archpathname);
+			archiveCommand.replace(pos, fb_strlen(ARCHPATHNAME_WILDCARD), archpathname);
 
 		LockCheckout checkout(this);
 
@@ -944,7 +944,7 @@ ChangeLog::Segment* ChangeLog::createSegment()
 
 	const auto fd = os_utils::openCreateSharedFile(filename.c_str(), O_EXCL | O_BINARY);
 
-	SegmentHeader dummyHeader = {0};
+	const SegmentHeader dummyHeader = {0};
 	if (::write(fd, &dummyHeader, sizeof(SegmentHeader)) != sizeof(SegmentHeader))
 	{
 		::close(fd);

src/jrd/replication/ChangeLog.h

@@ -55,10 +55,10 @@ namespace Replication
 		FB_UINT64 hdr_length;
 	};
 
-	const char CHANGELOG_SIGNATURE[] = "FBCHANGELOG";
+	inline constexpr char CHANGELOG_SIGNATURE[] = "FBCHANGELOG";
 
-	const USHORT CHANGELOG_VERSION_1 = 1;
-	const USHORT CHANGELOG_CURRENT_VERSION = CHANGELOG_VERSION_1;
+	inline constexpr USHORT CHANGELOG_VERSION_1 = 1;
+	inline constexpr USHORT CHANGELOG_CURRENT_VERSION = CHANGELOG_VERSION_1;
 
 	class ChangeLog : protected Firebird::PermanentStorage, public Firebird::IpcObject
 	{
@@ -77,11 +77,11 @@ namespace Replication
 		};
 
 		// Shared memory layout format
-		static const USHORT STATE_VERSION = 1;
+		static inline constexpr USHORT STATE_VERSION = 1;
 		// Mapping size (not extendable for the time being)
-		static const ULONG STATE_MAPPING_SIZE = 64 * 1024;	// 64 KB
+		static inline constexpr ULONG STATE_MAPPING_SIZE = 64 * 1024;	// 64 KB
 		// Max number of processes accessing the shared state
-		static const ULONG PID_CAPACITY = (STATE_MAPPING_SIZE - offsetof(State, pids)) / sizeof(int); // ~16K
+		static inline constexpr ULONG PID_CAPACITY = (STATE_MAPPING_SIZE - offsetof(State, pids)) / sizeof(int); // ~16K
 
 		// RAII helper to lock the shared state
 
@@ -148,27 +148,27 @@ namespace Replication
 			void append(ULONG length, const UCHAR* data);
 			void copyTo(const Firebird::PathName& filename) const;
 
-			bool isEmpty() const
+			bool isEmpty() const noexcept
 			{
 				return (m_header->hdr_length == sizeof(SegmentHeader));
 			}
 
-			bool hasData() const
+			bool hasData() const noexcept
 			{
 				return (m_header->hdr_length > sizeof(SegmentHeader));
 			}
 
-			ULONG getLength() const
+			ULONG getLength() const noexcept
 			{
 				return m_header->hdr_length;
 			}
 
-			FB_UINT64 getSequence() const
+			FB_UINT64 getSequence() const noexcept
 			{
 				return m_header->hdr_sequence;
 			}
 
-			SegmentState getState() const
+			SegmentState getState() const noexcept
 			{
 				return m_header->hdr_state;
 			}
@@ -180,7 +180,7 @@ namespace Replication
 
 			Firebird::PathName getFileName() const;
 
-			const Firebird::PathName& getPathName() const
+			const Firebird::PathName& getPathName() const noexcept
 			{
 				return m_filename;
 			}
@@ -197,7 +197,7 @@ namespace Replication
 			SegmentHeader m_builtinHeader;		// used by free segments when there is no mapping
 
 	#ifdef WIN_NT
-			HANDLE m_mapping;
+			HANDLE m_mapping = 0;
 	#endif
 		};