AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: streamline error handling in read_oa_samples_until

Browse Source 
No functional changes.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5788>
This commit is contained in:
Marcin Ślusarz
2020-07-10 16:24:31 +02:00
committed by Marge Bot
parent 03e8b3551c
commit 9fa64803aa
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/perf/gen_perf_query.c
+16 -12
View File
@@ -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;
}
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_FINISHED;
}
buf->len = len;