diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 15:43:19 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 20:58:51 +0100 |
commit | e76de0540284118845c93c4351c82c6c8d5a090a (patch) | |
tree | dc295f87b74c5a4766444f6d1e7020e6219017a8 /src/mbgl/platform | |
parent | 117863f1114551407c481abc752f5fcfd139c878 (diff) | |
download | qtlocation-mapboxgl-e76de0540284118845c93c4351c82c6c8d5a090a.tar.gz |
[build] move logging to util
Diffstat (limited to 'src/mbgl/platform')
-rw-r--r-- | src/mbgl/platform/event.cpp | 34 | ||||
-rw-r--r-- | src/mbgl/platform/log.cpp | 67 |
2 files changed, 0 insertions, 101 deletions
diff --git a/src/mbgl/platform/event.cpp b/src/mbgl/platform/event.cpp deleted file mode 100644 index 68d75a2941..0000000000 --- a/src/mbgl/platform/event.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include <mbgl/platform/event.hpp> -#include <mbgl/util/enum.hpp> - -namespace mbgl { - -MBGL_DEFINE_ENUM(EventSeverity, { - { EventSeverity::Debug, "DEBUG" }, - { EventSeverity::Info, "INFO" }, - { EventSeverity::Warning, "WARNING" }, - { EventSeverity::Error, "ERROR" }, - { EventSeverity(-1), "UNKNOWN" }, -}); - -MBGL_DEFINE_ENUM(Event, { - { Event::General, "General" }, - { Event::Setup, "Setup" }, - { Event::Shader, "Shader" }, - { Event::ParseStyle, "ParseStyle" }, - { Event::ParseTile, "ParseTile" }, - { Event::Render, "Render" }, - { Event::Style, "Style" }, - { Event::Database, "Database" }, - { Event::HttpRequest, "HttpRequest" }, - { Event::Sprite, "Sprite" }, - { Event::Image, "Image" }, - { Event::OpenGL, "OpenGL" }, - { Event::JNI, "JNI" }, - { Event::Android, "Android" }, - { Event::Crash, "Crash" }, - { Event::Glyph, "Glyph" }, - { Event(-1), "Unknown" }, -}); - -} // namespace mbgl diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/platform/log.cpp deleted file mode 100644 index b140485dd6..0000000000 --- a/src/mbgl/platform/log.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include <mbgl/platform/log.hpp> -#include <mbgl/util/enum.hpp> -#include <mbgl/util/thread.hpp> - -#include <cstdio> -#include <cstdarg> -#include <sstream> - -namespace mbgl { - -namespace { - -static std::unique_ptr<Log::Observer> currentObserver; - -} // namespace - -void Log::setObserver(std::unique_ptr<Observer> observer) { - currentObserver = std::move(observer); -} - -std::unique_ptr<Log::Observer> Log::removeObserver() { - std::unique_ptr<Observer> observer; - std::swap(observer, currentObserver); - return observer; -} - -void Log::record(EventSeverity severity, Event event, const std::string &msg) { - record(severity, event, -1, msg); -} - -void Log::record(EventSeverity severity, Event event, const char* format, ...) { - va_list args; - va_start(args, format); - char msg[4096]; - vsnprintf(msg, sizeof(msg), format, args); - va_end(args); - - record(severity, event, -1, msg); -} - -void Log::record(EventSeverity severity, Event event, int64_t code) { - record(severity, event, code, std::string()); -} - -void Log::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) { - if (currentObserver && severity != EventSeverity::Debug && - currentObserver->onRecord(severity, event, code, msg)) { - return; - } - - std::stringstream logStream; - - logStream << "{" << platform::getCurrentThreadName() << "}"; - logStream << "[" << Enum<Event>::toString(event) << "]"; - - if (code >= 0) { - logStream << "(" << code << ")"; - } - - if (!msg.empty()) { - logStream << ": " << msg; - } - - platformRecord(severity, logStream.str()); -} - -} // namespace mbgl |