From 4104b71fb1810c7a61ab76e3fbaec0ea88f6fd75 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 4 Jun 2019 15:09:53 -0400 Subject: [PATCH] Cleanup: test_perthreadlock_timing: handle pthread mutex errors Found by Coverity: CID 1357055 (#1 of 1): Unchecked return value (CHECKED_RETURN) 4. check_return: Calling pthread_mutex_lock without checking return value (as is done elsewhere 44 out of 48 times). Signed-off-by: Mathieu Desnoyers --- tests/benchmark/test_perthreadlock_timing.c | 30 ++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/tests/benchmark/test_perthreadlock_timing.c b/tests/benchmark/test_perthreadlock_timing.c index c1cd567..ca2953d 100644 --- a/tests/benchmark/test_perthreadlock_timing.c +++ b/tests/benchmark/test_perthreadlock_timing.c @@ -69,9 +69,10 @@ static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time; void *thr_reader(void *arg) { - unsigned int i, j; caa_cycles_t time1, time2; long tidx = (long)arg; + unsigned int i, j; + int ret; printf("thread_begin %s, tid %lu\n", "reader", urcu_get_thread_id()); @@ -80,9 +81,17 @@ void *thr_reader(void *arg) time1 = caa_get_cycles(); for (i = 0; i < OUTER_READ_LOOP; i++) { for (j = 0; j < INNER_READ_LOOP; j++) { - pthread_mutex_lock(&per_thread_lock[tidx].lock); + ret = pthread_mutex_lock(&per_thread_lock[tidx].lock); + if (ret) { + perror("Error in pthread mutex lock"); + exit(-1); + } assert(test_array.a == 8); - pthread_mutex_unlock(&per_thread_lock[tidx].lock); + ret = pthread_mutex_unlock(&per_thread_lock[tidx].lock); + if (ret) { + perror("Error in pthread mutex unlock"); + exit(-1); + } } } time2 = caa_get_cycles(); @@ -98,9 +107,10 @@ void *thr_reader(void *arg) void *thr_writer(void *arg) { + caa_cycles_t time1, time2; unsigned int i, j; long tidx; - caa_cycles_t time1, time2; + int ret; printf("thread_begin %s, tid %lu\n", "writer", urcu_get_thread_id()); @@ -110,11 +120,19 @@ void *thr_writer(void *arg) for (j = 0; j < INNER_WRITE_LOOP; j++) { time1 = caa_get_cycles(); for (tidx = 0; tidx < NR_READ; tidx++) { - pthread_mutex_lock(&per_thread_lock[tidx].lock); + ret = pthread_mutex_lock(&per_thread_lock[tidx].lock); + if (ret) { + perror("Error in pthread mutex lock"); + exit(-1); + } } test_array.a = 8; for (tidx = NR_READ - 1; tidx >= 0; tidx--) { - pthread_mutex_unlock(&per_thread_lock[tidx].lock); + ret = pthread_mutex_unlock(&per_thread_lock[tidx].lock); + if (ret) { + perror("Error in pthread mutex unlock"); + exit(-1); + } } time2 = caa_get_cycles(); writer_time[(unsigned long)arg] += time2 - time1; -- 2.34.1