constexpr + noexcept in config & init

mrotteveel · mrotteveel · commit 11271dbc24f9 · 2025-07-29T13:39:25.000+02:00
diff --git a/src/common/classes/init.cpp b/src/common/classes/init.cpp
@@ -52,7 +52,7 @@ static bool dontCleanup = false;
 namespace
 {
 #ifdef DEV_BUILD
-	void cleanError(const Firebird::Exception* e)
+	[[noreturn]] void cleanError(const Firebird::Exception* e)
 	{
 		if (e)
 		{
@@ -65,7 +65,7 @@ namespace
 		abort();
 	}
 #else
-	void cleanError(const Firebird::Exception*) { }
+	inline void cleanError(const Firebird::Exception*) noexcept { }
 #endif
 
 	// This helps initialize globals, needed before regular ctors run
@@ -175,8 +175,7 @@ namespace
 
 		initDone = 1;
 #ifdef HAVE_PTHREAD_ATFORK
-		int ret = pthread_atfork(NULL, NULL, child);
-		(void) ret;
+		std::ignore = pthread_atfork(NULL, NULL, child);
 #endif
 
 		Firebird::MemoryPool::contextPoolInit();
@@ -219,7 +218,7 @@ namespace Firebird
 		unlist();
 	}
 
-	void InstanceControl::InstanceList::unlist()
+	void InstanceControl::InstanceList::unlist() noexcept
 	{
 		if (instanceList == this)
 			instanceList = next;
@@ -319,7 +318,7 @@ namespace Firebird
 		gdsShutdown = shutdown;
 	}
 
-	void InstanceControl::cancelCleanup()
+	void InstanceControl::cancelCleanup() noexcept
 	{
 		dontCleanup = true;
 	}
@@ -328,13 +327,13 @@ namespace Firebird
 	{
 		Firebird::Mutex* mutex = NULL;
 
-		void create()
+		void create() noexcept
 		{
 			static char place[sizeof(Firebird::Mutex) + FB_ALIGNMENT];
 			mutex = new((void*) FB_ALIGN(place, FB_ALIGNMENT)) Firebird::Mutex;
 		}
 
-		void release()
+		void release() noexcept
 		{
 			mutex->~Mutex();
 		}
diff --git a/src/common/classes/init.h b/src/common/classes/init.h
@@ -37,8 +37,8 @@ namespace StaticMutex
 {
 	// Support for common mutex for various inits
 	extern Mutex* mutex;
-	void create();
-	void release();
+	void create() noexcept;
+	void release() noexcept;
 }
 
 // InstanceControl - interface for almost all global variables
@@ -77,7 +77,7 @@ class InstanceControl
 
 	private:
 		virtual void dtor() = 0;
-		void unlist();
+		void unlist() noexcept;
 
 		InstanceList* next;
 		InstanceList* prev;
@@ -118,7 +118,7 @@ class InstanceControl
 	static void registerGdsCleanup(FPTR_VOID cleanup);
 	static void registerShutdown(FPTR_VOID shutdown);
 
-	static void cancelCleanup();
+	static void cancelCleanup() noexcept;
 };
 
 
@@ -131,7 +131,7 @@ class GlobalPtr : private InstanceControl
 	T* instance;
 
 public:
-	void dtor()
+	void dtor() noexcept
 	{
 		delete instance;
 		instance = 0;
@@ -177,7 +177,7 @@ class InitMutex
 	const char* from;
 #endif
 public:
-	explicit InitMutex(const char* f)
+	explicit InitMutex(const char* f) noexcept
 		: flag(false)
 #ifdef DEV_BUILD
 			  , from(f)
@@ -224,7 +224,7 @@ class DefaultInstanceAllocator
 		return FB_NEW_POOL(*getDefaultMemoryPool()) T(*getDefaultMemoryPool());
 	}
 
-	static void destroy(T* inst)
+	static void destroy(T* inst) noexcept
 	{
 		delete inst;
 	}
@@ -275,7 +275,7 @@ class InitInstance : private DestroyControl<InitInstance<T, A, DestroyControl> >
 	A allocator;
 
 public:
-	InitInstance()
+	InitInstance() noexcept
 		: instance(NULL), flag(false)
 	{ }
 
diff --git a/src/common/config/config.cpp b/src/common/config/config.cpp
@@ -76,6 +76,9 @@ class ConfigImpl : public Firebird::PermanentStorage
 		}
 	}
 
