mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mainloop-test: Disarm io callback on EOF

Browse source 
Mainloop test uses io callback for PA_IO_EVENT_INPUT on stdin.

With glib enabled PA_IO_EVENT_INPUT translates to glib G_IO_IN event which also
matches descriptor in EOF state. While io callback does not check for EOF after
reading from file descriptor this is causing mainloop-test to repeatedly read 0
bytes once EOF is reached, rearm defer callback and spam test log.

Fix this by disarming io callback when EOF is reached in test run.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/625>
This commit is contained in:
Igor V. Kovalenko 2021-08-30 10:02:34 +03:00
parent 53e3b53408
commit 10384d807f
1 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/tests/mainloop-test.c
View file

@ -42,13 +42,31 @@ static GMainLoop* glib_main_loop = NULL;
#include <pulse/mainloop.h> #include <pulse/mainloop.h>
#endif /* GLIB_MAIN_LOOP */ #endif /* GLIB_MAIN_LOOP */
static pa_defer_event *de; typedef struct mainloop_events {
pa_defer_event *de;
pa_io_event *ioe;
pa_time_event *te;
} mainloop_events;
static void iocb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) { static void iocb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
mainloop_events *me = userdata;
unsigned char c; unsigned char c;
pa_assert_se(read(fd, &c, sizeof(c)) >= 0); int r;
pa_assert_se(e == me->ioe);
r = read(fd, &c, sizeof(c));
pa_assert_se(r >= 0);
if (!r) {
fprintf(stderr, "IO EVENT: EOF\n");
a->io_free(me->ioe);
me->ioe = NULL;
return;
}
fprintf(stderr, "IO EVENT: %c\n", c < 32 ? '.' : c); fprintf(stderr, "IO EVENT: %c\n", c < 32 ? '.' : c);
a->defer_enable(de, 1); a->defer_enable(me->de, 1);
} }
static void dcb(pa_mainloop_api*a, pa_defer_event *e, void *userdata) { static void dcb(pa_mainloop_api*a, pa_defer_event *e, void *userdata) {
@ -68,8 +86,7 @@ static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, v
START_TEST (mainloop_test) { START_TEST (mainloop_test) {
pa_mainloop_api *a; pa_mainloop_api *a;
pa_io_event *ioe; mainloop_events me;
pa_time_event *te;
struct timeval tv; struct timeval tv;
#ifdef GLIB_MAIN_LOOP #ifdef GLIB_MAIN_LOOP
@ -93,13 +110,13 @@ START_TEST (mainloop_test) {
fail_if(!a); fail_if(!a);
#endif /* GLIB_MAIN_LOOP */ #endif /* GLIB_MAIN_LOOP */
ioe = a->io_new(a, 0, PA_IO_EVENT_INPUT, iocb, NULL); me.ioe = a->io_new(a, 0, PA_IO_EVENT_INPUT, iocb, &me);
fail_if(!ioe); fail_if(!me.ioe);
de = a->defer_new(a, dcb, NULL); me.de = a->defer_new(a, dcb, &me);
fail_if(!de); fail_if(!me.de);
te = a->time_new(a, pa_timeval_rtstore(&tv, pa_rtclock_now() + 2 * PA_USEC_PER_SEC, true), tcb, NULL); me.te = a->time_new(a, pa_timeval_rtstore(&tv, pa_rtclock_now() + 2 * PA_USEC_PER_SEC, true), tcb, &me);
#if defined(GLIB_MAIN_LOOP) #if defined(GLIB_MAIN_LOOP)
g_main_loop_run(glib_main_loop); g_main_loop_run(glib_main_loop);
@ -107,9 +124,12 @@ START_TEST (mainloop_test) {
pa_mainloop_run(m, NULL); pa_mainloop_run(m, NULL);
#endif #endif
a->time_free(te); if (me.te)
a->defer_free(de); a->time_free(me.te);
a->io_free(ioe); if (me.de)
a->defer_free(me.de);
if (me.ioe)
a->io_free(me.ioe);
#ifdef GLIB_MAIN_LOOP #ifdef GLIB_MAIN_LOOP
pa_glib_mainloop_free(g); pa_glib_mainloop_free(g);