Use lambda functions for INITIALIZE_ONCE

fixes #12562

CMakeLists.txt

@@ -217,9 +217,8 @@ include(CheckIncludeFileCXX)
 
 check_symbol_exists(__COUNTER__ "" HAVE_COUNTER_MACRO)
 
-if(NOT HAVE_COUNTER_MACRO AND ICINGA2_UNITY_BUILD)
+if(NOT HAVE_COUNTER_MACRO)
-  message(STATUS "Your C/C++ compiler does not support the __COUNTER__ macro. Disabling unity build.")
+message(FATAL_ERROR "Your C/C++ compiler does not support the __COUNTER__ macro.")
-  set(ICINGA2_UNITY_BUILD FALSE)
 endif()
 
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DI2_DEBUG")

config.h.cmake

@@ -1,7 +1,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine HAVE_COUNTER_MACRO
 #cmakedefine HAVE_BACKTRACE_SYMBOLS
 #cmakedefine HAVE_PIPE2
 #cmakedefine HAVE_VFORK

lib/base/console.cpp

@@ -23,10 +23,19 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&Console::DetectType);
-
 static ConsoleType l_ConsoleType = Console_Dumb;
 
+INITIALIZE_ONCE([]() {
+	l_ConsoleType = Console_Dumb;
+
+#ifndef _WIN32
+	if (isatty(1))
+		l_ConsoleType = Console_VT100;
+#else /* _WIN32 */
+	l_ConsoleType = Console_Windows;
+#endif /* _WIN32 */
+});
+
 ConsoleColorTag::ConsoleColorTag(int color, ConsoleType consoleType)
 	: m_Color(color), m_ConsoleType(consoleType)
 { }
@@ -46,18 +55,6 @@ std::ostream& icinga::operator<<(std::ostream& fp, const ConsoleColorTag& cct)
 	return fp;
 }
 