+	ConfigImpl(const ConfigImpl&) = delete;
+	void operator=(const ConfigImpl&) = delete;
+
 	/***
 	It was a kind of getting ready for changing config remotely...
 
@@ -85,12 +88,12 @@ class ConfigImpl : public Firebird::PermanentStorage
 	}
 	***/
 
-	Firebird::RefPtr<const Firebird::Config>& getDefaultConfig()
+	Firebird::RefPtr<const Firebird::Config>& getDefaultConfig() noexcept
 	{
 		return defaultConfig;
 	}
 
-	bool missFirebirdConf() const
+	bool missFirebirdConf() const noexcept
 	{
 		return missConf;
 	}
@@ -105,9 +108,6 @@ class ConfigImpl : public Firebird::PermanentStorage
 private:
 	Firebird::RefPtr<const Firebird::Config> defaultConfig;
 
-    ConfigImpl(const ConfigImpl&);
-    void operator=(const ConfigImpl&);
-
 	bool missConf;
 };
 
@@ -150,7 +150,6 @@ Config::Config(const ConfigFile& file)
 	serverMode(-1),
 	defaultConfig(true)
 {
-	memset(sourceIdx, 0, sizeof(sourceIdx));
 	valuesSource.add(NULL);
 
 	setupDefaultConfig();
@@ -185,7 +184,6 @@ Config::Config(const ConfigFile& file, const char* srcName, const Config& base,
 	serverMode(-1),
 	defaultConfig(false)
 {
-	memset(sourceIdx, 0, sizeof(sourceIdx));
 	valuesSource.add(NULL);
 
 	for (FB_SIZE_T i = 1; i < base.valuesSource.getCount(); i++)
@@ -485,7 +483,7 @@ void Config::setRootDirectoryFromCommandLine(const PathName& newRoot)
 		PathName(*getDefaultMemoryPool(), newRoot);
 }
 
-const PathName* Config::getCommandLineRootDirectory()
+const PathName* Config::getCommandLineRootDirectory() noexcept
 {
 	return rootFromCommandLine;
 }
@@ -563,7 +561,7 @@ bool Config::valueAsString(ConfigValue val, ConfigType type, string& str)
 	return true;
 }
 
-const char* Config::getKeyName(unsigned int key)
+const char* Config::getKeyName(unsigned int key) noexcept
 {
 	if (key >= MAX_CONFIG_KEY)
 		return nullptr;
@@ -732,13 +730,13 @@ int Config::getWireCrypt(WireCryptMode wcMode) const
 // array format: major, minor, release, build
 static constexpr unsigned short fileVerNumber[4] = {FILE_VER_NUMBER};
 
-static inline unsigned int getPartialVersion()
+static inline constexpr unsigned int getPartialVersion() noexcept
 {
 			// major				   // minor
 	return (fileVerNumber[0] << 24) | (fileVerNumber[1] << 16);
 }
 
-static inline unsigned int getFullVersion()
+static inline constexpr unsigned int getFullVersion() noexcept
 {
 								 // build_no
 	return getPartialVersion() | fileVerNumber[3];
@@ -747,15 +745,15 @@ static inline unsigned int getFullVersion()
 static constexpr unsigned int PARTIAL_MASK = 0xFFFF0000;
 static constexpr unsigned int KEY_MASK = 0xFFFF;
 
-static inline void checkKey(unsigned int& key)
+static inline void checkKey(unsigned int& key) noexcept
 {
 	if ((key & PARTIAL_MASK) != getPartialVersion())
 		key = KEY_MASK;
 	else
 		key &= KEY_MASK;
 }
 
-unsigned int FirebirdConf::getVersion(CheckStatusWrapper* status)
+unsigned int FirebirdConf::getVersion(CheckStatusWrapper* status) noexcept
 {
 	return getFullVersion();
 }
diff --git a/src/common/config/config.h b/src/common/config/config.h
@@ -88,14 +88,14 @@ inline constexpr int MODE_SUPER = 0;
 inline constexpr int MODE_SUPERCLASSIC = 1;
 inline constexpr int MODE_CLASSIC = 2;
 
-constexpr const char* CONFIG_FILE = "firebird.conf";
+inline constexpr const char* CONFIG_FILE = "firebird.conf";
 
 struct ConfigValue
 {
-	ConfigValue() : intVal(0) {};
-	constexpr ConfigValue(const char* val) : strVal(val) {};
-	constexpr ConfigValue(bool val) : boolVal(val) {};
-	constexpr ConfigValue(int val) : intVal(val) {};
+	ConfigValue() noexcept : intVal(0) {};
+	constexpr ConfigValue(const char* val) noexcept : strVal(val) {};
+	constexpr ConfigValue(bool val) noexcept : boolVal(val) {};
+	constexpr ConfigValue(int val) noexcept : intVal(val) {};
 
 	union
 	{
@@ -105,12 +105,12 @@ struct ConfigValue
 	};
 
 	// simple bitwise comparison
-	bool operator== (const ConfigValue& other) const
+	bool operator== (const ConfigValue& other) const noexcept
 	{
 		return this->intVal == other.intVal;
 	}
 
-	bool operator!= (const ConfigValue& other) const
+	bool operator!= (const ConfigValue& other) const noexcept
 	{
 		return !(*this == other);
 	}
@@ -356,10 +356,10 @@ class Config : public RefCounted, public GlobalStorage
 	HalfStaticArray<const char*, 4> valuesSource;
 
 	// Index of value source, zero if not set
-	UCHAR sourceIdx[MAX_CONFIG_KEY];
+	UCHAR sourceIdx[MAX_CONFIG_KEY]{};
 
 	// test if given key value was set in config
-	bool testKey(unsigned int key) const
+	bool testKey(unsigned int key) const noexcept
 	{
 		return sourceIdx[key] != 0;
 	}
@@ -389,7 +389,7 @@ class Config : public RefCounted, public GlobalStorage
 	// cases firebird.conf may be also used to specify root.
 
 	static void setRootDirectoryFromCommandLine(const PathName& newRoot);
-	static const PathName* getCommandLineRootDirectory();
+	static const PathName* getCommandLineRootDirectory() noexcept;
 
 	// Master config - needed to provide per-database config
 	static const RefPtr<const Config>& getDefaultConfig();
@@ -405,20 +405,20 @@ class Config : public RefCounted, public GlobalStorage
 	bool getBoolean(unsigned int key) const;
 
 	// Number of known keys
-	static unsigned int getKeyCount()
+	static inline constexpr unsigned int getKeyCount() noexcept
 	{
 		return MAX_CONFIG_KEY;
 	}
 
-	static const char* getKeyName(unsigned int key);
+	static const char* getKeyName(unsigned int key) noexcept;
 
 	// false if value is null or key is not exists
 	bool getValue(unsigned int key, string& str) const;
 	static bool getDefaultValue(unsigned int key, string& str);
 	// return true if value is set at some level
-	bool getIsSet(unsigned int key) const { return testKey(key); }
+	bool getIsSet(unsigned int key) const noexcept { return testKey(key); }
 
-	const char* getValueSource(unsigned int key) const
+	const char* getValueSource(unsigned int key) const noexcept
 	{
 		return valuesSource[sourceIdx[key]];
 	}
@@ -635,7 +635,7 @@ class FirebirdConf final :
 	SINT64 asInteger(unsigned int key);
 	const char* asString(unsigned int key);
 	FB_BOOLEAN asBoolean(unsigned int key);
-	unsigned int getVersion(CheckStatusWrapper* status);
+	unsigned int getVersion(CheckStatusWrapper* status) noexcept;
 
 private:
 	RefPtr<const Config> config;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static bool dontCleanup = false;`
`52`	`52`	`namespace`
`53`	`53`	`{`
`54`	`54`	`#ifdef DEV_BUILD`
`55`		`- void cleanError(const Firebird::Exception* e)`
	`55`	`+ [[noreturn]] void cleanError(const Firebird::Exception* e)`
`56`	`56`	`{`
`57`	`57`	`if (e)`
`58`	`58`	`{`
`@@ -65,7 +65,7 @@ namespace`
`65`	`65`	`abort();`
`66`	`66`	`}`
`67`	`67`	`#else`
`68`		`- void cleanError(const Firebird::Exception*) { }`
	`68`	`+ inline void cleanError(const Firebird::Exception*) noexcept { }`
`69`	`69`	`#endif`
`70`	`70`
`71`	`71`	`// This helps initialize globals, needed before regular ctors run`
`@@ -175,8 +175,7 @@ namespace`
`175`	`175`
`176`	`176`	`initDone = 1;`
`177`	`177`	`#ifdef HAVE_PTHREAD_ATFORK`
`178`		`- int ret = pthread_atfork(NULL, NULL, child);`
`179`		`- (void) ret;`
	`178`	`+ std::ignore = pthread_atfork(NULL, NULL, child);`
`180`	`179`	`#endif`
`181`	`180`
`182`	`181`	`Firebird::MemoryPool::contextPoolInit();`
`@@ -219,7 +218,7 @@ namespace Firebird`
`219`	`218`	`unlist();`
`220`	`219`	`}`
`221`	`220`
`222`		`- void InstanceControl::InstanceList::unlist()`
	`221`	`+ void InstanceControl::InstanceList::unlist() noexcept`
`223`	`222`	`{`
`224`	`223`	`if (instanceList == this)`
`225`	`224`	`instanceList = next;`
`@@ -319,7 +318,7 @@ namespace Firebird`
`319`	`318`	`gdsShutdown = shutdown;`
`320`	`319`	`}`
`321`	`320`
`322`		`- void InstanceControl::cancelCleanup()`
	`321`	`+ void InstanceControl::cancelCleanup() noexcept`
`323`	`322`	`{`
`324`	`323`	`dontCleanup = true;`
`325`	`324`	`}`
`@@ -328,13 +327,13 @@ namespace Firebird`
`328`	`327`	`{`
`329`	`328`	`Firebird::Mutex* mutex = NULL;`
`330`	`329`
`331`		`- void create()`
	`330`	`+ void create() noexcept`
`332`	`331`	`{`
`333`	`332`	`static char place[sizeof(Firebird::Mutex) + FB_ALIGNMENT];`
`334`	`333`	`mutex = new((void*) FB_ALIGN(place, FB_ALIGNMENT)) Firebird::Mutex;`
`335`	`334`	`}`
`336`	`335`
`337`		`- void release()`
	`336`	`+ void release() noexcept`
`338`	`337`	`{`
`339`	`338`	`mutex->~Mutex();`
`340`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ class ConfigImpl : public Firebird::PermanentStorage`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ ConfigImpl(const ConfigImpl&) = delete;`
	`80`	`+ void operator=(const ConfigImpl&) = delete;`
	`81`	`+`
`79`	`82`	`/***`
`80`	`83`	`It was a kind of getting ready for changing config remotely...`
`81`	`84`
`@@ -85,12 +88,12 @@ class ConfigImpl : public Firebird::PermanentStorage`
`85`	`88`	`}`
`86`	`89`	`***/`
`87`	`90`
`88`		`- Firebird::RefPtr<const Firebird::Config>& getDefaultConfig()`
	`91`	`+ Firebird::RefPtr<const Firebird::Config>& getDefaultConfig() noexcept`
`89`	`92`	`{`
`90`	`93`	`return defaultConfig;`
`91`	`94`	`}`
`92`	`95`
`93`		`- bool missFirebirdConf() const`
	`96`	`+ bool missFirebirdConf() const noexcept`
`94`	`97`	`{`
`95`	`98`	`return missConf;`
`96`	`99`	`}`
`@@ -105,9 +108,6 @@ class ConfigImpl : public Firebird::PermanentStorage`
`105`	`108`	`private:`
`106`	`109`	`Firebird::RefPtr<const Firebird::Config> defaultConfig;`
`107`	`110`
`108`		`- ConfigImpl(const ConfigImpl&);`
`109`		`- void operator=(const ConfigImpl&);`
`110`		`-`
`111`	`111`	`bool missConf;`
`112`	`112`	`};`
`113`	`113`
`@@ -150,7 +150,6 @@ Config::Config(const ConfigFile& file)`
`150`	`150`	`serverMode(-1),`
`151`	`151`	`defaultConfig(true)`
`152`	`152`	`{`
`153`		`- memset(sourceIdx, 0, sizeof(sourceIdx));`
`154`	`153`	`valuesSource.add(NULL);`
`155`	`154`
`156`	`155`	`setupDefaultConfig();`
`@@ -185,7 +184,6 @@ Config::Config(const ConfigFile& file, const char* srcName, const Config& base,`
`185`	`184`	`serverMode(-1),`
`186`	`185`	`defaultConfig(false)`
`187`	`186`	`{`
`188`		`- memset(sourceIdx, 0, sizeof(sourceIdx));`
`189`	`187`	`valuesSource.add(NULL);`
`190`	`188`
`191`	`189`	`for (FB_SIZE_T i = 1; i < base.valuesSource.getCount(); i++)`
`@@ -485,7 +483,7 @@ void Config::setRootDirectoryFromCommandLine(const PathName& newRoot)`
`485`	`483`	`PathName(*getDefaultMemoryPool(), newRoot);`
`486`	`484`	`}`
`487`	`485`
`488`		`-const PathName* Config::getCommandLineRootDirectory()`
	`486`	`+const PathName* Config::getCommandLineRootDirectory() noexcept`
`489`	`487`	`{`
`490`	`488`	`return rootFromCommandLine;`
`491`	`489`	`}`
`@@ -563,7 +561,7 @@ bool Config::valueAsString(ConfigValue val, ConfigType type, string& str)`
`563`	`561`	`return true;`
`564`	`562`	`}`
`565`	`563`
`566`		`-const char* Config::getKeyName(unsigned int key)`
	`564`	`+const char* Config::getKeyName(unsigned int key) noexcept`
`567`	`565`	`{`
`568`	`566`	`if (key >= MAX_CONFIG_KEY)`
`569`	`567`	`return nullptr;`
`@@ -732,13 +730,13 @@ int Config::getWireCrypt(WireCryptMode wcMode) const`
`732`	`730`	`// array format: major, minor, release, build`
`733`	`731`	`static constexpr unsigned short fileVerNumber[4] = {FILE_VER_NUMBER};`
`734`	`732`
`735`		`-static inline unsigned int getPartialVersion()`
	`733`	`+static inline constexpr unsigned int getPartialVersion() noexcept`
`736`	`734`	`{`
`737`	`735`	`// major // minor`
`738`	`736`	`return (fileVerNumber[0] << 24) \| (fileVerNumber[1] << 16);`
`739`	`737`	`}`
`740`	`738`
`741`		`-static inline unsigned int getFullVersion()`
	`739`	`+static inline constexpr unsigned int getFullVersion() noexcept`
`742`	`740`	`{`
`743`	`741`	`// build_no`
`744`	`742`	`return getPartialVersion() \| fileVerNumber[3];`
`@@ -747,15 +745,15 @@ static inline unsigned int getFullVersion()`
`747`	`745`	`static constexpr unsigned int PARTIAL_MASK = 0xFFFF0000;`
`748`	`746`	`static constexpr unsigned int KEY_MASK = 0xFFFF;`
`749`	`747`
`750`		`-static inline void checkKey(unsigned int& key)`
	`748`	`+static inline void checkKey(unsigned int& key) noexcept`
`751`	`749`	`{`
`752`	`750`	`if ((key & PARTIAL_MASK) != getPartialVersion())`
`753`	`751`	`key = KEY_MASK;`
`754`	`752`	`else`
`755`	`753`	`key &= KEY_MASK;`
`756`	`754`	`}`
`757`	`755`
`758`		`-unsigned int FirebirdConf::getVersion(CheckStatusWrapper* status)`
	`756`	`+unsigned int FirebirdConf::getVersion(CheckStatusWrapper* status) noexcept`
`759`	`757`	`{`
`760`	`758`	`return getFullVersion();`
`761`	`759`	`}`