|
|
|
@ -4,9 +4,8 @@ |
|
|
|
|
#include <cassert> |
|
|
|
|
#include <csignal> |
|
|
|
|
#include <cerrno> |
|
|
|
|
#include <android/log.h> |
|
|
|
|
|
|
|
|
|
//#include <log/log.h>
|
|
|
|
|
#include <android/log.h> |
|
|
|
|
#include <log/logger.h> |
|
|
|
|
#include <log/logprint.h> |
|
|
|
|
|
|
|
|
@ -14,10 +13,11 @@ |
|
|
|
|
#include "common/utilpp.h" |
|
|
|
|
#include "messaging.hpp" |
|
|
|
|
|
|
|
|
|
ExitHandler do_exit; |
|
|
|
|
|
|
|
|
|
int main() { |
|
|
|
|
int err; |
|
|
|
|
ExitHandler do_exit; |
|
|
|
|
|
|
|
|
|
// setup android logging
|
|
|
|
|
struct logger_list *logger_list = android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0); |
|
|
|
|
assert(logger_list); |
|
|
|
|
struct logger *main_logger = android_logger_open(logger_list, LOG_ID_MAIN); |
|
|
|
@ -30,14 +30,15 @@ int main() { |
|
|
|
|
assert(crash_logger); |
|
|
|
|
struct logger *kernel_logger = android_logger_open(logger_list, (log_id_t)5); // LOG_ID_KERNEL
|
|
|
|
|
assert(kernel_logger); |
|
|
|
|
|
|
|
|
|
PubMaster pm({"androidLog"}); |
|
|
|
|
|
|
|
|
|
while (!do_exit) { |
|
|
|
|
log_msg log_msg; |
|
|
|
|
err = android_logger_list_read(logger_list, &log_msg); |
|
|
|
|
int err = android_logger_list_read(logger_list, &log_msg); |
|
|
|
|
|
|
|
|
|
if (err == -EAGAIN) { |
|
|
|
|
usleep(500 * 1000); |
|
|
|
|
util::sleep_for(500); |
|
|
|
|
continue; |
|
|
|
|
} else if (err <= 0) { |
|
|
|
|
break; |
|
|
|
|