diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | i3status.c | 28 | ||||
| -rw-r--r-- | include/i3status.h | 4 | ||||
| -rw-r--r-- | src/pulse.c | 5 |
4 files changed, 14 insertions, 26 deletions
@@ -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 @@ -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(¤t_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 5f65c5e..a311d24 100644 --- 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 34e302b..f9ed5d3 100644 --- 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); } } |