-void Console::DetectType(void)
-{
-	l_ConsoleType = Console_Dumb;
-
-#ifndef _WIN32
-	if (isatty(1))
-		l_ConsoleType = Console_VT100;
-#else /* _WIN32 */
-	l_ConsoleType = Console_Windows;
-#endif /* _WIN32 */
-}
-
 void Console::SetType(std::ostream& fp, ConsoleType type)
 {
 	if (&fp == &std::cout || &fp == &std::cerr)

lib/base/function.hpp

@@ -67,66 +67,48 @@ private:
 };
 
 #define REGISTER_SCRIPTFUNCTION_NS(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), false); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 #define REGISTER_SCRIPTFUNCTION_NS_PREFIX(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), false); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
 		Function::Ptr dsf = new icinga::Function("Deprecated#__" #name " (deprecated)", WrapFunction(callback), false, true); \
 		ScriptGlobal::Set("Deprecated.__" #name, dsf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 #define REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), false); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
 		Function::Ptr dsf = new icinga::Function("Deprecated#" #name " (deprecated)", WrapFunction(callback), false, true); \
 		ScriptGlobal::Set("Deprecated." #name, dsf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 #define REGISTER_SAFE_SCRIPTFUNCTION_NS(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), true); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 #define REGISTER_SAFE_SCRIPTFUNCTION_NS_PREFIX(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), true); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
 		Function::Ptr dsf = new icinga::Function("Deprecated#__" #name " (deprecated)", WrapFunction(callback), true, true); \
 		ScriptGlobal::Set("Deprecated.__" #name, dsf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 #define REGISTER_SAFE_SCRIPTFUNCTION_NS_DEPRECATED(ns, name, callback) \
-	namespace { namespace UNIQUE_NAME(sf) { namespace sf ## ns ## name { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterFunction(void) { \
 		Function::Ptr sf = new icinga::Function(#ns "#" #name, WrapFunction(callback), true); \
 		ScriptGlobal::Set(#ns "." #name, sf); \
 		Function::Ptr dsf = new icinga::Function("Deprecated#" #name " (deprecated)", WrapFunction(callback), true, true); \
 		ScriptGlobal::Set("Deprecated." #name, dsf); \
-		} \
+	}, 10)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterFunction, 10); \
-	} } }
 
 }
 

lib/base/json-script.cpp

@@ -31,8 +31,7 @@ static String JsonEncodeShim(const Value& value)
 	return JsonEncode(value);
 }
 
-static void InitializeJsonObj(void)
+INITIALIZE_ONCE([]() {
-{
 	Dictionary::Ptr jsonObj = new Dictionary();
 
 	/* Methods */
@@ -40,7 +39,4 @@ static void InitializeJsonObj(void)
 	jsonObj->Set("decode", new Function("Json#decode", WrapFunction(JsonDecode), true));
 
 	ScriptGlobal::Set("Json", jsonObj);
-}
+});
-
-INITIALIZE_ONCE(InitializeJsonObj);
-

lib/base/logger.cpp

@@ -31,7 +31,6 @@
 using namespace icinga;
 
 REGISTER_TYPE(Logger);
-INITIALIZE_ONCE(&Logger::StaticInitialize);
 
 std::set<Logger::Ptr> Logger::m_Loggers;
 boost::mutex Logger::m_Mutex;
@@ -39,14 +38,13 @@ bool Logger::m_ConsoleLogEnabled = true;
 bool Logger::m_TimestampEnabled = true;
 LogSeverity Logger::m_ConsoleLogSeverity = LogInformation;
 
-void Logger::StaticInitialize(void)
+INITIALIZE_ONCE([]() {
-{
 	ScriptGlobal::Set("LogDebug", LogDebug);
 	ScriptGlobal::Set("LogNotice", LogNotice);
 	ScriptGlobal::Set("LogInformation", LogInformation);
 	ScriptGlobal::Set("LogWarning", LogWarning);
 	ScriptGlobal::Set("LogCritical", LogCritical);
-}
+});
 
 /**
  * Constructor for the Logger class.

lib/base/logger.hpp

@@ -90,8 +90,6 @@ public:
 	static void SetConsoleLogSeverity(LogSeverity logSeverity);
 	static LogSeverity GetConsoleLogSeverity(void);
 
-	static void StaticInitialize(void);
-
 	virtual void ValidateSeverity(const String& value, const ValidationUtils& utils) override;
 
 protected:

lib/base/math-script.cpp

@@ -158,8 +158,7 @@ static double MathSign(double x)
 		return 0;
 }
 
-static void InitializeMathObj(void)
+INITIALIZE_ONCE([]() {
-{
 	Dictionary::Ptr mathObj = new Dictionary();
 
 	/* Constants */
@@ -196,7 +195,4 @@ static void InitializeMathObj(void)
 	mathObj->Set("sign", new Function("Math#sign", WrapFunction(MathSign), true));
 
 	ScriptGlobal::Set("Math", mathObj);
-}
+});
-
-INITIALIZE_ONCE(InitializeMathObj);
-

lib/base/object.cpp

@@ -237,14 +237,11 @@ static void TypeInfoTimerHandler(void)
 	}
 }
 
-static void StartTypeInfoTimer(void)
+INITIALIZE_ONCE([]() {
-{
 	l_ObjectCountTimer = new Timer();
 	l_ObjectCountTimer->SetInterval(10);
 	l_ObjectCountTimer->OnTimerExpired.connect(boost::bind(TypeInfoTimerHandler));
 	l_ObjectCountTimer->Start();
-}
+});
-
-INITIALIZE_ONCE(StartTypeInfoTimer);
 #endif /* I2_LEAK_DEBUG */
 

lib/base/objecttype.cpp

@@ -22,15 +22,12 @@
 
 using namespace icinga;
 
-static void RegisterObjectType(void)
+INITIALIZE_ONCE_WITH_PRIORITY([]() {
-{
 	Type::Ptr type = new ObjectType();
 	type->SetPrototype(Object::GetPrototype());
 	Type::Register(type);
 	Object::TypeInstance = type;
-}
+}, 20);
-
-INITIALIZE_ONCE_WITH_PRIORITY(&RegisterObjectType, 20);
 
 ObjectType::ObjectType(void)
 { }

