Attachment 115930 Details for Bug 89539 – patch to drop pa_rtpoll_quit()

[patch] patch to drop pa_rtpoll_quit()

0004-core-Don-t-export-pa_rtpoll_quit-only-used-internall.patch (text/plain), 1.93 KB, created by Peter Meerwald on 2015-05-20 20:41:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Meerwald

Created: 2015-05-20 20:41:04 UTC

Size: 1.93 KB

patch

obsolete

>From 952650690bda23e7e27e9f1fbdb8f77a962b99e7 Mon Sep 17 00:00:00 2001
>From: Peter Meerwald <p.meerwald@bct-electronic.com>
>Date: Wed, 20 May 2015 16:12:43 +0200
>Subject: [PATCH] core: Don't export pa_rtpoll_quit(), only used internally
>
>see https://bugs.freedesktop.org/show_bug.cgi?id=89539
>
>Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
>---
> src/pulsecore/rtpoll.c | 11 ++++-------
> src/pulsecore/rtpoll.h |  4 ----
> 2 files changed, 4 insertions(+), 11 deletions(-)
>
>diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
>index f427ef3..a6d323b 100644
>--- a/src/pulsecore/rtpoll.c
>+++ b/src/pulsecore/rtpoll.c
>@@ -557,7 +557,10 @@ static int asyncmsgq_read_work(pa_rtpoll_item *i) {
> 
>         if (!object && code == PA_MESSAGE_SHUTDOWN) {
>             pa_asyncmsgq_done(i->userdata, 0);
>-            pa_rtpoll_quit(i->rtpoll);
>+            /* Requests the loop to exit. Will cause the next iteration of
>+             * pa_rtpoll_run() to return 0 */
>+            pa_assert(i->rtpoll);
>+            i->rtpoll->quit = true;
>             return 1;
>         }
> 
>@@ -625,12 +628,6 @@ pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_write(pa_rtpoll *p, pa_rtpoll_prior
>     return i;
> }
> 
>-void pa_rtpoll_quit(pa_rtpoll *p) {
>-    pa_assert(p);
>-
>-    p->quit = true;
>-}
>-
> bool pa_rtpoll_timer_elapsed(pa_rtpoll *p) {
>     pa_assert(p);
> 
>diff --git a/src/pulsecore/rtpoll.h b/src/pulsecore/rtpoll.h
>index 4f09ab8..8f0715a 100644
>--- a/src/pulsecore/rtpoll.h
>+++ b/src/pulsecore/rtpoll.h
>@@ -98,8 +98,4 @@ pa_rtpoll_item *pa_rtpoll_item_new_fdsem(pa_rtpoll *p, pa_rtpoll_priority_t prio
> pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_read(pa_rtpoll *p, pa_rtpoll_priority_t prio, pa_asyncmsgq *q);
> pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_write(pa_rtpoll *p, pa_rtpoll_priority_t prio, pa_asyncmsgq *q);
> 
>-/* Requests the loop to exit. Will cause the next iteration of
>- * pa_rtpoll_run() to return 0 */
>-void pa_rtpoll_quit(pa_rtpoll *p);
>-
> #endif
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 89539: 115930

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.