tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up the DynamicType class. 

Refs #5036
This commit is contained in:
Gunnar Beutner 2013-11-08 16:07:21 +01:00
parent 7c990eff6e
commit e546cd854d
42 changed files with 28 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/checker/checkercomponent.cpp
View File

@ -28,7 +28,6 @@
using namespace icinga;
REGISTER_NTYPE(CheckerComponent);
REGISTER_TYPE(CheckerComponent);
void CheckerComponent::Start(void)

1
components/cluster/clusterlistener.cpp
View File

@ -34,7 +34,6 @@
using namespace icinga;
REGISTER_NTYPE(ClusterListener);
REGISTER_TYPE(ClusterListener);
/**

1
components/cluster/endpoint.cpp
View File

@ -28,7 +28,6 @@
using namespace icinga;
REGISTER_NTYPE(Endpoint);
REGISTER_TYPE(Endpoint);
boost::signals2::signal<void (const Endpoint::Ptr&)> Endpoint::OnConnected;

1
components/compat/checkresultreader.cpp
View File

@ -30,7 +30,6 @@
using namespace icinga;
REGISTER_NTYPE(CheckResultReader);
REGISTER_TYPE(CheckResultReader);
/**

1
components/compat/compatlogger.cpp
View File

@ -39,7 +39,6 @@
using namespace icinga;
REGISTER_NTYPE(CompatLogger);
REGISTER_TYPE(CompatLogger);
REGISTER_SCRIPTFUNCTION(ValidateRotationMethod, &CompatLogger::ValidateRotationMethod);

1
components/compat/externalcommandlistener.cpp
View File

@ -27,7 +27,6 @@
using namespace icinga;
REGISTER_NTYPE(ExternalCommandListener);
REGISTER_TYPE(ExternalCommandListener);
/**

1
components/compat/statusdatawriter.cpp
View File

@ -41,7 +41,6 @@
using namespace icinga;
REGISTER_NTYPE(StatusDataWriter);
REGISTER_TYPE(StatusDataWriter);
/**

1
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -33,7 +33,6 @@
using namespace icinga;
REGISTER_NTYPE(IdoMysqlConnection);
REGISTER_TYPE(IdoMysqlConnection);
#define SCHEMA_VERSION "1.10.0"

1
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -33,7 +33,6 @@
using namespace icinga;
REGISTER_NTYPE(IdoPgsqlConnection);
REGISTER_TYPE(IdoPgsqlConnection);
#define SCHEMA_VERSION "1.10.0"

1
components/demo/demo.cpp
View File

@ -23,7 +23,6 @@
using namespace icinga;
REGISTER_NTYPE(Demo);
REGISTER_TYPE(Demo);
/**

1
components/livestatus/listener.cpp
View File

@ -34,7 +34,6 @@
using namespace icinga;
using namespace livestatus;
REGISTER_NTYPE(LivestatusListener);
REGISTER_TYPE(LivestatusListener);
REGISTER_SCRIPTFUNCTION(ValidateSocketType, &LivestatusListener::ValidateSocketType);

1
components/notification/notificationcomponent.cpp
View File

@ -28,7 +28,6 @@
using namespace icinga;
REGISTER_NTYPE(NotificationComponent);
REGISTER_TYPE(NotificationComponent);
/**

1
components/perfdata/graphitewriter.cpp
View File

@ -42,7 +42,6 @@
using namespace icinga;
REGISTER_NTYPE(GraphiteWriter);
REGISTER_TYPE(GraphiteWriter);
void GraphiteWriter::Start(void)

1
components/perfdata/perfdatawriter.cpp
View File

@ -30,7 +30,6 @@
using namespace icinga;
REGISTER_NTYPE(PerfdataWriter);
REGISTER_TYPE(PerfdataWriter);
void PerfdataWriter::Start(void)

2
lib/base/application.cpp
View File

@ -43,7 +43,7 @@
using namespace icinga;
REGISTER_NTYPE(Application);
REGISTER_TYPE(Application);
Application *Application::m_Instance = NULL;
bool Application::m_ShuttingDown = false;

1
lib/base/consolelogger.cpp
View File

@ -23,7 +23,6 @@
using namespace icinga;
REGISTER_NTYPE(ConsoleLogger);
REGISTER_TYPE(ConsoleLogger);
/**

2
lib/base/dynamicobject.cpp
View File

@ -37,7 +37,7 @@
using namespace icinga;
REGISTER_NTYPE(DynamicObject);
REGISTER_TYPE(DynamicObject);
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStarted;
boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStopped;

45
lib/base/dynamictype.cpp
View File

@ -24,8 +24,8 @@
using namespace icinga;
DynamicType::DynamicType(const String& name, const DynamicType::ObjectFactory& factory)
: m_Name(name), m_ObjectFactory(factory)
DynamicType::DynamicType(const String& name)
: m_Name(name)
{ }
DynamicType::Ptr DynamicType::GetByName(const String& name)
@ -34,8 +34,20 @@ DynamicType::Ptr DynamicType::GetByName(const String& name)
DynamicType::TypeMap::const_iterator tt = InternalGetTypeMap().find(name);
if (tt == InternalGetTypeMap().end())
return DynamicType::Ptr();
if (tt == InternalGetTypeMap().end()) {
const Type *type = Type::GetByName(name);
if (!type || !GetType<DynamicObject>()->IsAssignableFrom(type)
|| type->IsAbstract())
return DynamicType::Ptr();
DynamicType::Ptr dtype = make_shared<DynamicType>(name);
InternalGetTypeMap()[type->GetName()] = dtype;
InternalGetTypeVector().push_back(dtype);
return dtype;
}
return tt->second;
}
@ -112,36 +124,17 @@ DynamicObject::Ptr DynamicType::GetObject(const String& name) const
return nt->second;
}
void DynamicType::RegisterType(const DynamicType::Ptr& type)
{
boost::mutex::scoped_lock lock(GetStaticMutex());
DynamicType::TypeMap::const_iterator tt = InternalGetTypeMap().find(type->GetName());
if (tt != InternalGetTypeMap().end())
BOOST_THROW_EXCEPTION(std::runtime_error("Cannot register class for type '" +
type->GetName() + "': Objects of this type already exist."));
InternalGetTypeMap()[type->GetName()] = type;
InternalGetTypeVector().push_back(type);
}
DynamicObject::Ptr DynamicType::CreateObject(const Dictionary::Ptr& serializedUpdate)
{
ASSERT(!OwnsLock());
ObjectFactory factory;
const Type *type = Type::GetByName(m_Name);
{
ObjectLock olock(this);
factory = m_ObjectFactory;
}
DynamicObject::Ptr object = factory();
Object::Ptr object = type->Instantiate();
Deserialize(object, serializedUpdate, FAConfig);
return object;
return dynamic_pointer_cast<DynamicObject>(object);
}
boost::mutex& DynamicType::GetStaticMutex(void)

47
lib/base/dynamictype.h
View File

@ -36,16 +36,12 @@ class I2_BASE_API DynamicType : public Object
public:
DECLARE_PTR_TYPEDEFS(DynamicType);
typedef boost::function<DynamicObject::Ptr (void)> ObjectFactory;
DynamicType(const String& name, const ObjectFactory& factory);
DynamicType(const String& name);
String GetName(void) const;
static DynamicType::Ptr GetByName(const String& name);
static void RegisterType(const DynamicType::Ptr& type);
DynamicObject::Ptr CreateObject(const Dictionary::Ptr& serializedUpdate);
DynamicObject::Ptr GetObject(const String& name) const;
@ -72,7 +68,6 @@ public:
private:
String m_Name;
ObjectFactory m_ObjectFactory;
typedef std::map<String, DynamicObject::Ptr, string_iless> ObjectMap;
typedef std::vector<DynamicObject::Ptr> ObjectVector;
@ -90,46 +85,6 @@ private:
static std::vector<DynamicObject::Ptr> GetObjects(const String& type);
};
/**
* A registry for DynamicType objects.
*
* @ingroup base
*/
class DynamicTypeRegistry : public Registry<DynamicTypeRegistry, DynamicType::Ptr>
{ };
/**
* Helper class for registering DynamicObject implementation classes.
*
* @ingroup base
*/
class RegisterTypeHelper
{
public:
RegisterTypeHelper(const String& name, const DynamicType::ObjectFactory& factory)
{
DynamicType::Ptr type = make_shared<DynamicType>(name, factory);
DynamicType::RegisterType(type);
}
};
/**
* Factory function for DynamicObject-based classes.
*
* @ingroup base
*/
template<typename T>
shared_ptr<T> DynamicObjectFactory(void)
{
return make_shared<T>();
}
#define REGISTER_TYPE_ALIAS(type, alias) \
I2_EXPORT icinga::RegisterTypeHelper g_RegisterDT_ ## type(alias, DynamicObjectFactory<type>);
#define REGISTER_TYPE(type) \
REGISTER_TYPE_ALIAS(type, #type)
}
#endif /* DYNAMICTYPE_H */