lib/base/primitivetype.hpp

@@ -49,27 +49,19 @@ private:
 };
 
 #define REGISTER_BUILTIN_TYPE(type, prototype)					\
-	namespace { namespace UNIQUE_NAME(prt) { namespace prt ## type {	\
+	INITIALIZE_ONCE_WITH_PRIORITY([]() {					\
-		void RegisterBuiltinType(void)					\
-		{								\
 		icinga::Type::Ptr t = new PrimitiveType(#type, "None"); 	\
 		t->SetPrototype(prototype);					\
 		icinga::Type::Register(t);					\
-		}								\
+	}, 15)
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterBuiltinType, 15);		\
-	} } }
 
 #define REGISTER_PRIMITIVE_TYPE_FACTORY(type, base, prototype, factory)		\
-	namespace { namespace UNIQUE_NAME(prt) { namespace prt ## type {	\
+	INITIALIZE_ONCE_WITH_PRIORITY([]() {					\
-		void RegisterPrimitiveType(void)				\
-		{								\
 		icinga::Type::Ptr t = new PrimitiveType(#type, #base, factory);	\
 		t->SetPrototype(prototype);					\
 		icinga::Type::Register(t);					\
 		type::TypeInstance = t;						\
-		}								\
+	}, 15);									\
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterPrimitiveType, 15);	\
-	} } }									\
 	DEFINE_TYPE_INSTANCE(type)
 
 #define REGISTER_PRIMITIVE_TYPE(type, base, prototype)				\

lib/base/process.cpp

@@ -56,8 +56,6 @@ static std::map<Process::ConsoleHandle, Process::ProcessHandle> l_FDs[IOTHREADS]
 #endif /* _WIN32 */
 static boost::once_flag l_OnceFlag = BOOST_ONCE_INIT;
 
-INITIALIZE_ONCE(&Process::StaticInitialize);
-
 Process::Process(const Process::Arguments& arguments, const Dictionary::Ptr& extraEnvironment)
 	: m_Arguments(arguments), m_ExtraEnvironment(extraEnvironment), m_Timeout(600)
 #ifdef _WIN32
@@ -76,8 +74,7 @@ Process::~Process(void)
 #endif /* _WIN32 */
 }
 
-void Process::StaticInitialize(void)
+INITIALIZE_ONCE([]() {
-{
 	for (int tid = 0; tid < IOTHREADS; tid++) {
 #ifdef _WIN32
 		l_Events[tid] = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -104,7 +101,7 @@ void Process::StaticInitialize(void)
 #	endif /* HAVE_PIPE2 */
 #endif /* _WIN32 */
 	}
-}
+});
 
 void Process::ThreadInitialize(void)
 {

lib/base/process.hpp

@@ -79,7 +79,6 @@ public:
 
 	static Arguments PrepareCommand(const Value& command);
 
-	static void StaticInitialize(void);
 	static void ThreadInitialize(void);
 
 	static String PrettyPrintArguments(const Arguments& arguments);

lib/base/scriptframe.cpp

@@ -26,22 +26,19 @@ using namespace icinga;
 boost::thread_specific_ptr<std::stack<ScriptFrame *> > ScriptFrame::m_ScriptFrames;
 Array::Ptr ScriptFrame::m_Imports;
 
-INITIALIZE_ONCE_WITH_PRIORITY(&ScriptFrame::StaticInitialize, 50);
+INITIALIZE_ONCE_WITH_PRIORITY([]() {
-
-void ScriptFrame::StaticInitialize(void)
-{
 	Dictionary::Ptr systemNS = new Dictionary();
 	ScriptGlobal::Set("System", systemNS);
-	AddImport(systemNS);
+	ScriptFrame::AddImport(systemNS);
 
 	Dictionary::Ptr typesNS = new Dictionary();
 	ScriptGlobal::Set("Types", typesNS);
-	AddImport(typesNS);
+	ScriptFrame::AddImport(typesNS);
 
 	Dictionary::Ptr deprecatedNS = new Dictionary();
 	ScriptGlobal::Set("Deprecated", deprecatedNS);
-	AddImport(deprecatedNS);
+	ScriptFrame::AddImport(deprecatedNS);
-}
+}, 50);
 
 ScriptFrame::ScriptFrame(void)
 	: Locals(new Dictionary()), Self(ScriptGlobal::GetGlobals()), Sandboxed(false), Depth(0)

lib/base/scriptframe.hpp

@@ -40,8 +40,6 @@ struct I2_BASE_API ScriptFrame
 	ScriptFrame(const Value& self);
 	~ScriptFrame(void);
 
-	static void StaticInitialize(void);
-
 	void IncreaseStackDepth(void);
 	void DecreaseStackDepth(void);
 

lib/base/stacktrace.cpp

@@ -27,8 +27,6 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&StackTrace::StaticInitialize);
-
 #ifdef _MSC_VER
 #	pragma optimize("", off)
 #endif /* _MSC_VER */
