Merge pull request #50 from commaai/devel

Devel
cfranyota · Mar 18, 2020 · ce95679 · ce95679
2 parents fa83d80 + a5c3340
commit ce95679
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/selfdrive/camerad/cameras/camera_qcom.c b/selfdrive/camerad/cameras/camera_qcom.c
@@ -2117,7 +2117,7 @@ void cameras_run(DualCameraState *s) {
 
     int ret = poll(fds, ARRAYSIZE(fds), 1000);
     if (ret <= 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }

diff --git a/selfdrive/camerad/main.cc b/selfdrive/camerad/main.cc
@@ -604,10 +604,7 @@ void* visionserver_client_thread(void* arg) {
     }
     int ret = zmq_poll(polls, num_polls, -1);
     if (ret < 0) {
-      if (errno == EINTR){
-        LOGW("poll EINTR");
-        continue;
-      }
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }
@@ -799,7 +796,7 @@ void* visionserver_thread(void* arg) {
 
     int ret = zmq_poll(polls, ARRAYSIZE(polls), -1);
     if (ret < 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }

diff --git a/selfdrive/logcatd/logcatd.cc b/selfdrive/logcatd/logcatd.cc
@@ -25,8 +25,8 @@ int main() {
   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_KERNEL);
-//  assert(kernel_logger);
+  struct logger *kernel_logger = android_logger_open(logger_list, (log_id_t)5); // LOG_ID_KERNEL
+  assert(kernel_logger);
 
   Context * c = Context::create();
   PubSocket * androidLog = PubSocket::create(c, "androidLog");

diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
@@ -598,7 +598,7 @@ static void ui_update(UIState *s) {
       int ret = zmq_poll(polls, 1, 1000);
     #endif
     if (ret < 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
 
       LOGE("poll failed (%d - %d)", ret, errno);
       close(s->ipc_fd);