Skip to content

Commit

Permalink
Cleanup: test_perthreadlock_timing: handle pthread mutex errors
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
compudj committed Jun 4, 2019
1 parent a3371e4 commit 4104b71
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions tests/benchmark/test_perthreadlock_timing.c
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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();
Expand All @@ -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());
Expand All @@ -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;
Expand Down

0 comments on commit 4104b71

Please sign in to comment.