From e4502623adb3f37f2bef5b2008bbbc7ebda6f058 Mon Sep 17 00:00:00 2001 From: Comma Device Date: Wed, 6 Jan 2021 13:04:00 -0800 Subject: [PATCH] logcatd_android: use sleep_for instead of usleep old-commit-hash: 61bc7f73faf70522dd2c3177d6f53ed3ff3e1af4 --- selfdrive/logcatd/logcatd_android.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/selfdrive/logcatd/logcatd_android.cc b/selfdrive/logcatd/logcatd_android.cc index de79cec2a7..fa32831b55 100644 --- a/selfdrive/logcatd/logcatd_android.cc +++ b/selfdrive/logcatd/logcatd_android.cc @@ -4,9 +4,8 @@ #include #include #include -#include -//#include +#include #include #include @@ -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;