tlist: Add more locking

Signed-off-by: Jan Friesse <[email protected]>

Author: jfriesse

include/tlist.h

@@ -347,15 +347,22 @@ static inline int32_t timerlist_add_duration(struct timerlist *timerlist,
 	return (0);
 }
 
-static inline void timerlist_del(struct timerlist *timerlist,
+static inline int32_t timerlist_del(struct timerlist *timerlist,
 				 timer_handle _timer_handle)
 {
 	struct timerlist_timer *timer = (struct timerlist_timer *)_timer_handle;
 
+	if (pthread_mutex_lock(&timerlist->list_mutex)) {
+		return -errno;
+	}
+
 	memset(timer->handle_addr, 0, sizeof(struct timerlist_timer *));
 
 	timerlist_heap_delete(timerlist, timer);
 	free(timer);
+
+	pthread_mutex_unlock(&timerlist->list_mutex);
+	return 0;
 }
 
 static inline uint64_t timerlist_expire_time(struct timerlist
@@ -395,15 +402,29 @@ static inline uint64_t timerlist_msec_duration_to_expire(struct timerlist *timer
 	volatile uint64_t current_time;
 	volatile uint64_t msec_duration_to_expire;
 
+	/*
+	 * There is really no reasonable value to return when mutex lock fails
+	 */
+	if (pthread_mutex_lock(&timerlist->list_mutex)) {
+		return (-1);
+	}
+
 	/*
 	 * empty list, no expire
 	 */
 	if (timerlist->size == 0) {
+		pthread_mutex_unlock(&timerlist->list_mutex);
+
 		return (-1);
 	}
 
 	timer_from_list = timerlist_heap_entry_get(timerlist, 0);
 
+	/*
+	 * Mutex is no longer needed
+	 */
+	pthread_mutex_unlock(&timerlist->list_mutex);
+
 	if (timer_from_list->is_absolute_timer) {
 		current_time = qb_util_nano_from_epoch_get();
 	} else {
@@ -426,7 +447,7 @@ static inline uint64_t timerlist_msec_duration_to_expire(struct timerlist *timer
 /*
  * Expires any timers that should be expired
  */
-static inline void timerlist_expire(struct timerlist *timerlist)
+static inline int32_t timerlist_expire(struct timerlist *timerlist)
 {
 	struct timerlist_timer *timer;
 	uint64_t current_time_from_epoch;
@@ -436,6 +457,10 @@ static inline void timerlist_expire(struct timerlist *timerlist)
 	current_monotonic_time = qb_util_nano_current_get();
 	current_time_from_epoch = qb_util_nano_from_epoch_get();
 
+	if (pthread_mutex_lock(&timerlist->list_mutex)) {
+		return -errno;
+	}
+
 	while (timerlist->size > 0) {
 		timer = timerlist_heap_entry_get(timerlist, 0);
 
@@ -455,5 +480,9 @@ static inline void timerlist_expire(struct timerlist *timerlist)
 			break;	/* for timer iteration */
 		}
 	}
+
+	pthread_mutex_unlock(&timerlist->list_mutex);
+
+	return (0);
 }
 #endif /* QB_TLIST_H_DEFINED */

lib/loop_timerlist.c

@@ -76,7 +76,9 @@ expire_the_timers(struct qb_loop_source *s, int32_t ms_timeout)
 {
 	struct qb_timer_source *ts = (struct qb_timer_source *)s;
 	expired_timers = 0;
-	timerlist_expire(&ts->timerlist);
+	if (timerlist_expire(&ts->timerlist) != 0) {
+		qb_util_log(LOG_ERR, "timerlist_expire failed");
+	}
 	return expired_timers;
 }
 
@@ -265,7 +267,9 @@ qb_loop_timer_del(struct qb_loop * lp, qb_loop_timer_handle th)
 	}
 
 	if (t->timerlist_handle) {
-		timerlist_del(&s->timerlist, t->timerlist_handle);
+		if (timerlist_del(&s->timerlist, t->timerlist_handle) != 0) {
+			qb_util_log(LOG_ERR, "Could not delete timer from timerlist");
+		}
 	}
 	t->state = QB_POLL_ENTRY_EMPTY;
 	return 0;