mawei/openpilot-meb
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

fix logcatd after bugfix

Browse Source 
old-commit-hash: 366292a059eee602bc8bd8768730c1bdfb8004ac
This commit is contained in:
Comma Device
2021-02-03 22:57:34 -08:00
parent cb9b7c44c1
commit d295eb68f9
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
selfdrive/logcatd/logcatd_android.cc
View File

@@ -5,8 +5,6 @@
#include "common/util.h"
#include "messaging.hpp"
#define LOG_ID_KERNEL (log_id_t)5
int main() {
ExitHandler do_exit;
log_time last_log_time = {};
@@ -14,43 +12,47 @@ int main() {
PubMaster pm({"androidLog"});
while (!do_exit) {
// setup android logging
logger_list *loggers = last_log_time.tv_sec == 0 ?
android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0) :
android_logger_list_alloc_time(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, last_log_time, 0);
assert(loggers);
logger_list *logger_list = last_log_time.tv_sec == 0 ?
android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0) :
android_logger_list_alloc_time(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, last_log_time, 0);
assert(logger_list);
const log_id_t log_ids[] = {LOG_ID_MAIN, LOG_ID_RADIO, LOG_ID_SYSTEM, LOG_ID_CRASH, LOG_ID_KERNEL};
for (const auto &id : log_ids) {
struct logger *log = android_logger_open(loggers, id);
assert(log != nullptr);
}
struct logger *main_logger = android_logger_open(logger_list, LOG_ID_MAIN);
assert(main_logger);
struct logger *radio_logger = android_logger_open(logger_list, LOG_ID_RADIO);
assert(radio_logger);
struct logger *system_logger = android_logger_open(logger_list, LOG_ID_SYSTEM);
assert(system_logger);
struct logger *crash_logger = android_logger_open(logger_list, LOG_ID_CRASH);
assert(crash_logger);
struct logger *kernel_logger = android_logger_open(logger_list, (log_id_t)5); // LOG_ID_KERNEL
assert(kernel_logger);
while (!do_exit) {
log_msg log_msg;
int err = android_logger_list_read(loggers, &log_msg);
int err = android_logger_list_read(logger_list, &log_msg);
if (err <= 0) break;
AndroidLogEntry entry;
err = android_log_processLogBuffer(&log_msg.entry_v1, &entry);
if (err == 0) {
last_log_time.tv_sec = entry.tv_sec;
last_log_time.tv_nsec = entry.tv_nsec;
if (err < 0) continue;
last_log_time.tv_sec = entry.tv_sec;
last_log_time.tv_nsec = entry.tv_nsec;
MessageBuilder msg;
auto androidEntry = msg.initEvent().initAndroidLog();
androidEntry.setId(log_msg.id());
androidEntry.setTs(entry.tv_sec * 1000000000ULL + entry.tv_nsec);
androidEntry.setPriority(entry.priority);
androidEntry.setPid(entry.pid);
androidEntry.setTid(entry.tid);
androidEntry.setTag(entry.tag);
androidEntry.setMessage(entry.message);
MessageBuilder msg;
auto androidEntry = msg.initEvent().initAndroidLog();
androidEntry.setId(log_msg.id());
androidEntry.setTs(entry.tv_sec * 1000000000ULL + entry.tv_nsec);
androidEntry.setPriority(entry.priority);
androidEntry.setPid(entry.pid);
androidEntry.setTid(entry.tid);
androidEntry.setTag(entry.tag);
androidEntry.setMessage(entry.message);
pm.send("androidLog", msg);
}
pm.send("androidLog", msg);
}
android_logger_list_free(loggers);
android_logger_list_free(logger_list);
util::sleep_for(500);
}
return 0;