Finish android log backend

This commit is contained in:
Leith Bade
2014-11-07 23:46:28 +11:00
parent 4a35b831fc
commit 7477d0c9df
3 changed files with 66 additions and 18 deletions

View File

@@ -1,32 +1,59 @@
#include <mbgl/platform/default/log_stderr.hpp>
#include <mbgl/platform/android/log_android.hpp>
#include <iostream>
#include <cstdarg>
#define __STDC_FORMAT_MACROS // NDK bug workaround: https://code.google.com/p/android/issues/detail?id=72349
#include <cinttypes>
#include <android/log.h>
namespace mbgl {
// TODO use android logging
int AndroidLogBackend::severity_to_priority(EventSeverity severity) {
switch(severity) {
case EventSeverity::Debug:
return ANDROID_LOG_DEBUG;
void StderrLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
std::cerr << "[" << severity << "] " << event << ": " << msg << std::endl;
case EventSeverity::Info:
return ANDROID_LOG_INFO;
case EventSeverity::Warning:
return ANDROID_LOG_WARN;
case EventSeverity::Error:
return ANDROID_LOG_ERROR;
default:
return ANDROID_LOG_VERBOSE;
}
}
void StderrLogBackend::record(EventSeverity severity, Event event, const char* format, ...) {
std::cerr << "[" << severity << "] " << event << ": ";
void AndroidLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
__android_log_print(severity_to_priority(severity), EventClass(event).c_str(), "%s", msg.c_str());
}
void AndroidLogBackend::record(EventSeverity severity, Event event, const char* format, ...) {
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
const int len = vsnprintf(nullptr, 0, format, args) + 1;
char* buf = new char[len];
vsnprintf(buf, len, format, args);
va_end(args);
std::cerr << std::endl;
__android_log_print(severity_to_priority(severity), EventClass(event).c_str(), "%s", buf);
delete buf;
buf = nullptr;
}
void StderrLogBackend::record(EventSeverity severity, Event event, int64_t code) {
std::cerr << "[" << severity << "] " << event << ": (" << code << ")" << std::endl;
void AndroidLogBackend::record(EventSeverity severity, Event event, int64_t code) {
__android_log_print(severity_to_priority(severity), EventClass(event).c_str(), "(%" PRId64 ")", code);
}
void StderrLogBackend::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
std::cerr << "[" << severity << "] " << event << ": (" << code << ") " << msg << std::endl;
void AndroidLogBackend::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
__android_log_print(severity_to_priority(severity), EventClass(event).c_str(), "(%" PRId64 ") %s", code, msg.c_str());
}
}