retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logcatd_android: use sleep_for instead of usleep

albatross
Comma Device 2021-01-06 13:04:00 -08:00
parent 94b2818b22
commit 61bc7f73fa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
selfdrive/logcatd/logcatd_android.cc
View File

@ -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;
int main() {
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;