From eb4b3f3f1b2b2de285d20a5a26b4c5c4e4ee81e4 Mon Sep 17 00:00:00 2001 From: pbd Date: Wed, 17 Apr 2002 14:01:50 +0000 Subject: [PATCH] fix issue with poll timeouts due to kernel event handling git-svn-id: svn+ssh://jackaudio.org/trunk/jack@173 0c269be4-1314-0410-8aa9-9f06e86f4224 --- alsa_driver.c | 4 ++-- configure.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alsa_driver.c b/alsa_driver.c index 17dde39..45bfffc 100644 --- a/alsa_driver.c +++ b/alsa_driver.c @@ -823,7 +823,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float *delay poll_enter = get_cycles (); - if (poll (driver->pfd, nfds, (int) floor (driver->period_usecs / 1000.0f)) < 0) { + if (poll (driver->pfd, nfds, (int) floor ((1.5f * driver->period_usecs) / 1000.0f)) < 0) { if (errno == EINTR) { printf ("poll interrupt\n"); // this happens mostly when run @@ -919,7 +919,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float *delay if ((p_timed_out && (p_timed_out == driver->playback_nfds)) && (c_timed_out && (c_timed_out == driver->capture_nfds))){ - jack_error ("ALSA: poll time out"); + jack_error ("ALSA: poll time out polled for %.6f", ((float) (poll_ret - poll_enter) / driver->cpu_mhz)); *status = -5; return 0; } diff --git a/configure.in b/configure.in index eb90968..2c405c6 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.) JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=26 -JACK_MICRO_VERSION=2 +JACK_MICRO_VERSION=3 BETA=