1 files changed, 66 insertions, 9 deletions

diff --git a/common/log.h b/common/log.h
index 483f16f..415c7f7 100644
--- a/common/log.h
+++ b/common/log.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "sink_export.h"
 #include <QDebug>
 
 namespace Sink {
@@ -12,19 +13,75 @@ enum DebugLevel {
     Error
 };
 
-QByteArray debugLevelName(DebugLevel debugLevel);
-DebugLevel debugLevelFromName(const QByteArray &name);
+QByteArray SINK_EXPORT debugLevelName(DebugLevel debugLevel);
+DebugLevel SINK_EXPORT debugLevelFromName(const QByteArray &name);
 
-void setDebugOutputLevel(DebugLevel);
-DebugLevel debugOutputLevel();
+/**
+ * Sets the debug output level.
+ *
+ * Everything below is ignored.
+ */
+void SINK_EXPORT setDebugOutputLevel(DebugLevel);
+DebugLevel SINK_EXPORT debugOutputLevel();
 
-QDebug debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);
+enum FilterType {
+    Area,
+    ApplicationName
+};
+
+/**
+ * Sets a debug output filter.
+ * 
+ * Everything that is not matching the filter is ignored.
+ * An empty filter matches everything.
+ *
+ * Note: In case of resources the application name is the identifier.
+ */
+void SINK_EXPORT setDebugOutputFilter(FilterType, const QByteArrayList &filter);
+QByteArrayList SINK_EXPORT debugOutputFilter(FilterType type);
+
+/**
+ * Set the debug output fields.
+ *
+ * Currently supported are:
+ * * Name: Application name used for filter.
+ * * Function: The function name:
+ * * Location: The source code location.
+ *
+ * These are additional items to the default ones (level, area, message).
+ */
+void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter);
+QByteArrayList SINK_EXPORT debugOutputFields();
+
+QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);
+
+struct SINK_EXPORT TraceTime
+{
+    TraceTime(int i) : time(i){};
+    const int time;
+};
+
+inline QDebug SINK_EXPORT operator<<(QDebug d, const TraceTime &time)
+{
+    d << time.time << "[ms]";
+    return d;
+}
 
 }
 }
 
-#define Trace() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO)
-#define Log() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO)
-#define Warning() Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO)
+#define DEBUG_AREA nullptr
+
+#define Trace_() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO)
+#define Log_() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO)
+
+#define Trace_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
+#define Log_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
+#define Warning_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
+#define Error_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
+
+#define Trace() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define Log() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define Warning() Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
 //FIXME Error clashes with Storage::Error and MessageQueue::Error
-#define ErrorMsg() Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO)
+#define ErrorMsg() Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)