1
lib/base/filelogger.cpp
View File

@ -23,7 +23,6 @@
using namespace icinga;
REGISTER_NTYPE(FileLogger);
REGISTER_TYPE(FileLogger);
/**

2
lib/base/logger.cpp
View File

@ -29,7 +29,7 @@
using namespace icinga;
REGISTER_NTYPE(Logger);
REGISTER_TYPE(Logger);
std::set<Logger::Ptr> Logger::m_Loggers;
boost::mutex Logger::m_Mutex;

1
lib/base/script.cpp
View File

@ -26,7 +26,6 @@
using namespace icinga;
REGISTER_NTYPE(Script);
REGISTER_TYPE(Script);
void Script::Start(void)

2
lib/base/streamlogger.cpp
View File

@ -26,7 +26,7 @@
using namespace icinga;
REGISTER_NTYPE(StreamLogger);
REGISTER_TYPE(StreamLogger);
boost::mutex StreamLogger::m_Mutex;

1
lib/base/sysloglogger.cpp
View File

@ -23,7 +23,6 @@
#ifndef _WIN32
using namespace icinga;
REGISTER_NTYPE(SyslogLogger);
REGISTER_TYPE(SyslogLogger);
/**

2
lib/base/type.h
View File

@ -95,7 +95,7 @@ struct FactoryHelper
}
};
#define REGISTER_NTYPE(type) \
#define REGISTER_TYPE(type) \
namespace { \
void RegisterType(void) \
{ \

2
lib/db_ido/dbconnection.cpp
View File

@ -31,7 +31,7 @@
using namespace icinga;
REGISTER_NTYPE(DbConnection);
REGISTER_TYPE(DbConnection);
Timer::Ptr DbConnection::m_ProgramStatusTimer;

1
lib/hello/hello.cpp
View File

@ -23,7 +23,6 @@
using namespace icinga;
REGISTER_NTYPE(Hello);
REGISTER_TYPE(Hello);
/**

1
lib/icinga/checkcommand.cpp
View File

@ -22,7 +22,6 @@
using namespace icinga;
REGISTER_NTYPE(CheckCommand);
REGISTER_TYPE(CheckCommand);
Dictionary::Ptr CheckCommand::Execute(const Service::Ptr& service)

2
lib/icinga/command.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga;
REGISTER_NTYPE(Command);
REGISTER_TYPE(Command);
bool Command::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *result) const
{

1
lib/icinga/domain.cpp
View File

@ -22,7 +22,6 @@
using namespace icinga;
REGISTER_NTYPE(Domain);
REGISTER_TYPE(Domain);
int Domain::GetPrivileges(const String& instance) const

1
lib/icinga/eventcommand.cpp
View File

@ -22,7 +22,6 @@
using namespace icinga;
REGISTER_NTYPE(EventCommand);
REGISTER_TYPE(EventCommand);
void EventCommand::Execute(const Service::Ptr& service)

1
lib/icinga/host.cpp
View File

@ -38,7 +38,6 @@
using namespace icinga;
REGISTER_NTYPE(Host);
REGISTER_TYPE(Host);
void Host::Start(void)

1
lib/icinga/hostgroup.cpp
View File

@ -27,7 +27,6 @@
using namespace icinga;
REGISTER_NTYPE(HostGroup);
REGISTER_TYPE(HostGroup);
std::set<Host::Ptr> HostGroup::GetMembers(void) const

1
lib/icinga/icingaapplication.cpp
View File

@ -32,7 +32,6 @@ using namespace icinga;
static Timer::Ptr l_RetentionTimer;
REGISTER_NTYPE(IcingaApplication);
REGISTER_TYPE(IcingaApplication);
INITIALIZE_ONCE(IcingaApplication, &IcingaApplication::StaticInitialize);

1
lib/icinga/notification.cpp
View File

@ -32,7 +32,6 @@
using namespace icinga;
REGISTER_NTYPE(Notification);
REGISTER_TYPE(Notification);
boost::signals2::signal<void (const Notification::Ptr&, double, const String&)> Notification::OnNextNotificationChanged;

1
lib/icinga/notificationcommand.cpp
View File

@ -22,7 +22,6 @@
using namespace icinga;
REGISTER_NTYPE(NotificationCommand);
REGISTER_TYPE(NotificationCommand);
Dictionary::Ptr NotificationCommand::Execute(const Notification::Ptr& notification,

2
lib/icinga/perfdatavalue.cpp
View File

@ -25,7 +25,7 @@
using namespace icinga;
REGISTER_NTYPE(PerfdataValue);
REGISTER_TYPE(PerfdataValue);
PerfdataValue::PerfdataValue(void)
{ }

1
lib/icinga/service.cpp
View File

@ -33,7 +33,6 @@
using namespace icinga;
REGISTER_NTYPE(Service);
REGISTER_TYPE(Service);
boost::signals2::signal<void (const Service::Ptr&, const String&, const String&, AcknowledgementType, double, const String&)> Service::OnAcknowledgementSet;

1
lib/icinga/servicegroup.cpp
View File

@ -28,7 +28,6 @@
using namespace icinga;
REGISTER_NTYPE(ServiceGroup);
REGISTER_TYPE(ServiceGroup);
std::set<Service::Ptr> ServiceGroup::GetMembers(void) const

1
lib/icinga/timeperiod.cpp
View File

@ -29,7 +29,6 @@
using namespace icinga;
REGISTER_NTYPE(TimePeriod);
REGISTER_TYPE(TimePeriod);
REGISTER_SCRIPTFUNCTION(EmptyTimePeriod, &TimePeriod::EmptyTimePeriodUpdate);
REGISTER_SCRIPTFUNCTION(EvenMinutesTimePeriod, &TimePeriod::EvenMinutesTimePeriodUpdate);

1
lib/icinga/user.cpp
View File

@ -25,7 +25,6 @@
using namespace icinga;
REGISTER_NTYPE(User);
REGISTER_TYPE(User);
void User::OnConfigLoaded(void)

1
lib/icinga/usergroup.cpp
View File

@ -27,7 +27,6 @@
using namespace icinga;
REGISTER_NTYPE(UserGroup);
REGISTER_TYPE(UserGroup);
std::set<User::Ptr> UserGroup::GetMembers(void) const