asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-19 17:49:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

amidi: fix timeout handling

Browse source 
The timeout is not supposed to expire when ignored messages are
received.  This cannot be handled with the poll() timeout, so add
a separate timer.

Reported-by: Martin Tarenskeen <m.tarenskeen@gmail.com>
Reviewd-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2016-08-13 16:41:58 +02:00 committed by Takashi Iwai
parent 04322ca749
commit a6e9a8da9e
1 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
amidi/amidi.c
View file

@ -25,9 +25,11 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <math.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <sys/timerfd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -37,6 +39,8 @@
#include "aconfig.h" #include "aconfig.h"
#include "version.h" #include "version.h"
#define NSEC_PER_SEC 1000000000L
static int do_device_list, do_rawmidi_list; static int do_device_list, do_rawmidi_list;
static char *port_name = "default"; static char *port_name = "default";
static char *send_file_name; static char *send_file_name;
@ -46,7 +50,7 @@ static char *send_data;
static int send_data_length; static int send_data_length;
static int receive_file; static int receive_file;
static int dump; static int dump;
static int timeout; static float timeout;
static int stop; static int stop;
static snd_rawmidi_t *input, **inputp; static snd_rawmidi_t *input, **inputp;
static snd_rawmidi_t *output, **outputp; static snd_rawmidi_t *output, **outputp;
@ -427,6 +431,7 @@ int main(int argc, char *argv[])
int ignore_active_sensing = 1; int ignore_active_sensing = 1;
int ignore_clock = 1; int ignore_clock = 1;
int do_send_hex = 0; int do_send_hex = 0;
struct itimerspec itimerspec = { .it_interval = { 0, 0 } };
while ((c = getopt_long(argc, argv, short_options, while ((c = getopt_long(argc, argv, short_options,
long_options, NULL)) != -1) { long_options, NULL)) != -1) {
@ -461,7 +466,7 @@ int main(int argc, char *argv[])
dump = 1; dump = 1;
break; break;
case 't': case 't':
timeout = atoi(optarg); timeout = atof(optarg);
break; break;
case 'a': case 'a':
ignore_active_sensing = 0; ignore_active_sensing = 0;
@ -552,40 +557,64 @@ int main(int argc, char *argv[])
if (inputp) { if (inputp) {
int read = 0; int read = 0;
int npfds, time = 0; int npfds;
struct pollfd *pfds; struct pollfd *pfds;
timeout *= 1000; npfds = 1 + snd_rawmidi_poll_descriptors_count(input);
npfds = snd_rawmidi_poll_descriptors_count(input);
pfds = alloca(npfds * sizeof(struct pollfd)); pfds = alloca(npfds * sizeof(struct pollfd));
snd_rawmidi_poll_descriptors(input, pfds, npfds);
if (timeout > 0) {
pfds[0].fd = timerfd_create(CLOCK_MONOTONIC, 0);
if (pfds[0].fd == -1) {
error("cannot create timer: %s", strerror(errno));
goto _exit;
}
pfds[0].events = POLLIN;
} else {
pfds[0].fd = -1;
}
snd_rawmidi_poll_descriptors(input, &pfds[1], npfds - 1);
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
if (timeout > 0) {
float timeout_int;
itimerspec.it_value.tv_nsec = modff(timeout, &timeout_int) * NSEC_PER_SEC;
itimerspec.it_value.tv_sec = timeout_int;
err = timerfd_settime(pfds[0].fd, 0, &itimerspec, NULL);
if (err < 0) {
error("cannot set timer: %s", strerror(errno));
goto _exit;
}
}
for (;;) { for (;;) {
unsigned char buf[256]; unsigned char buf[256];
int i, length; int i, length;
unsigned short revents; unsigned short revents;
err = poll(pfds, npfds, 200); err = poll(pfds, npfds, -1);
if (stop || (err < 0 && errno == EINTR)) if (stop || (err < 0 && errno == EINTR))
break; break;
if (err < 0) { if (err < 0) {
error("poll failed: %s", strerror(errno)); error("poll failed: %s", strerror(errno));
break; break;
} }
if (err == 0) {
time += 200; err = snd_rawmidi_poll_descriptors_revents(input, &pfds[1], npfds - 1, &revents);
if (timeout && time >= timeout) if (err < 0) {
break;
continue;
}
if ((err = snd_rawmidi_poll_descriptors_revents(input, pfds, npfds, &revents)) < 0) {
error("cannot get poll events: %s", snd_strerror(errno)); error("cannot get poll events: %s", snd_strerror(errno));
break; break;
} }
if (revents & (POLLERR | POLLHUP)) if (revents & (POLLERR | POLLHUP))
break; break;
if (!(revents & POLLIN)) if (!(revents & POLLIN)) {
if (pfds[0].revents & POLLIN)
break;
continue; continue;
}
err = snd_rawmidi_read(input, buf, sizeof(buf)); err = snd_rawmidi_read(input, buf, sizeof(buf));
if (err == -EAGAIN) if (err == -EAGAIN)
continue; continue;
@ -603,7 +632,7 @@ int main(int argc, char *argv[])
if (length == 0) if (length == 0)
continue; continue;
read += length; read += length;
time = 0;
if (receive_file != -1) if (receive_file != -1)
write(receive_file, buf, length); write(receive_file, buf, length);
if (dump) { if (dump) {
@ -611,6 +640,14 @@ int main(int argc, char *argv[])
print_byte(buf[i]); print_byte(buf[i]);
fflush(stdout); fflush(stdout);
} }
if (timeout > 0) {
err = timerfd_settime(pfds[0].fd, 0, &itimerspec, NULL);
if (err < 0) {
error("cannot set timer: %s", strerror(errno));
break;
}
}
} }
if (isatty(fileno(stdout))) if (isatty(fileno(stdout)))
printf("\n%d bytes read\n", read); printf("\n%d bytes read\n", read);