diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | drivers/dummy/dummy_driver.c | 2 | ||||
| -rw-r--r-- | drivers/dummy/dummy_driver.h | 2 | ||||
| -rw-r--r-- | jackd/engine.c | 2 | ||||
| -rw-r--r-- | libjack/time.c | 18 | ||||
| -rw-r--r-- | man/Makefile.am | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index cab02b0..4c0e910 100644 --- a/configure.ac +++ b/configure.ac @@ -258,28 +258,28 @@ AC_EGREP_CPP( ppoll, AC_CHECK_FUNC(clock_gettime, [ - AC_DEFINE(HAVE_CLOCK_GETTIME,0,"Whether or not clock_gettime can be found in system libraries") + AC_DEFINE(HAVE_CLOCK_GETTIME,1,"Whether or not clock_gettime can be found in system libraries") ], # # if not found, check librt specifically # AC_CHECK_LIB(rt, clock_gettime, [ - AC_DEFINE(HAVE_CLOCK_GETTIME,1,"Whether or not clock_gettime can be found in system libraries") + AC_DEFINE(HAVE_CLOCK_GETTIME,1,"Whether or not clock_gettime can be found in system libraries (via -lrt)") OS_LDFLAGS="$OS_LDFLAGS -lrt" ]) ) AC_CHECK_FUNC(clock_nanosleep, [ - AC_DEFINE(HAVE_CLOCK_NANOSLEEP,0,"Whether or not clock_nanosleep can be found in system libraries") + AC_DEFINE(HAVE_CLOCK_NANOSLEEP,1,"Whether or not clock_nanosleep can be found in system libraries") ], # # if not found, check librt specifically # AC_CHECK_LIB(rt, clock_nanosleep, [ - AC_DEFINE(HAVE_CLOCK_NANOSLEEP,1,"Whether or not clock_nanosleep can be found in system libraries") + AC_DEFINE(HAVE_CLOCK_NANOSLEEP,1,"Whether or not clock_nanosleep can be found in system libraries (via -lrt)") OS_LDFLAGS="$OS_LDFLAGS -lrt" ]) ) diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c index 361ab9a..aec7e4d 100644 --- a/drivers/dummy/dummy_driver.c +++ b/drivers/dummy/dummy_driver.c @@ -73,7 +73,7 @@ FakeVideoSync ( dummy_driver_t *driver ) } } -#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP) +#if HAVE_CLOCK_GETTIME && HAVE_CLOCK_NANOSLEEP static inline unsigned long long ts_to_nsec (struct timespec ts) { return ts.tv_sec * 1000000000LL + ts.tv_nsec; diff --git a/drivers/dummy/dummy_driver.h b/drivers/dummy/dummy_driver.h index 4daf182..1b7c305 100644 --- a/drivers/dummy/dummy_driver.h +++ b/drivers/dummy/dummy_driver.h @@ -43,7 +43,7 @@ struct _dummy_driver { jack_nframes_t period_size; unsigned long wait_time; -#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_NANOSLEEP) +#if HAVE_CLOCK_GETTIME && HAVE_CLOCK_NANOSLEEP struct timespec next_wakeup; #else jack_time_t next_time; diff --git a/jackd/engine.c b/jackd/engine.c index ad0a8d6..1235815 100644 --- a/jackd/engine.c +++ b/jackd/engine.c @@ -627,7 +627,7 @@ jack_process_internal (jack_engine_t *engine, JSList *node, to know that that jack_get_microseconds() is monotonic. */ -#ifdef HAVE_CLOCK_GETTIME +#if HAVE_CLOCK_GETTIME static const int system_clock_monotonic = 1; #else static const int system_clock_monotonic = 0; diff --git a/libjack/time.c b/libjack/time.c index 44ba9ed..418f291 100644 --- a/libjack/time.c +++ b/libjack/time.c @@ -47,7 +47,7 @@ jack_clock_source_name (jack_timer_type_t src) case JACK_TIMER_HPET: return "hpet"; case JACK_TIMER_SYSTEM_CLOCK: -#ifdef HAVE_CLOCK_GETTIME +#if HAVE_CLOCK_GETTIME return "system clock via clock_gettime"; #else return "system clock via gettimeofday"; @@ -59,16 +59,17 @@ jack_clock_source_name (jack_timer_type_t src) return "unknown"; } -#ifndef HAVE_CLOCK_GETTIME +#if HAVE_CLOCK_GETTIME jack_time_t jack_get_microseconds_from_system (void) { jack_time_t jackTime; - struct timeval tv; + struct timespec time; - gettimeofday (&tv, NULL); - jackTime = (jack_time_t)tv.tv_sec * 1000000 + (jack_time_t)tv.tv_usec; + clock_gettime (CLOCK_MONOTONIC, &time); + jackTime = (jack_time_t)time.tv_sec * 1e6 + + (jack_time_t)time.tv_nsec / 1e3; return jackTime; } @@ -78,11 +79,10 @@ jack_time_t jack_get_microseconds_from_system (void) { jack_time_t jackTime; - struct timespec time; + struct timeval tv; - clock_gettime (CLOCK_MONOTONIC, &time); - jackTime = (jack_time_t)time.tv_sec * 1e6 + - (jack_time_t)time.tv_nsec / 1e3; + gettimeofday (&tv, NULL); + jackTime = (jack_time_t)tv.tv_sec * 1000000 + (jack_time_t)tv.tv_usec; return jackTime; } diff --git a/man/Makefile.am b/man/Makefile.am index f889434..3cb404a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ .0.1: - @[ -z "$$SOURCE_DATE_EPOCH" ] || d=--date=@$$SOURCE_DATE_EPOCH ; sed -e "s/!VERSION!/@JACK_RELEASE@/g" -e "s/!DATE!/`date $$d '+%B %Y'`/g" < $*.0 > $@ + @[ -z "$$SOURCE_DATE_EPOCH" ] || d=--date=@$$SOURCE_DATE_EPOCH ; sed -e "s/!VERSION!/@JACK_RELEASE@/g" -e "s/!DATE!/`LC_ALL=C date $$d '+%B %Y'`/g" < $*.0 > $@ @echo Built $*.1 from template manpages = $(patsubst %.0,%.1,$(wildcard *.0)) |