@@ -85,13 +83,12 @@ StackTrace::StackTrace(PEXCEPTION_POINTERS exi)
 }
 #endif /* _WIN32 */
 
-void StackTrace::StaticInitialize(void)
-{
 #ifdef _WIN32
+INITIALIZE_ONCE([]() {
 	(void) SymSetOptions(SYMOPT_UNDNAME | SYMOPT_LOAD_LINES);
 	(void) SymInitialize(GetCurrentProcess(), NULL, TRUE);
+});
 #endif /* _WIN32 */
-}
 
 /**
  * Prints a stacktrace to the specified stream.

lib/base/statsfunction.hpp

@@ -62,14 +62,10 @@ public:
 };
 
 #define REGISTER_STATSFUNCTION(name, callback) \
-	namespace { namespace UNIQUE_NAME(stf) { namespace stf ## name { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterStatsFunction(void) \
-		{ \
 		StatsFunction::Ptr stf = new StatsFunction(callback); \
 		StatsFunctionRegistry::GetInstance()->Register(#name, stf); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterStatsFunction); \
-	} } }
 
 }
 

lib/base/type.cpp

@@ -25,15 +25,12 @@ using namespace icinga;
 
 Type::Ptr Type::TypeInstance;
 
-static void RegisterTypeType(void)
+INITIALIZE_ONCE_WITH_PRIORITY([]() {
-{
 	Type::Ptr type = new TypeType();
 	type->SetPrototype(TypeType::GetPrototype());
 	Type::TypeInstance = type;
 	Type::Register(type);
-}
+}, 20);
-
-INITIALIZE_ONCE_WITH_PRIORITY(RegisterTypeType, 20);
 
 String Type::ToString(void) const
 {

lib/base/type.hpp

@@ -138,30 +138,20 @@ class I2_BASE_API TypeImpl
 };
 
 #define REGISTER_TYPE(type) \
-	namespace { namespace UNIQUE_NAME(rt) { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterType ## type(void) \
-		{ \
 		icinga::Type::Ptr t = new TypeImpl<type>(); \
 		type::TypeInstance = t; \
 		icinga::Type::Register(t); \
-		} \
+	}, 10); \
-		\
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterType ## type, 10); \
-	} } \
 	DEFINE_TYPE_INSTANCE(type)
 
 #define REGISTER_TYPE_WITH_PROTOTYPE(type, prototype) \
-	namespace { namespace UNIQUE_NAME(rt) { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterType ## type(void) \
-		{ \
 		icinga::Type::Ptr t = new TypeImpl<type>(); \
 		t->SetPrototype(prototype); \
 		type::TypeInstance = t; \
 		icinga::Type::Register(t); \
-		} \
+	}, 10); \
-		\
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterType ## type, 10); \
-	} } \
 	DEFINE_TYPE_INSTANCE(type)
 
 #define DEFINE_TYPE_INSTANCE(type) \

lib/base/visibility.hpp

@@ -32,10 +32,6 @@
 #define TOKENPASTE(x, y) x ## y
 #define TOKENPASTE2(x, y) TOKENPASTE(x, y)
 
-#ifdef HAVE_COUNTER_MACRO
 #define UNIQUE_NAME(prefix) TOKENPASTE2(prefix, __COUNTER__)
-#else /* HAVE_COUNTER_MACRO */
-#	define UNIQUE_NAME(prefix) prefix
-#endif /* HAVE_COUNTER_MACRO */
 
 #endif /* VISIBILITY_H */

