quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indent classes, align by spaces

Browse Source
This commit is contained in:
Garux
2021-03-24 00:25:15 +03:00
parent 5b1b9b5e6c
commit 2222100316
450 changed files with 42485 additions and 42239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/modulesystem/moduleregistry.h
View File

@@ -28,23 +28,23 @@
class ModuleRegisterable
{
public:
virtual void selfRegister() = 0;
virtual void selfRegister() = 0;
};
class ModuleRegistryList
{
typedef std::list<ModuleRegisterable*> RegisterableModules;
RegisterableModules m_modules;
typedef std::list<ModuleRegisterable*> RegisterableModules;
RegisterableModules m_modules;
public:
void addModule( ModuleRegisterable& module ){
m_modules.push_back( &module );
}
void registerModules() const {
for ( RegisterableModules::const_iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
( *i )->selfRegister();
void addModule( ModuleRegisterable& module ){
m_modules.push_back( &module );
}
void registerModules() const {
for ( RegisterableModules::const_iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
( *i )->selfRegister();
}
}
}
};
typedef SmartStatic<ModuleRegistryList> StaticModuleRegistryList;
@@ -53,9 +53,9 @@ typedef SmartStatic<ModuleRegistryList> StaticModuleRegistryList;
class StaticRegisterModule : public StaticModuleRegistryList
{
public:
StaticRegisterModule( ModuleRegisterable& module ){
StaticModuleRegistryList::instance().addModule( module );
}
StaticRegisterModule( ModuleRegisterable& module ){
StaticModuleRegistryList::instance().addModule( module );
}
};

148
libs/modulesystem/modulesmap.h
View File

@@ -30,109 +30,109 @@
template<typename Type>
class ModulesMap : public Modules<Type>
{
typedef std::map<CopiedString, Module*> modules_t;
modules_t m_modules;
typedef std::map<CopiedString, Module*> modules_t;
modules_t m_modules;
public:
~ModulesMap(){
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
( *i ).second->release();
~ModulesMap(){
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
( *i ).second->release();
}
}
}
typedef modules_t::const_iterator iterator;
typedef modules_t::const_iterator iterator;
iterator begin() const {
return m_modules.begin();
}
iterator end() const {
return m_modules.end();
}
void insert( const char* name, Module& module ){
module.capture();
if ( globalModuleServer().getError() ) {
module.release();
globalModuleServer().setError( false );
iterator begin() const {
return m_modules.begin();
}
else
{
m_modules.insert( modules_t::value_type( name, &module ) );
iterator end() const {
return m_modules.end();
}
}
Type* find( const char* name ){
modules_t::iterator i = m_modules.find( name );
if ( i != m_modules.end() ) {
return static_cast<Type*>( Module_getTable( *( *i ).second ) );
void insert( const char* name, Module& module ){
module.capture();
if ( globalModuleServer().getError() ) {
module.release();
globalModuleServer().setError( false );
}
else
{
m_modules.insert( modules_t::value_type( name, &module ) );
}
}
return 0;
}
Type* findModule( const char* name ){
return find( name );
}
void foreachModule( const typename Modules<Type>::Visitor& visitor ){
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
visitor.visit( ( *i ).first.c_str(), *static_cast<const Type*>( Module_getTable( *( *i ).second ) ) );
Type* find( const char* name ){
modules_t::iterator i = m_modules.find( name );
if ( i != m_modules.end() ) {
return static_cast<Type*>( Module_getTable( *( *i ).second ) );
}
return 0;
}
Type* findModule( const char* name ){
return find( name );
}
void foreachModule( const typename Modules<Type>::Visitor& visitor ){
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
{
visitor.visit( ( *i ).first.c_str(), *static_cast<const Type*>( Module_getTable( *( *i ).second ) ) );
}
}
}
};
template<typename Type>
class InsertModules : public ModuleServer::Visitor
{
ModulesMap<Type>& m_modules;
ModulesMap<Type>& m_modules;
public:
InsertModules( ModulesMap<Type>& modules )
: m_modules( modules ){
}
void visit( const char* name, Module& module ) const {
m_modules.insert( name, module );
}
InsertModules( ModulesMap<Type>& modules )
: m_modules( modules ){
}
void visit( const char* name, Module& module ) const {
m_modules.insert( name, module );
}
};
template<typename Type>
class ModulesRef
{
ModulesMap<Type> m_modules;
ModulesMap<Type> m_modules;
public:
ModulesRef( const char* names ){
if ( !globalModuleServer().getError() ) {
if ( string_equal( names, "*" ) ) {
InsertModules<Type> visitor( m_modules );
globalModuleServer().foreachModule( typename Type::Name(), typename Type::Version(), visitor );
}
else
{
StringTokeniser tokeniser( names );
for (;; )
ModulesRef( const char* names ){
if ( !globalModuleServer().getError() ) {
if ( string_equal( names, "*" ) ) {
InsertModules<Type> visitor( m_modules );
globalModuleServer().foreachModule( typename Type::Name(), typename Type::Version(), visitor );
}
else
{
const char* name = tokeniser.getToken();
if ( string_empty( name ) ) {
break;
}
Module* module = globalModuleServer().findModule( typename Type::Name(), typename Type::Version(), name );
if ( module == 0 ) {
globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
// do not fail on missing image or model plugin, they can be optional
if ( !string_equal( typename Type::Name(), "image" ) && !string_equal( typename Type::Name(), "model" ) ){
globalModuleServer().setError( true );
StringTokeniser tokeniser( names );
for (;; )
{
const char* name = tokeniser.getToken();
if ( string_empty( name ) ) {
break;
}
}
else
{
m_modules.insert( name, *module );
Module* module = globalModuleServer().findModule( typename Type::Name(), typename Type::Version(), name );
if ( module == 0 ) {
globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
// do not fail on missing image or model plugin, they can be optional
if ( !string_equal( typename Type::Name(), "image" ) && !string_equal( typename Type::Name(), "model" ) ){
globalModuleServer().setError( true );
break;
}
}
else
{
m_modules.insert( name, *module );
}
}
}
}
}
}
ModulesMap<Type>& get(){
return m_modules;
}
ModulesMap<Type>& get(){
return m_modules;
}
};
#endif

14
libs/modulesystem/singletonmodule.cpp
View File

@@ -25,18 +25,18 @@
class NullType
{
public:
INTEGER_CONSTANT( Version, 1 );
STRING_CONSTANT( Name, "" );
INTEGER_CONSTANT( Version, 1 );
STRING_CONSTANT( Name, "" );
};
class NullModule
{
public:
typedef NullType Type;
STRING_CONSTANT( Name, "" );
void* getTable(){
return NULL;
}
typedef NullType Type;
STRING_CONSTANT( Name, "" );
void* getTable(){
return NULL;
}
};
void TEST_SINGLETONMODULE(){

138
libs/modulesystem/singletonmodule.h
View File

@@ -32,32 +32,32 @@ template<typename API, typename Dependencies>
class DefaultAPIConstructor
{
public:
const char* getName(){
return typename API::Name();
}
const char* getName(){
return typename API::Name();
}
API* constructAPI( Dependencies& dependencies ){
return new API;
}
void destroyAPI( API* api ){
delete api;
}
API* constructAPI( Dependencies& dependencies ){
return new API;
}
void destroyAPI( API* api ){
delete api;
}
};
template<typename API, typename Dependencies>
class DependenciesAPIConstructor
{
public:
const char* getName(){
return typename API::Name();
}
const char* getName(){
return typename API::Name();
}
API* constructAPI( Dependencies& dependencies ){
return new API( dependencies );
}
void destroyAPI( API* api ){
delete api;
}
API* constructAPI( Dependencies& dependencies ){
return new API( dependencies );
}
void destroyAPI( API* api ){
delete api;
}
};
class NullDependencies
@@ -68,63 +68,63 @@ class NullDependencies
template<typename API, typename Dependencies = NullDependencies, typename APIConstructor = DefaultAPIConstructor<API, Dependencies> >
class SingletonModule : public APIConstructor, public Module, public ModuleRegisterable
{
Dependencies* m_dependencies;
API* m_api;
std::size_t m_refcount;
bool m_dependencyCheck;
bool m_cycleCheck;
Dependencies* m_dependencies;
API* m_api;
std::size_t m_refcount;
bool m_dependencyCheck;
bool m_cycleCheck;
public:
typedef typename API::Type Type;
typedef typename API::Type Type;
SingletonModule()
: m_dependencies( 0 ), m_api( 0 ), m_refcount( 0 ), m_dependencyCheck( false ), m_cycleCheck( false ){
}
explicit SingletonModule( const APIConstructor& constructor )
: APIConstructor( constructor ), m_dependencies( 0 ), m_api( 0 ), m_refcount( 0 ), m_dependencyCheck( false ), m_cycleCheck( false ){
}
~SingletonModule(){
ASSERT_MESSAGE( m_refcount == 0, "module still referenced at shutdown" );
}
void selfRegister(){
globalModuleServer().registerModule( typename Type::Name(), typename Type::Version(), APIConstructor::getName(), *this );
}
Dependencies& getDependencies(){
return *m_dependencies;
}
void* getTable(){
if ( m_api != 0 ) {
return m_api->getTable();
SingletonModule()
: m_dependencies( 0 ), m_api( 0 ), m_refcount( 0 ), m_dependencyCheck( false ), m_cycleCheck( false ){
}
return 0;
}
void capture(){
if ( ++m_refcount == 1 ) {
globalOutputStream() << "Module Initialising: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
m_dependencies = new Dependencies();
m_dependencyCheck = !globalModuleServer().getError();
if ( m_dependencyCheck ) {
m_api = APIConstructor::constructAPI( *m_dependencies );
globalOutputStream() << "Module Ready: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
}
else
{
globalErrorStream() << "Module Dependencies Failed: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
}
m_cycleCheck = true;
explicit SingletonModule( const APIConstructor& constructor )
: APIConstructor( constructor ), m_dependencies( 0 ), m_api( 0 ), m_refcount( 0 ), m_dependencyCheck( false ), m_cycleCheck( false ){
}
~SingletonModule(){
ASSERT_MESSAGE( m_refcount == 0, "module still referenced at shutdown" );
}
ASSERT_MESSAGE( m_cycleCheck, "cyclic dependency detected" );
}
void release(){
if ( --m_refcount == 0 ) {
if ( m_dependencyCheck ) {
APIConstructor::destroyAPI( m_api );
}
delete m_dependencies;
void selfRegister(){
globalModuleServer().registerModule( typename Type::Name(), typename Type::Version(), APIConstructor::getName(), *this );
}
Dependencies& getDependencies(){
return *m_dependencies;
}
void* getTable(){
if ( m_api != 0 ) {
return m_api->getTable();
}
return 0;
}
void capture(){
if ( ++m_refcount == 1 ) {
globalOutputStream() << "Module Initialising: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
m_dependencies = new Dependencies();
m_dependencyCheck = !globalModuleServer().getError();
if ( m_dependencyCheck ) {
m_api = APIConstructor::constructAPI( *m_dependencies );
globalOutputStream() << "Module Ready: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
}
else
{
globalErrorStream() << "Module Dependencies Failed: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n";
}
m_cycleCheck = true;
}
ASSERT_MESSAGE( m_cycleCheck, "cyclic dependency detected" );
}
void release(){
if ( --m_refcount == 0 ) {
if ( m_dependencyCheck ) {
APIConstructor::destroyAPI( m_api );
}
delete m_dependencies;
}
}
}
};