diff --git a/src/common/Makefile.am b/src/common/Makefile.am index bf63ed6eb..61738c00f 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -43,7 +43,8 @@ liblumieracommon_la_SOURCES = \ $(liblumieracommon_la_srcdir)/appstate.cpp \ $(liblumieracommon_la_srcdir)/option.cpp \ $(liblumieracommon_la_srcdir)/subsys.cpp \ - $(liblumieracommon_la_srcdir)/interfaceproxy.cpp + $(liblumieracommon_la_srcdir)/interfaceproxy.cpp \ + $(liblumieracommon_la_srcdir)/logging.cpp noinst_HEADERS += \ diff --git a/src/common/logging.cpp b/src/common/logging.cpp index 6a3e265a7..b2a62dfce 100644 --- a/src/common/logging.cpp +++ b/src/common/logging.cpp @@ -21,16 +21,12 @@ */ -#define LOGGING_C - -/* - logging.h defines the flags here, thats all - */ -#include "logging.h" +#define LUMIERA_LOGGING_CXX +#include "include/logging.h" /* // Local Variables: -// mode: C +// mode: C++ // c-file-style: "gnu" // indent-tabs-mode: nil // End: diff --git a/src/common/logging.h b/src/common/logging.h index 40d4aaa5b..0a2e49c4a 100644 --- a/src/common/logging.h +++ b/src/common/logging.h @@ -60,12 +60,15 @@ #include -#ifndef LUMIERA_LOGGING_C +#ifndef LUMIERA_LOGGING_CXX +#undef NOBUG_DECLARE_ONLY #define NOBUG_DECLARE_ONLY 1 #endif /** the root switch for all logging */ NOBUG_CPP_DEFINE_FLAG (all); + + /** debug logging */ NOBUG_CPP_DEFINE_FLAG_PARENT ( debugging, all); /** debug logging for the main application starter */ @@ -88,6 +91,8 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( gui_dbg, debugging); NOBUG_CPP_DEFINE_FLAG_PARENT ( library_dbg, debugging); NOBUG_CPP_DEFINE_FLAG_PARENT ( psplay_dbg, library_dbg); NOBUG_CPP_DEFINE_FLAG_PARENT ( resourcecollector_dbg, library_dbg); +NOBUG_CPP_DEFINE_FLAG_PARENT ( mutex_dbg, library_dbg); +NOBUG_CPP_DEFINE_FLAG_PARENT ( cond_dbg, library_dbg); /** base of debug logging for the common library */ NOBUG_CPP_DEFINE_FLAG_PARENT ( common_dbg, debugging); NOBUG_CPP_DEFINE_FLAG_PARENT ( config_dbg, common_dbg); @@ -97,7 +102,10 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( configtyped_dbg, config_dbg); NOBUG_CPP_DEFINE_FLAG_PARENT ( configlookup_dbg, config_dbg); NOBUG_CPP_DEFINE_FLAG_PARENT ( interface_dbg, common_dbg); NOBUG_CPP_DEFINE_FLAG_PARENT ( interfaceregistry_dbg, interface_dbg); -NOBUG_CPP_DEFINE_FLAG_PARENT ( plugin_dbg, common_dbg); +NOBUG_CPP_DEFINE_FLAG_PARENT ( pluginloader_dbg, common_dbg); +NOBUG_CPP_DEFINE_FLAG_PARENT ( plugins_dbg, debugging); + + /** base of runtime logging always available */ NOBUG_CPP_DEFINE_FLAG_PARENT ( logging, all); /** general application progress base */ @@ -107,6 +115,8 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( main, progress); /** progress log for the backend */ NOBUG_CPP_DEFINE_FLAG_PARENT ( backend, progress); NOBUG_CPP_DEFINE_FLAG_PARENT ( file, backend); //opening/closing files etc +NOBUG_CPP_DEFINE_FLAG_PARENT ( mmap, backend); //mmap errors +NOBUG_CPP_DEFINE_FLAG_PARENT ( thread, backend); //starting/stopping threads /** progress log for the proc layer */ NOBUG_CPP_DEFINE_FLAG_PARENT ( proc, progress); /** progress log for the render subsystem of proc */ @@ -125,14 +135,18 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( configtyped, config); /** progress log, interfaces */ NOBUG_CPP_DEFINE_FLAG_PARENT ( interface, common); NOBUG_CPP_DEFINE_FLAG_PARENT ( interfaceregistry, common); //interfaces which get registered/removed +NOBUG_CPP_DEFINE_FLAG_PARENT ( guifacade, common); +NOBUG_CPP_DEFINE_FLAG_PARENT ( subsystem, common); /** progress log, plugin loader*/ -NOBUG_CPP_DEFINE_FLAG_PARENT ( plugin, common); //plugins loaded/unloaded/errors +NOBUG_CPP_DEFINE_FLAG_PARENT ( pluginloader, common); //plugins loaded/unloaded/errors +/** progress log, external plugins*/ +NOBUG_CPP_DEFINE_FLAG_PARENT ( plugins, progress); /** base flag for software testing */ NOBUG_CPP_DEFINE_FLAG_PARENT ( test, logging); /** base flag for syncronization logging */ -NOBUG_CPP_DEFINE_FLAG_PARENT ( sync, logging); +NOBUG_CPP_DEFINE_FLAG_PARENT ( sync, logging); // do we need subsections here? backend_mutex_sync proc_mutex_sync etc? NOBUG_CPP_DEFINE_FLAG_PARENT ( mutex_sync, sync); //locking/unlocking mutexes -NOBUG_CPP_DEFINE_FLAG_PARENT ( condwait_sync, sync); //waiting and signalling condition vars +NOBUG_CPP_DEFINE_FLAG_PARENT ( cond_sync, sync); //waiting and signalling condition vars /** base flag for memory related logging */ NOBUG_CPP_DEFINE_FLAG_PARENT ( memory, logging); /** memory busines of the proc layer */ @@ -140,6 +154,8 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( proc_mem, memory); NOBUG_CPP_DEFINE_FLAG_PARENT ( mobject_mem, proc_mem); NOBUG_CPP_DEFINE_FLAG_PARENT ( builder_mem, proc_mem); NOBUG_CPP_DEFINE_FLAG_PARENT ( asset_mem, proc_mem); + + /** event which drive the application are separately logged to reconstruct what happend/yielded to a problem */ NOBUG_CPP_DEFINE_FLAG_PARENT ( events, all); /** caveat joel, you need to implement this */ @@ -147,7 +163,7 @@ NOBUG_CPP_DEFINE_FLAG_PARENT ( gui_event, all); -#ifndef LUMIERA_LOGGING_C +#ifndef LUMIERA_LOGGING_CXX #undef NOBUG_DECLARE_ONLY #define NOBUG_DECLARE_ONLY 0 #endif diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 10ad2f8ed..489be37ce 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -37,7 +37,6 @@ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/allocationcluster.cpp \ $(liblumiera_la_srcdir)/lumitime.cpp \ $(liblumiera_la_srcdir)/lifecycle.cpp \ - $(liblumiera_la_srcdir)/nobugcfg.cpp \ $(liblumiera_la_srcdir)/util.cpp \ $(liblumiera_la_srcdir)/visitor.cpp \ $(liblumiera_la_srcdir)/query.cpp \