From 9fa64803aadebf8663469832eb90b6a7fe572494 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20=C5=9Alusarz?= Date: Fri, 10 Jul 2020 16:24:31 +0200 Subject: [PATCH] intel/perf: streamline error handling in read_oa_samples_until MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No functional changes. Signed-off-by: Marcin Ślusarz Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/perf/gen_perf_query.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/gen_perf_query.c index 3d4f922b2b3..309ebe024d3 100644 --- a/src/intel/perf/gen_perf_query.c +++ b/src/intel/perf/gen_perf_query.c @@ -938,20 +938,24 @@ read_oa_samples_until(struct gen_perf_context *perf_ctx, if (len <= 0) { exec_list_push_tail(&perf_ctx->free_sample_buffers, &buf->link); - if (len < 0) { - if (errno == EAGAIN) { - return ((last_timestamp - start_timestamp) < INT32_MAX && - (last_timestamp - start_timestamp) >= - (end_timestamp - start_timestamp)) ? - OA_READ_STATUS_FINISHED : - OA_READ_STATUS_UNFINISHED; - } else { - DBG("Error reading i915 perf samples: %m\n"); - } - } else + if (len == 0) { DBG("Spurious EOF reading i915 perf samples\n"); + return OA_READ_STATUS_ERROR; + } + + if (errno != EAGAIN) { + DBG("Error reading i915 perf samples: %m\n"); + return OA_READ_STATUS_ERROR; + } + + if ((last_timestamp - start_timestamp) >= INT32_MAX) + return OA_READ_STATUS_UNFINISHED; + + if ((last_timestamp - start_timestamp) < + (end_timestamp - start_timestamp)) + return OA_READ_STATUS_UNFINISHED; - return OA_READ_STATUS_ERROR; + return OA_READ_STATUS_FINISHED; } buf->len = len; -- 2.30.2