Add locking to timer

util/timer.c

@@ -1,12 +1,14 @@
 #include <stdlib.h>
 #include <time.h>
 #include "util/timer.h"
+#include "misc.h"
 
 struct timer *timer_new(timer_callback_t callback, void *data) {
     struct timer *timer = malloc(sizeof(struct timer));
     timer->callback = callback;
     timer->data = data;
     timer->running = false;
+    lock_init(timer);
     return timer;
 }
 
@@ -16,23 +18,28 @@ void timer_free(struct timer *timer) {
 
 static void *timer_thread(void *param) {
     struct timer *timer = param;
+    lock(timer);
     while (true) {
         struct timespec remaining = timespec_subtract(timer->end, timespec_now());
         while (timespec_positive(remaining)) {
+            unlock(timer);
             nanosleep(&remaining, NULL);
+            lock(timer);
             remaining = timespec_subtract(timer->end, timespec_now());
         }
         timer->callback(timer->data);
         if (timespec_positive(timer->interval)) {
             timer->start = timespec_now();
             timer->end = timespec_add(timer->start, timer->interval);
         } else {
+            unlock(timer);
             return NULL;
         }
     }
 }
 
 int timer_set(struct timer *timer, struct timer_spec spec, struct timer_spec *oldspec) {
+    lock(timer);
     struct timespec now = timespec_now();
     if (oldspec != NULL) {
         oldspec->value = timespec_subtract(timer->end, now);
@@ -53,5 +60,6 @@ int timer_set(struct timer *timer, struct timer_spec spec, struct timer_spec *ol
             timer->running = false;
         }
     }
+    unlock(timer);
     return 0;
 }

util/timer.h

@@ -53,6 +53,7 @@ struct timer {
     pthread_t thread;
     timer_callback_t callback;
     void *data;
+    pthread_mutex_t lock;
 };
 
 struct timer *timer_new(timer_callback_t callback, void *data);