lib/cli/clicommand.hpp

@@ -88,15 +88,11 @@ private:
 };
 
 #define REGISTER_CLICOMMAND(name, klass) \
-	namespace { namespace UNIQUE_NAME(cli) { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterCommand(void) \
-		{ \
 		std::vector<String> vname; \
 		boost::algorithm::split(vname, name, boost::is_any_of("/")); \
 		CLICommand::Register(vname, new klass()); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterCommand); \
-	} }
 
 }
 

lib/cli/nodeblackandwhitelistcommand.hpp

@@ -57,9 +57,7 @@ private:
 };
 
 #define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \
-	namespace { namespace UNIQUE_NAME(blackandwhitelist) { namespace blackandwhitelist ## type { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterCommand(void) \
-		{ \
 		String ltype = #type; \
 		boost::algorithm::to_lower(ltype); \
 \
@@ -74,9 +72,7 @@ private:
 \
 		name[2] = "list"; \
 		CLICommand::Register(name, new BlackAndWhitelistCommand(#type, BlackAndWhitelistCommandList)); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterCommand); \
-	} } }
 
 }
 

lib/cli/repositoryobjectcommand.hpp

@@ -61,9 +61,7 @@ private:
 };
 
 #define REGISTER_REPOSITORY_CLICOMMAND(type) \
-	namespace { namespace UNIQUE_NAME(repositoryobject) { namespace repositoryobject ## type { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterCommand(void) \
-		{ \
 		String ltype = #type; \
 		boost::algorithm::to_lower(ltype); \
 \
@@ -78,9 +76,7 @@ private:
 \
 		name[2] = "list"; \
 		CLICommand::Register(name, new RepositoryObjectCommand(#type, RepositoryCommandList)); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterCommand); \
-	} } }
 
 }
 

lib/config/configfragment.hpp

@@ -27,9 +27,7 @@
 #include "base/application.hpp"
 
 #define REGISTER_CONFIG_FRAGMENT(id, name, fragment) \
-	namespace { \
+	INITIALIZE_ONCE_WITH_PRIORITY([]() { \
-		void RegisterConfigFragment(void) \
-		{ \
 		icinga::Expression *expression = icinga::ConfigCompiler::CompileText(name, fragment); \
 		VERIFY(expression); \
 		try { \
@@ -40,9 +38,6 @@
 			icinga::Application::Exit(1); \
 		} \
 		delete expression; \
-		} \
+	}, 5)
-		\
-		INITIALIZE_ONCE_WITH_PRIORITY(RegisterConfigFragment, 5); \
-	}
 
 #endif /* CONFIGFRAGMENT_H */

lib/db_ido/dbtype.hpp

@@ -97,14 +97,10 @@ intrusive_ptr<T> DbObjectFactory(const DbType::Ptr& type, const String& name1, c
 }
 
 #define REGISTER_DBTYPE(name, table, tid, idcolumn, type) \
-	namespace { namespace UNIQUE_NAME(ido) { namespace ido ## name { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterDbType(void) \
-		{ \
 		DbType::Ptr dbtype = new DbType(#name, table, tid, idcolumn, DbObjectFactory<type>); \
 		DbType::RegisterType(dbtype); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterDbType); \
-	} } }
 
 }
 

lib/db_ido/endpointdbobject.cpp

@@ -30,7 +30,6 @@
 
 using namespace icinga;
 
-
 REGISTER_DBTYPE(Endpoint, "endpoint", DbObjectTypeEndpoint, "endpoint_object_id", EndpointDbObject);
 
 INITIALIZE_ONCE(&EndpointDbObject::StaticInitialize);

