From 7669a783d62cde5514a5577d40018690d4c469c6 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 16 Mar 2020 14:40:24 -0700 Subject: [PATCH] Camerad add errno logging, and continue on EINTR --- selfdrive/camerad/cameras/camera_qcom.c | 5 +++-- selfdrive/camerad/main.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/camerad/cameras/camera_qcom.c b/selfdrive/camerad/cameras/camera_qcom.c index a45f0c0b82..6cef28f215 100644 --- a/selfdrive/camerad/cameras/camera_qcom.c +++ b/selfdrive/camerad/cameras/camera_qcom.c @@ -2117,7 +2117,8 @@ void cameras_run(DualCameraState *s) { int ret = poll(fds, ARRAYSIZE(fds), 1000); if (ret <= 0) { - LOGE("poll failed (%d)", ret); + if (errno == EINTR) continue; + LOGE("poll failed (%d - %d)", ret, errno); break; } @@ -2210,4 +2211,4 @@ void cameras_run(DualCameraState *s) { void cameras_close(DualCameraState *s) { camera_close(&s->rear); camera_close(&s->front); -} \ No newline at end of file +} diff --git a/selfdrive/camerad/main.cc b/selfdrive/camerad/main.cc index 9594fb49d6..8f26261c72 100644 --- a/selfdrive/camerad/main.cc +++ b/selfdrive/camerad/main.cc @@ -605,7 +605,7 @@ void* visionserver_client_thread(void* arg) { int ret = zmq_poll(polls, num_polls, -1); if (ret < 0) { if (errno == EINTR) continue; - LOGE("poll failed (%d)", ret); + LOGE("poll failed (%d - %d)", ret, errno); break; } if (polls[0].revents) {