[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-76-g9adf7c5
Lennart Poettering
gitmailer-noreply at 0pointer.de
Fri Sep 26 09:51:36 PDT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 61887370219ea124ca9cbda3706c4d4704694a15 (commit)
- Log -----------------------------------------------------------------
9adf7c5... ignore bt proximity helper
3ad8c04... add a generic priority queue implementation
3e16d2f... make pa_idxset_trivial_compare_func() do a full compare instea of just equakity check
183f2e0... some minor fixes and cleanups in the bt code
-----------------------------------------------------------------------
Summary of changes:
src/.gitignore | 3 +-
src/Makefile.am | 9 +-
src/modules/bluetooth/module-bluetooth-discover.c | 48 ++--
src/pulsecore/idxset.c | 2 +-
src/pulsecore/prioq.c | 255 +++++++++++++++++++++
src/pulsecore/prioq.h | 64 +++++
src/tests/prioq-test.c | 44 ++++
7 files changed, 397 insertions(+), 28 deletions(-)
create mode 100644 src/pulsecore/prioq.c
create mode 100644 src/pulsecore/prioq.h
create mode 100644 src/tests/prioq-test.c
-----------------------------------------------------------------------
commit 183f2e0bffb527757780638b70020fab15ab6ec9
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 26 09:35:00 2008 -0700
some minor fixes and cleanups in the bt code
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 780135c..3e9763b 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -141,21 +141,21 @@ static void print_devices(struct device *device_list) {
while (device_list_i != NULL) {
struct uuid *uuid_list_i = device_list_i->uuid_list;
if (strcmp(device_list_i->object_path, "/DEVICE_HEAD") != 0) {
- pa_log(" [ %s ]", device_list_i->object_path);
- pa_log(" Name = %s", device_list_i->name);
- pa_log(" Paired = %d", device_list_i->paired);
- pa_log(" Adapter = %s", device_list_i->adapter->object_path);
- pa_log(" Alias = %s", device_list_i->alias);
- pa_log(" Connected = %d", device_list_i->connected);
- pa_log(" UUIDs = ");
+ pa_log_debug(" [ %s ]", device_list_i->object_path);
+ pa_log_debug(" Name = %s", device_list_i->name);
+ pa_log_debug(" Paired = %d", device_list_i->paired);
+ pa_log_debug(" Adapter = %s", device_list_i->adapter->object_path);
+ pa_log_debug(" Alias = %s", device_list_i->alias);
+ pa_log_debug(" Connected = %d", device_list_i->connected);
+ pa_log_debug(" UUIDs = ");
while (uuid_list_i != NULL) {
if (strcmp(uuid_list_i->uuid, "UUID_HEAD") != 0)
pa_log(" %s", uuid_list_i->uuid);
uuid_list_i = uuid_list_i->next;
}
- pa_log(" Address = %s", device_list_i->address);
- pa_log(" Class = 0x%x", device_list_i->class);
- pa_log(" Trusted = %d", device_list_i->trusted);
+ pa_log_debug(" Address = %s", device_list_i->address);
+ pa_log_debug(" Class = 0x%x", device_list_i->class);
+ pa_log_debug(" Trusted = %d", device_list_i->trusted);
}
device_list_i = device_list_i->next;
}
@@ -165,9 +165,9 @@ static void print_adapters(struct adapter *adapter_list) {
struct adapter *adapter_list_i = adapter_list;
while (adapter_list_i != NULL) {
if (strcmp(adapter_list_i->object_path, "/ADAPTER_HEAD") != 0) {
- pa_log("[ %s ]", adapter_list_i->object_path);
- pa_log(" Mode = %s", adapter_list_i->mode);
- pa_log(" Address = %s", adapter_list_i->address);
+ pa_log_debug("[ %s ]", adapter_list_i->object_path);
+ pa_log_debug(" Mode = %s", adapter_list_i->mode);
+ pa_log_debug(" Address = %s", adapter_list_i->address);
print_devices(adapter_list_i->device_list);
}
adapter_list_i = adapter_list_i->next;
@@ -260,7 +260,7 @@ static void detect_devices(struct userdata *u) {
struct adapter *adapter_list_i;
struct device *device_list_i;
const char *key, *value;
- unsigned int uvalue;
+ int32_t ivalue;
pa_assert(u);
dbus_error_init(&e);
@@ -326,16 +326,16 @@ static void detect_devices(struct userdata *u) {
device_list_i->name = pa_xstrdup(value);
}
else if (strcmp(key, "Paired") == 0) {
- dbus_message_iter_get_basic(&variant_i, &uvalue);
- device_list_i->paired = uvalue;
+ dbus_message_iter_get_basic(&variant_i, &ivalue);
+ device_list_i->paired = ivalue;
}
else if (strcmp(key, "Alias") == 0) {
dbus_message_iter_get_basic(&variant_i, &value);
device_list_i->alias = pa_xstrdup(value);
}
else if (strcmp(key, "Connected") == 0) {
- dbus_message_iter_get_basic(&variant_i, &uvalue);
- device_list_i->connected = uvalue;
+ dbus_message_iter_get_basic(&variant_i, &ivalue);
+ device_list_i->connected = ivalue;
}
else if (strcmp(key, "UUIDs") == 0) {
DBusMessageIter uuid_i;
@@ -363,12 +363,12 @@ static void detect_devices(struct userdata *u) {
device_list_i->address = pa_xstrdup(value);
}
else if (strcmp(key, "Class") == 0) {
- dbus_message_iter_get_basic(&variant_i, &uvalue);
- device_list_i->class = uvalue;
+ dbus_message_iter_get_basic(&variant_i, &ivalue);
+ device_list_i->class = ivalue;
}
else if (strcmp(key, "Trusted") == 0) {
- dbus_message_iter_get_basic(&variant_i, &uvalue);
- device_list_i->trusted = uvalue;
+ dbus_message_iter_get_basic(&variant_i, &ivalue);
+ device_list_i->trusted = ivalue;
}
}
dbus_message_iter_next(&element_i);
@@ -465,7 +465,6 @@ void pa__done(pa_module* m) {
pa_dbus_connection_unref(u->conn);
pa_xfree(u);
- pa_log("Unloading module-bt-discover");
return;
}
@@ -476,7 +475,6 @@ int pa__init(pa_module* m) {
struct userdata *u;
pa_assert(m);
- pa_log("Loading module-bt-discover");
dbus_error_init(&err);
m->userdata = u = pa_xnew0(struct userdata, 1);
u->module = m;
@@ -500,7 +498,7 @@ int pa__init(pa_module* m) {
while (adapter_list_i != NULL) {
device_list_i = adapter_list_i->device_list;
while (device_list_i != NULL) {
- pa_log("Loading module-bt-device for %s", device_list_i->name);
+ pa_log_debug("Loading module-bt-device for %s", device_list_i->name);
/* TODO: call module */
device_list_i = device_list_i->next;
}
commit 3e16d2f40d5a9bcd3c64b291ee24c8be206f9f0a
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 26 09:35:49 2008 -0700
make pa_idxset_trivial_compare_func() do a full compare instea of just equakity check
diff --git a/src/pulsecore/idxset.c b/src/pulsecore/idxset.c
index 2de6406..24a28db 100644
--- a/src/pulsecore/idxset.c
+++ b/src/pulsecore/idxset.c
@@ -80,7 +80,7 @@ unsigned pa_idxset_trivial_hash_func(const void *p) {
}
int pa_idxset_trivial_compare_func(const void *a, const void *b) {
- return a != b;
+ return a < b ? -1 : (a > b ? 1 : 0);
}
pa_idxset* pa_idxset_new(pa_hash_func_t hash_func, pa_compare_func_t compare_func) {
commit 3ad8c0456499248c496025ed02df81143baa783c
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 26 09:49:52 2008 -0700
add a generic priority queue implementation
diff --git a/src/.gitignore b/src/.gitignore
index 543f4e8..3b80bc1 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+prioq-test
lock-autospawn-test
*.lo
*.o
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c92f91..14eb7f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -263,7 +263,8 @@ noinst_PROGRAMS = \
proplist-test \
rtstutter \
stripnul \
- lock-autospawn-test
+ lock-autospawn-test \
+ prioq-test
if HAVE_SIGXCPU
noinst_PROGRAMS += \
@@ -458,6 +459,11 @@ lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore.la
lock_autospawn_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
+prioq_test_SOURCES = tests/prioq-test.c
+prioq_test_LDADD = $(AM_LDADD) libpulsecore.la
+prioq_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
+prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
+
###################################
# Client library #
###################################
@@ -757,6 +763,7 @@ libpulsecore_la_SOURCES += \
pulsecore/g711.c pulsecore/g711.h \
pulsecore/hashmap.c pulsecore/hashmap.h \
pulsecore/idxset.c pulsecore/idxset.h \
+ pulsecore/prioq.c pulsecore/prioq.h \
pulsecore/log.c pulsecore/log.h \
pulsecore/mcalign.c pulsecore/mcalign.h \
pulsecore/memblock.c pulsecore/memblock.h \
diff --git a/src/pulsecore/prioq.c b/src/pulsecore/prioq.c
new file mode 100644
index 0000000..18bed14
--- /dev/null
+++ b/src/pulsecore/prioq.c
@@ -0,0 +1,255 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2008 Lennart Poettering
+
+ 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.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/flist.h>
+
+#include "prioq.h"
+
+struct pa_prioq_item {
+ void *value;
+ unsigned idx;
+};
+
+struct pa_prioq {
+ pa_prioq_item **items;
+ unsigned n_items;
+ unsigned n_allocated;
+ pa_compare_func_t compare_func;
+};
+
+PA_STATIC_FLIST_DECLARE(items, 0, pa_xfree);
+
+pa_prioq *pa_prioq_new(pa_compare_func_t compare_func) {
+
+ pa_prioq *q;
+
+ q = pa_xnew(pa_prioq, 1);
+ q->compare_func = compare_func;
+ q->n_items = 0;
+ q->n_allocated = 64;
+ q->items = pa_xnew(pa_prioq_item*, q->n_allocated);
+
+ return q;
+}
+
+void pa_prioq_free(pa_prioq *q, pa_free2_cb_t free_cb, void *userdata) {
+ pa_prioq_item **i, **e;
+
+ pa_assert(q);
+
+ for (i = q->items, e = q->items + q->n_items; i < e; i++) {
+
+ if (!*i)
+ continue;
+
+ if (free_cb)
+ free_cb((*i)->value, userdata);
+
+ pa_xfree(*i);
+ }
+
+ pa_xfree(q->items);
+ pa_xfree(q);
+}
+
+static void shuffle_up(pa_prioq *q, pa_prioq_item *i) {
+ pa_assert(q);
+ pa_assert(i);
+
+ j = i->idx;
+
+ while (j > 0) {
+ unsigned k;
+
+ k = (j-1)/2;
+
+ if (q->compare_func(q->items[k]->value, i->value) < 0)
+ break;
+
+ q->items[k]->idx = j;
+ q->items[j] = q->items[k];
+
+ j = k;
+ }
+
+ i->idx = j;
+ q->items[j] = i;
+
+}
+
+pa_prioq_item* pa_prioq_put(pa_prioq *q, void *p) {
+ pa_prioq_item *i;
+ unsigned j;
+
+ pa_assert(q);
+
+ if (q->n_items >= q->n_allocated) {
+ q->n_allocated = PA_MAX(q->n_items+1, q->n_allocated)*2;
+ q->items = pa_xrealloc(q->items, sizeof(pa_prioq_item*) * q->n_allocated);
+ }
+
+ if (!(i = pa_flist_pop(PA_STATIC_FLIST_GET(items))))
+ i = pa_xnew(pa_prioq_item, 1);
+
+ i->value = p;
+ i->idx = q->n_items++;
+
+ shuffle_up(q, i);
+
+ return i;
+}
+
+void* pa_prioq_peek(pa_prioq *q) {
+ pa_assert(q);
+
+ if (q->n_items <= 0)
+ return NULL;
+
+ return q->items[0]->value;
+}
+
+void* pa_prioq_pop(pa_prioq *q){
+ pa_assert(q);
+
+ if (q->n_items <= 0)
+ return NULL;
+
+ return pa_prioq_remove(q, q->items[0]);
+}
+
+static void swap(pa_prioq *q, unsigned j, unsigned k) {
+ pa_prioq_item *t;
+
+ pa_assert(q);
+ pa_assert(j < q->n_items);
+ pa_assert(k < q->n_items);
+
+ pa_assert(q->items[j]->idx == j);
+ pa_assert(q->items[k]->idx == k);
+
+ t = q->items[j];
+
+ q->items[j]->idx = k;
+ q->items[j] = q->items[k];
+
+ q->items[k]->idx = j;
+ q->items[k] = t;
+}
+
+static void shuffle_down(pa_prioq *q, unsigned idx) {
+
+ pa_assert(q);
+ pa_assert(idx < q->n_items);
+
+ for (;;) {
+ unsigned j, k, s;
+
+ k = (idx+1)*2; /* right child */
+ j = k-1; /* left child */
+
+ if (j >= q->n_items)
+ break;
+
+ if (q->compare_func(q->items[j]->value, q->items[idx]->value) < 0)
+
+ /* So our left child is smaller than we are, let's
+ * remember this fact */
+ s = j;
+ else
+ s = idx;
+
+ if (k < q->n_items &&
+ q->compare_func(q->items[k]->value, q->items[s]->value) < 0)
+
+ /* So our right child is smaller than we are, let's
+ * remember this fact */
+ s = k;
+
+ /* s now points to the smallest of the three items */
+
+ if (s == idx)
+ /* No swap necessary, we're done */
+ break;
+
+ swap(q, idx, s);
+ idx = s;
+ }
+}
+
+void* pa_prioq_remove(pa_prioq *q, pa_prioq_item *i) {
+ void *p;
+
+ pa_assert(q);
+ pa_assert(i);
+ pa_assert(q->n_items >= 1);
+
+ p = i->value;
+
+ if (q->n_items-1 == i->idx) {
+ /* We are the last entry, so let's just remove us and good */
+ q->n_items--;
+
+ } else {
+
+ /* We are not the last entry, we need to replace ourselves
+ * with the last node and reshuffle */
+
+ q->items[i->idx] = q->items[q->n_items-1];
+ q->items[i->idx]->idx = i->idx;
+ q->n_items--;
+
+ shuffle_down(q, i->idx);
+ }
+
+ if (pa_flist_push(PA_STATIC_FLIST_GET(items), i) < 0)
+ pa_xfree(i);
+
+ return p;
+}
+
+unsigned pa_prioq_size(pa_prioq *q) {
+ pa_assert(q);
+
+ return q->n_items;
+}
+
+pa_bool_t pa_prioq_isempty(pa_prioq *q) {
+ pa_assert(q);
+
+ return q->n_items == 0;
+}
+
+void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i) {
+ pa_assert(q);
+ pa_assert(i);
+
+ /* This will move the entry down as far as necessary */
+ shuffle_down(q, i->idx);
+
+ /* And this will move the entry up as far as necessary */
+ shuffle_up(q, i->idx);
+}
diff --git a/src/pulsecore/prioq.h b/src/pulsecore/prioq.h
new file mode 100644
index 0000000..85a6627
--- /dev/null
+++ b/src/pulsecore/prioq.h
@@ -0,0 +1,64 @@
+#ifndef foopulsecoreprioqhfoo
+#define foopulsecoreprioqhfoo
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2008 Lennart Poettering
+
+ 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.
+***/
+
+#include <inttypes.h>
+
+#include <pulsecore/macro.h>
+#include <pulsecore/idxset.h>
+
+/* A heap-based priority queue. Removal and insertion is O(log
+ * n). Removal can happen a the top or at any position referenced by a
+ * pa_prioq_item. */
+
+typedef struct pa_prioq pa_prioq;
+typedef struct pa_prioq_item pa_prioq_item;
+
+/* Instantiate a new prioq with the specified comparison functions */
+pa_prioq* pa_prioq_new(pa_compare_func_t compare_func);
+
+/* Free the prioq. When the prioq is not empty the specified function is called for every entry contained */
+void pa_prioq_free(pa_prioq *q, pa_free2_cb_t free_cb, void *userdata);
+
+/* Store a new item in the prioq. */
+pa_prioq_item* pa_prioq_put(pa_prioq *q, void* data);
+
+/* Get the item on the top of the queue, but don't remove it from the queue*/
+void* pa_prioq_peek(pa_prioq*q);
+
+/* Get the item on the top of the queue, and remove it from thq queue */
+void* pa_prioq_pop(pa_prioq*q);
+
+/* Remove an arbitrary from theq prioq, returning it's data */
+void* pa_prioq_remove(pa_prioq*q, pa_prioq_item *i);
+
+/* The priority of an item was modified. Adjustthe queue to that */
+void pa_prioq_reshuffle(pa_prioq *q, pa_prioq_item *i)
+
+/* Return the current number of items in the prioq */
+unsigned pa_prioq_size(pa_prioq*s);
+
+/* Return TRUE of the prioq is empty */
+pa_bool_t pa_prioq_isempty(pa_prioq *s);
+
+#endif
diff --git a/src/tests/prioq-test.c b/src/tests/prioq-test.c
new file mode 100644
index 0000000..120b512
--- /dev/null
+++ b/src/tests/prioq-test.c
@@ -0,0 +1,44 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulsecore/prioq.h>
+#include <pulsecore/macro.h>
+
+#define N 1024
+
+int main(int argc, char *argv[]) {
+ pa_prioq *q;
+ unsigned i;
+
+ srand(0);
+
+ q = pa_prioq_new(pa_idxset_trivial_compare_func);
+
+ /* Fill in 1024 */
+ for (i = 0; i < N; i++)
+ pa_prioq_put(q, PA_UINT_TO_PTR((unsigned) rand()));
+
+ /* Remove half of it again */
+ for (i = 0; i < N/2; i++){
+ unsigned u = PA_PTR_TO_UINT(pa_prioq_pop(q));
+ pa_log("%16u", u);
+ }
+
+ pa_log("Refilling");
+
+ /* Fill in another 1024 */
+ for (i = 0; i < N; i++)
+ pa_prioq_put(q, PA_UINT_TO_PTR((unsigned) rand()));
+
+
+ /* Remove everything */
+ while (!pa_prioq_isempty(q)) {
+ unsigned u = PA_PTR_TO_UINT(pa_prioq_pop(q));
+ pa_log("%16u", u);
+ }
+
+ pa_prioq_free(q, NULL, NULL);
+
+ return 0;
+}
commit 9adf7c56b8a17deed9bb980275226143f594099c
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Sep 26 09:51:25 2008 -0700
ignore bt proximity helper
diff --git a/src/.gitignore b/src/.gitignore
index 3b80bc1..72c38cc 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -9,7 +9,7 @@ Makefile
Makefile.in
asyncmsgq-test
asyncq-test
-bt-proximity-helper
+proximity-helper
channelmap-test
client.conf
close-test
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list