lib/hello/helloapplication.cpp

@@ -27,12 +27,9 @@ using namespace icinga;
 
 REGISTER_TYPE(HelloApplication);
 
-INITIALIZE_ONCE(&HelloApplication::StaticInitialize);
+INITIALIZE_ONCE([]() {
-
-void HelloApplication::StaticInitialize(void)
-{
 	ScriptGlobal::Set("ApplicationType", "HelloApplication");
-}
+});
 
 /**
  * The entry point for the hello application.

lib/hello/helloapplication.hpp

@@ -36,8 +36,6 @@ public:
 	DECLARE_OBJECT(HelloApplication);
 	DECLARE_OBJECTNAME(HelloApplication);
 
-	static void StaticInitialize(void);
-
 	virtual int Main(void) override;
 };
 

lib/icinga/dependency-apply.cpp

@@ -30,15 +30,12 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&Dependency::RegisterApplyRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void Dependency::RegisterApplyRuleHandler(void)
-{
 	std::vector<String> targets;
 	targets.push_back("Host");
 	targets.push_back("Service");
 	ApplyRule::RegisterType("Dependency", targets);
-}
+});
 
 bool Dependency::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule)
 {

lib/icinga/dependency.hpp

@@ -49,8 +49,6 @@ public:
 
 	bool IsAvailable(DependencyType dt) const;
 
-	static void RegisterApplyRuleHandler(void);
-
 	virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override;
 
 	static void EvaluateApplyRules(const intrusive_ptr<Host>& host);

lib/icinga/hostgroup.cpp

@@ -31,12 +31,9 @@ using namespace icinga;
 
 REGISTER_TYPE(HostGroup);
 
-INITIALIZE_ONCE(&HostGroup::RegisterObjectRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void HostGroup::RegisterObjectRuleHandler(void)
-{
 	ObjectRule::RegisterType("HostGroup");
-}
+});
 
 bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr& group)
 {

lib/icinga/hostgroup.hpp

@@ -46,8 +46,6 @@ public:
 
 	bool ResolveGroupMembership(const Host::Ptr& host, bool add = true, int rstack = 0);
 
-	static void RegisterObjectRuleHandler(void);
-
 	static void EvaluateObjectRules(const Host::Ptr& host);
 
 private:

lib/icinga/notification-apply.cpp

@@ -30,15 +30,12 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&Notification::RegisterApplyRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void Notification::RegisterApplyRuleHandler(void)
-{
 	std::vector<String> targets;
 	targets.push_back("Host");
 	targets.push_back("Service");
 	ApplyRule::RegisterType("Notification", targets);
-}
+});
 
 bool Notification::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule)
 {

lib/icinga/notification.hpp

@@ -104,8 +104,6 @@ public:
 
 	static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> OnNextNotificationChanged;
 
-	static void RegisterApplyRuleHandler(void);
-
 	virtual void Validate(int types, const ValidationUtils& utils) override;
 
 	virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override;

lib/icinga/scheduleddowntime-apply.cpp

@@ -29,15 +29,12 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&ScheduledDowntime::RegisterApplyRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void ScheduledDowntime::RegisterApplyRuleHandler(void)
-{
 	std::vector<String> targets;
 	targets.push_back("Host");
 	targets.push_back("Service");
 	ApplyRule::RegisterType("ScheduledDowntime", targets);
-}
+});
 
 bool ScheduledDowntime::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, const String& name, ScriptFrame& frame, const ApplyRule& rule)
 {

lib/icinga/scheduleddowntime.hpp

@@ -48,8 +48,6 @@ public:
 
 	Checkable::Ptr GetCheckable(void) const;
 
-	static void RegisterApplyRuleHandler(void);
-
 	static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
 	static void EvaluateApplyRules(const intrusive_ptr<Service>& service);
 

lib/icinga/service-apply.cpp

@@ -29,14 +29,11 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&Service::RegisterApplyRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void Service::RegisterApplyRuleHandler(void)
-{
 	std::vector<String> targets;
 	targets.push_back("Host");
 	ApplyRule::RegisterType("Service", targets);
-}
+});
 
 bool Service::EvaluateApplyRuleInstance(const Host::Ptr& host, const String& name, ScriptFrame& frame, const ApplyRule& rule)
 {

lib/icinga/service.hpp

@@ -54,8 +54,6 @@ public:
 	static StateType StateTypeFromString(const String& state);
 	static String StateTypeToString(StateType state);
 
-	static void RegisterApplyRuleHandler(void);
-
 	static void EvaluateApplyRules(const Host::Ptr& host);
 
 protected:

lib/icinga/servicegroup.cpp

@@ -31,12 +31,9 @@ using namespace icinga;
 
 REGISTER_TYPE(ServiceGroup);
 
-INITIALIZE_ONCE(&ServiceGroup::RegisterObjectRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void ServiceGroup::RegisterObjectRuleHandler(void)
-{
 	ObjectRule::RegisterType("ServiceGroup");
-}
+});
 
 bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigItem::Ptr& group)
 {

lib/icinga/servicegroup.hpp

@@ -46,8 +46,6 @@ public:
 
 	bool ResolveGroupMembership(const Service::Ptr& service, bool add = true, int rstack = 0);
 
-	static void RegisterObjectRuleHandler(void);
-
 	static void EvaluateObjectRules(const Service::Ptr& service);
 
 private:

lib/icinga/usergroup.cpp

@@ -31,12 +31,9 @@ using namespace icinga;
 
 REGISTER_TYPE(UserGroup);
 
-INITIALIZE_ONCE(&UserGroup::RegisterObjectRuleHandler);
+INITIALIZE_ONCE([]() {
-
-void UserGroup::RegisterObjectRuleHandler(void)
-{
 	ObjectRule::RegisterType("UserGroup");
-}
+});
 
 bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr& group)
 {

lib/icinga/usergroup.hpp

@@ -46,8 +46,6 @@ public:
 
 	bool ResolveGroupMembership(const User::Ptr& user, bool add = true, int rstack = 0);
 
-	static void RegisterObjectRuleHandler(void);
-
 	static void EvaluateObjectRules(const User::Ptr& user);
 
 private:

lib/remote/apiaction.hpp

@@ -73,9 +73,7 @@ public:
 };
 
 #define REGISTER_APIACTION(name, types, callback) \
-	namespace { namespace UNIQUE_NAME(apia) { namespace apia ## name { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterAction(void) \
-		{ \
 		String registerName = #name; \
 		boost::algorithm::replace_all(registerName, "_", "-"); \
 		std::vector<String> registerTypes; \
@@ -84,9 +82,7 @@ public:
 			boost::algorithm::split(registerTypes, typeNames, boost::is_any_of(";")); \
 		ApiAction::Ptr action = new ApiAction(registerTypes, callback); \
 		ApiActionRegistry::GetInstance()->Register(registerName, action); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterAction); \
-	} } }
 
 }
 

lib/remote/apifunction.hpp

@@ -67,14 +67,10 @@ public:
 };
 
 #define REGISTER_APIFUNCTION(name, ns, callback) \
-	namespace { namespace UNIQUE_NAME(apif) { namespace apif ## name { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterFunction(void) \
-		{ \
 		ApiFunction::Ptr func = new ApiFunction(callback); \
 		ApiFunctionRegistry::GetInstance()->Register(#ns "::" #name, func); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterFunction); \
-	} } }
 
 }
 

lib/remote/apilistener-configsync.cpp

@@ -31,17 +31,13 @@
 
 using namespace icinga;
 
-INITIALIZE_ONCE(&ApiListener::StaticInitialize);
-
 REGISTER_APIFUNCTION(UpdateObject, config, &ApiListener::ConfigUpdateObjectAPIHandler);
 REGISTER_APIFUNCTION(DeleteObject, config, &ApiListener::ConfigDeleteObjectAPIHandler);
 
-
+INITIALIZE_ONCE([]() {
-void ApiListener::StaticInitialize(void)
-{
 	ConfigObject::OnActiveChanged.connect(&ApiListener::ConfigUpdateObjectHandler);
 	ConfigObject::OnVersionChanged.connect(&ApiListener::ConfigUpdateObjectHandler);
-}
+});
 
 void ApiListener::ConfigUpdateObjectHandler(const ConfigObject::Ptr& object, const Value& cookie)
 {

lib/remote/apilistener.hpp

@@ -55,8 +55,6 @@ public:
 	DECLARE_OBJECT(ApiListener);
 	DECLARE_OBJECTNAME(ApiListener);
 
-	static void StaticInitialize(void);
-	
 	static boost::signals2::signal<void(bool)> OnMasterChanged;
 
 	ApiListener(void);

lib/remote/authority.cpp

@@ -24,11 +24,6 @@
 
 using namespace icinga;
 
-static bool ObjectNameLessComparer(const ConfigObject::Ptr& a, const ConfigObject::Ptr& b)
-{
-	return a->GetName() < b->GetName();
-}
-
 void ApiListener::UpdateObjectAuthority(void)
 {
 	Zone::Ptr my_zone = Zone::GetLocalZone();
@@ -55,7 +50,11 @@ void ApiListener::UpdateObjectAuthority(void)
 		if (num_total > 1 && endpoints.size() <= 1 && (mainTime == 0 || Utility::GetTime() - mainTime < 60))
 			return;
 
-		std::sort(endpoints.begin(), endpoints.end(), ObjectNameLessComparer);
+		std::sort(endpoints.begin(), endpoints.end(),
+			[](const ConfigObject::Ptr& a, const ConfigObject::Ptr& b) {
+				return a->GetName() < b->GetName();
+			}
+		);
 	}
 
 	for (const Type::Ptr& type : Type::GetAllTypes()) {

lib/remote/consolehandler.cpp

@@ -57,15 +57,12 @@ static void ScriptFrameCleanupHandler(void)
 		l_ApiScriptFrames.erase(key);
 }
 
-static void InitScriptFrameCleanup(void)
+INITIALIZE_ONCE([]() {
-{
 	l_FrameCleanupTimer = new Timer();
 	l_FrameCleanupTimer->OnTimerExpired.connect(boost::bind(ScriptFrameCleanupHandler));
 	l_FrameCleanupTimer->SetInterval(30);
 	l_FrameCleanupTimer->Start();
-}
+});
-
-INITIALIZE_ONCE(InitScriptFrameCleanup);
 
 bool ConsoleHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, HttpResponse& response, const Dictionary::Ptr& params)
 {

lib/remote/httphandler.hpp

@@ -61,15 +61,11 @@ public:
 };
 
 #define REGISTER_URLHANDLER(url, klass) \
-	namespace { namespace UNIQUE_NAME(apif) { namespace apif ## name { \
+	INITIALIZE_ONCE([]() { \
-		void RegisterHandler(void) \
-		{ \
 		Url::Ptr uurl = new Url(url); \
 		HttpHandler::Ptr handler = new klass(); \
 		HttpHandler::Register(uurl, handler); \
-		} \
+	})
-		INITIALIZE_ONCE(RegisterHandler); \
-	} } }
 
 }
 

lib/remote/jsonrpcconnection-heartbeat.cpp

@@ -31,15 +31,12 @@ REGISTER_APIFUNCTION(Heartbeat, event, &JsonRpcConnection::HeartbeatAPIHandler);
 
 static Timer::Ptr l_HeartbeatTimer;
 
-static void StartHeartbeatTimer(void)
+INITIALIZE_ONCE([]() {
-{
 	l_HeartbeatTimer = new Timer();
 	l_HeartbeatTimer->OnTimerExpired.connect(boost::bind(&JsonRpcConnection::HeartbeatTimerHandler));
 	l_HeartbeatTimer->SetInterval(10);
 	l_HeartbeatTimer->Start();
-}
+});
-
-INITIALIZE_ONCE(StartHeartbeatTimer);
 
 void JsonRpcConnection::HeartbeatTimerHandler(void)
 {