revert back to using nanosleep

Fixes #93

diff --git a/Makefile b/Makefile
index f0b1e195c6f3228677ba0adc65fcaf78d7487b09..31bfc6fd54bde6b79850e64ffc17dd302c921a35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ LIBS+=-lconfuse
 LIBS+=-lyajl
 LIBS+=-lpulse
 LIBS+=-lm
+LIBS+=-lpthread
 
 VERSION:=$(shell git describe --tags --abbrev=0)
 GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
@@ -72,7 +73,7 @@ OBJS:=$(OBJS:.c=.o)
 
 ifeq ($(OS),OpenBSD)
 OBJS:=$(filter-out src/pulse.o, $(OBJS))
-LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread
+LIBS:=$(filter-out -lpulse, $(LIBS))
 endif
 
 src/%.o: src/%.c include/i3status.h

diff --git a/i3status.c b/i3status.c
index 74a5410d1fcb5b4acd5a2c85029c4482a9c4d203..ec204e59140572b3e957d98b1890bba625b7dacb 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -62,8 +62,7 @@ cfg_t *cfg, *cfg_general, *cfg_section;
 
 void **cur_instance;
 
-pthread_cond_t i3status_sleep_cond = PTHREAD_COND_INITIALIZER;
-pthread_mutex_t i3status_sleep_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_t main_thread;
 
 /*
  * Set the exit_upon_signal flag, because one cannot do anything in a safe
@@ -82,7 +81,6 @@ void fatalsig(int signum) {
  *
  */
 void sigusr1(int signum) {
-    pthread_cond_broadcast(&i3status_sleep_cond);
 }
 
 /*
@@ -453,6 +451,7 @@ int main(int argc, char *argv[]) {
     struct sigaction action;
     memset(&action, 0, sizeof(struct sigaction));
     action.sa_handler = fatalsig;
+    main_thread = pthread_self();
 
     /* Exit upon SIGPIPE because when we have nowhere to write to, gathering system
      * information is pointless. Also exit explicitly on SIGTERM and SIGINT because
@@ -578,7 +577,6 @@ int main(int argc, char *argv[]) {
     char buffer[4096];
 
     void **per_instance = calloc(cfg_size(cfg, "order"), sizeof(*per_instance));
-    pthread_mutex_lock(&i3status_sleep_mutex);
 
     while (1) {
         if (exit_upon_signal) {
@@ -714,21 +712,13 @@ int main(int argc, char *argv[]) {
         fflush(stdout);
 
         /* To provide updates on every full second (as good as possible)
-         * we don’t use sleep(interval) but we sleep until the next second.
-         * We also align to 60 seconds modulo interval such
+         * we don’t use sleep(interval) but we sleep until the next
+         * second (with microsecond precision) plus (interval-1)
+         * seconds. We also align to 60 seconds modulo interval such
          * that we start with :00 on every new minute. */
-        struct timespec ts;
-#if defined(__APPLE__)
-        gettimeofday(&tv, NULL);
-        ts.tv_sec = tv.tv_sec;
-#else
-        clock_gettime(CLOCK_REALTIME, &ts);
-#endif
-        ts.tv_sec += interval - (ts.tv_sec % interval);
-        ts.tv_nsec = 0;
-
-        /* Sleep to absolute time 'ts', unless the condition
-         * 'i3status_sleep_cond' is signaled from another thread */
-        pthread_cond_timedwait(&i3status_sleep_cond, &i3status_sleep_mutex, &ts);
+        struct timeval current_timeval;
+        gettimeofday(&current_timeval, NULL);
+        struct timespec ts = {interval - 1 - (current_timeval.tv_sec % interval), (10e5 - current_timeval.tv_usec) * 1000};
+        nanosleep(&ts, NULL);
     }
 }

diff --git a/include/i3status.h b/include/i3status.h
index 5f65c5edf7606b1e6bba847b6fc500d6090ce3f4..a311d2465a2ff0c1c716f70816ebef8396d1708d 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -222,7 +222,5 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
 
 extern void **cur_instance;
 
-extern pthread_cond_t i3status_sleep_cond;
-extern pthread_mutex_t i3status_sleep_mutex;
-
+extern pthread_t main_thread;
 #endif

diff --git a/src/pulse.c b/src/pulse.c
index 34e302b110302e7aa687fd875817256e343be6eb..f9ed5d3c6341328bcd9cdee1f859212ed013c6a4 100644 (file)
--- a/src/pulse.c
+++ b/src/pulse.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <signal.h>
 #include <pulse/pulseaudio.h>
 #include "i3status.h"
 #include "queue.h"
@@ -89,9 +90,7 @@ static void store_volume_from_sink_cb(pa_context *c,
          save_volume(DEFAULT_SINK_INDEX, composed_volume)) |
         save_volume(info->index, composed_volume)) {
         /* if the volume or mute flag changed, wake the main thread */
-        pthread_mutex_lock(&i3status_sleep_mutex);
-        pthread_cond_broadcast(&i3status_sleep_cond);
-        pthread_mutex_unlock(&i3status_sleep_mutex);
+        pthread_kill(main_thread, SIGUSR1);
     }
 }