[pulseaudio-commits] r1402 - in /trunk/src/pulsecore: anotify.c anotify.h

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Sep 27 01:41:20 2006
New Revision: 1402

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1402&root=3Dpulseaudio&vi=
ew=3Drev
Log:
add asynchronous inter-thread notification API

Added:
    trunk/src/pulsecore/anotify.c   (with props)
    trunk/src/pulsecore/anotify.h   (with props)

Added: trunk/src/pulsecore/anotify.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/anotify.c?r=
ev=3D1402&root=3Dpulseaudio&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/anotify.c (added)
+++ trunk/src/pulsecore/anotify.c Wed Sep 27 01:41:20 2006
@@ -1,0 +1,143 @@
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+ =

+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ =

+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+ =

+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <pulse/xmalloc.h>
+
+#include "anotify.h"
+
+#define EVENTS_MAX 16
+
+struct pa_anotify {
+    pa_mainloop_api *api;
+    pa_anotify_cb_t callback;
+    void *userdata;
+    int fds[2];
+    pa_io_event *io_event;
+    pa_defer_event *defer_event;
+
+    uint8_t queued_events[EVENTS_MAX];
+    unsigned n_queued_events, queue_index;
+};
+
+static void dispatch_event(pa_anotify *a) {
+    assert(a);
+    assert(a->queue_index < a->n_queued_events);
+    =

+    a->callback(a->queued_events[a->queue_index++], a->userdata);
+
+    if (a->queue_index >=3D a->n_queued_events) {
+        a->n_queued_events =3D 0;
+        a->queue_index =3D 0;
+
+        a->api->io_enable(a->io_event, PA_IO_EVENT_INPUT);
+        a->api->defer_enable(a->defer_event, 0);
+    } else {
+        a->api->io_enable(a->io_event, 0);
+        a->api->defer_enable(a->defer_event, 1);
+    }
+}
+
+static void io_callback(
+        pa_mainloop_api *api,
+        pa_io_event *e,
+        int fd,
+        pa_io_event_flags_t events,
+        void *userdata) {
+    =

+    pa_anotify *a =3D userdata;
+    ssize_t r;
+
+    assert(a);
+    assert(events =3D=3D PA_IO_EVENT_INPUT);
+    assert(a->n_queued_events =3D=3D 0);
+    =

+    r =3D read(fd, a->queued_events, sizeof(a->queued_events));
+    assert(r > 0);
+
+    a->n_queued_events =3D (unsigned) r;
+    a->queue_index =3D 0;
+
+    /* Only dispatch a single event */
+    dispatch_event(a);
+}
+
+static void defer_callback(pa_mainloop_api *api, pa_defer_event *e, void *=
userdata) {
+    pa_anotify *a =3D userdata;
+    assert(a);
+
+    dispatch_event(a);
+}
+
+pa_anotify *pa_anotify_new(pa_mainloop_api*api, pa_anotify_cb_t cb, void *=
userdata) {
+    pa_anotify *a;
+    =

+    assert(api);
+    assert(cb);
+
+    a =3D pa_xnew(pa_anotify, 1);
+
+    if (pipe(a->fds) < 0) {
+        pa_xfree(a);
+        return NULL;
+    }
+    =

+    a->api =3D api;
+    a->callback =3D cb;
+    a->userdata =3D userdata;
+
+    a->io_event =3D api->io_new(api, a->fds[0], PA_IO_EVENT_INPUT, io_call=
back, a);
+    a->defer_event =3D api->defer_new(api, defer_callback, a);
+    a->api->defer_enable(a->defer_event, 0);
+
+    a->n_queued_events =3D 0;
+
+    return a;
+}
+
+void pa_anotify_free(pa_anotify *a) {
+    assert(a);
+
+    a->api->io_free(a->io_event);
+    a->api->defer_free(a->defer_event);
+
+    if (a->fds[0] >=3D 0)
+        close(a->fds[0]);
+    if (a->fds[1] >=3D 0)
+        close(a->fds[1]);
+    =

+    pa_xfree(a);
+}
+
+int pa_anotify_signal(pa_anotify *a, uint8_t event) {
+    ssize_t r;
+    assert(a);
+
+    r =3D write(a->fds[1], &event, 1);
+    return r !=3D 1 ? -1 : 0;
+}

Propchange: trunk/src/pulsecore/anotify.c
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Added: trunk/src/pulsecore/anotify.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/anotify.h?r=
ev=3D1402&root=3Dpulseaudio&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/anotify.h (added)
+++ trunk/src/pulsecore/anotify.h Wed Sep 27 01:41:20 2006
@@ -1,0 +1,38 @@
+#ifndef foopulseanotifyhfoo
+#define foopulseanotifyhfoo
+
+/* $Id$ */
+
+/***
+  This file is part of PulseAudio.
+ =

+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ =

+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ =

+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+/* Asynchronous thread-safe notification of mainloops */
+
+
+#include <inttypes.h>
+#include <pulse/mainloop-api.h>
+
+typedef struct pa_anotify pa_anotify;
+typedef void (*pa_anotify_cb_t)(uint8_t event, void *userdata);
+
+pa_anotify *pa_anotify_new(pa_mainloop_api*api, pa_anotify_cb_t cb, void *=
userdata);
+void pa_anotify_free(pa_anotify *a);
+int pa_anotify_signal(pa_anotify *a, uint8_t event);
+
+#endif

Propchange: trunk/src/pulsecore/anotify.h
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id