[pulseaudio-commits] r1731 - /branches/lennart/src/pulsecore/idxset.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Thu Aug 30 15:43:36 PDT 2007
Author: lennart
Date: Fri Aug 31 00:43:35 2007
New Revision: 1731
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1731&root=3Dpulseaudio&vi=
ew=3Drev
Log:
modernize and make use of a static flist for allocating idxset entries
Modified:
branches/lennart/src/pulsecore/idxset.c
Modified: branches/lennart/src/pulsecore/idxset.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
idxset.c?rev=3D1731&root=3Dpulseaudio&r1=3D1730&r2=3D1731&view=3Ddiff
=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
--- branches/lennart/src/pulsecore/idxset.c (original)
+++ branches/lennart/src/pulsecore/idxset.c Fri Aug 31 00:43:35 2007
@@ -27,32 +27,34 @@
#endif
=
#include <stdio.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
=
#include <pulse/xmalloc.h>
#include <pulsecore/macro.h>
+#include <pulsecore/flist.h>
=
#include "idxset.h"
=
-typedef struct idxset_entry {
+struct idxset_entry {
void *data;
uint32_t index;
unsigned hash_value;
=
struct idxset_entry *hash_prev, *hash_next;
struct idxset_entry* iterate_prev, *iterate_next;
-} idxset_entry;
+};
=
struct pa_idxset {
pa_hash_func_t hash_func;
pa_compare_func_t compare_func;
=
unsigned hash_table_size, n_entries;
- idxset_entry **hash_table, **array, *iterate_list_head, *iterate_list_=
tail;
+ struct idxset_entry **hash_table, **array, *iterate_list_head, *iterat=
e_list_tail;
uint32_t index, start_index, array_size;
};
+
+PA_STATIC_FLIST_DECLARE(entries, 0, pa_xfree);
=
unsigned pa_idxset_string_hash_func(const void *p) {
unsigned hash =3D 0;
@@ -83,7 +85,7 @@
s->hash_func =3D hash_func ? hash_func : pa_idxset_trivial_hash_func;
s->compare_func =3D compare_func ? compare_func : pa_idxset_trivial_co=
mpare_func;
s->hash_table_size =3D 127;
- s->hash_table =3D pa_xnew0(idxset_entry*, s->hash_table_size);
+ s->hash_table =3D pa_xnew0(struct idxset_entry*, s->hash_table_size);
s->array =3D NULL;
s->array_size =3D 0;
s->index =3D 0;
@@ -96,15 +98,17 @@
}
=
void pa_idxset_free(pa_idxset *s, void (*free_func) (void *p, void *userda=
ta), void *userdata) {
- assert(s);
+ pa_assert(s);
=
while (s->iterate_list_head) {
- idxset_entry *e =3D s->iterate_list_head;
+ struct idxset_entry *e =3D s->iterate_list_head;
s->iterate_list_head =3D s->iterate_list_head->iterate_next;
=
if (free_func)
free_func(e->data, userdata);
- pa_xfree(e);
+
+ if (pa_flist_push(PA_STATIC_FLIST_GET(entries), e) < 0)
+ pa_xfree(e);
}
=
pa_xfree(s->hash_table);
@@ -112,10 +116,10 @@
pa_xfree(s);
}
=
-static idxset_entry* hash_scan(pa_idxset *s, idxset_entry* e, const void *=
p) {
- assert(p);
-
- assert(s->compare_func);
+static struct idxset_entry* hash_scan(pa_idxset *s, struct idxset_entry* e=
, const void *p) {
+ pa_assert(p);
+
+ pa_assert(s->compare_func);
for (; e; e =3D e->hash_next)
if (s->compare_func(e->data, p) =3D=3D 0)
return e;
@@ -125,8 +129,10 @@
=
static void extend_array(pa_idxset *s, uint32_t idx) {
uint32_t i, j, l;
- idxset_entry** n;
- assert(idx >=3D s->start_index);
+ struct idxset_entry** n;
+
+ pa_assert(s);
+ pa_assert(idx >=3D s->start_index);
=
if (idx < s->start_index + s->array_size)
return;
@@ -136,7 +142,7 @@
break;
=
l =3D idx - s->start_index - i + 100;
- n =3D pa_xnew0(idxset_entry*, l);
+ n =3D pa_xnew0(struct idxset_entry*, l);
=
for (j =3D 0; j < s->array_size-i; j++)
n[j] =3D s->array[i+j];
@@ -148,7 +154,9 @@
s->start_index +=3D i;
}
=
-static idxset_entry** array_index(pa_idxset*s, uint32_t idx) {
+static struct idxset_entry** array_index(pa_idxset*s, uint32_t idx) {
+ pa_assert(s);
+ =
if (idx >=3D s->start_index + s->array_size)
return NULL;
=
@@ -160,15 +168,15 @@
=
int pa_idxset_put(pa_idxset*s, void *p, uint32_t *idx) {
unsigned h;
- idxset_entry *e, **a;
-
- assert(s);
- assert(p);
-
- assert(s->hash_func);
+ struct idxset_entry *e, **a;
+
+ pa_assert(s);
+ pa_assert(p);
+
+ pa_assert(s->hash_func);
h =3D s->hash_func(p) % s->hash_table_size;
=
- assert(s->hash_table);
+ pa_assert(s->hash_table);
if ((e =3D hash_scan(s, s->hash_table[h], p))) {
if (idx)
*idx =3D e->index;
@@ -176,7 +184,8 @@
return -1;
}
=
- e =3D pa_xmalloc(sizeof(idxset_entry));
+ if (!(e =3D pa_flist_pop(PA_STATIC_FLIST_GET(entries))))
+ e =3D pa_xnew(struct idxset_entry, 1);
e->data =3D p;
e->index =3D s->index++;
e->hash_value =3D h;
@@ -191,23 +200,23 @@
/* Insert into array */
extend_array(s, e->index);
a =3D array_index(s, e->index);
- assert(a && !*a);
+ pa_assert(a && !*a);
*a =3D e;
=
/* Insert into linked list */
e->iterate_next =3D NULL;
e->iterate_prev =3D s->iterate_list_tail;
if (s->iterate_list_tail) {
- assert(s->iterate_list_head);
+ pa_assert(s->iterate_list_head);
s->iterate_list_tail->iterate_next =3D e;
} else {
- assert(!s->iterate_list_head);
+ pa_assert(!s->iterate_list_head);
s->iterate_list_head =3D e;
}
s->iterate_list_tail =3D e;
=
s->n_entries++;
- assert(s->n_entries >=3D 1);
+ pa_assert(s->n_entries >=3D 1);
=
if (idx)
*idx =3D e->index;
@@ -216,8 +225,8 @@
}
=
void* pa_idxset_get_by_index(pa_idxset*s, uint32_t idx) {
- idxset_entry **a;
- assert(s);
+ struct idxset_entry **a;
+ pa_assert(s);
=
if (!(a =3D array_index(s, idx)))
return NULL;
@@ -230,13 +239,15 @@
=
void* pa_idxset_get_by_data(pa_idxset*s, const void *p, uint32_t *idx) {
unsigned h;
- idxset_entry *e;
- assert(s && p);
-
- assert(s->hash_func);
+ struct idxset_entry *e;
+ =
+ pa_assert(s);
+ pa_assert(p);
+
+ pa_assert(s->hash_func);
h =3D s->hash_func(p) % s->hash_table_size;
=
- assert(s->hash_table);
+ pa_assert(s->hash_table);
if (!(e =3D hash_scan(s, s->hash_table[h], p)))
return NULL;
=
@@ -246,13 +257,15 @@
return e->data;
}
=
-static void remove_entry(pa_idxset *s, idxset_entry *e) {
- idxset_entry **a;
- assert(s && e);
+static void remove_entry(pa_idxset *s, struct idxset_entry *e) {
+ struct idxset_entry **a;
+ =
+ pa_assert(s);
+ pa_assert(e);
=
/* Remove from array */
a =3D array_index(s, e->index);
- assert(a && *a && *a =3D=3D e);
+ pa_assert(a && *a && *a =3D=3D e);
*a =3D NULL;
=
/* Remove from linked list */
@@ -275,17 +288,18 @@
else
s->hash_table[e->hash_value] =3D e->hash_next;
=
- pa_xfree(e);
-
- assert(s->n_entries >=3D 1);
+ if (pa_flist_push(PA_STATIC_FLIST_GET(entries), e) < 0)
+ pa_xfree(e);
+
+ pa_assert(s->n_entries >=3D 1);
s->n_entries--;
}
=
void* pa_idxset_remove_by_index(pa_idxset*s, uint32_t idx) {
- idxset_entry **a;
+ struct idxset_entry **a;
void *data;
=
- assert(s);
+ pa_assert(s);
=
if (!(a =3D array_index(s, idx)))
return NULL;
@@ -300,14 +314,16 @@
}
=
void* pa_idxset_remove_by_data(pa_idxset*s, const void *data, uint32_t *id=
x) {
- idxset_entry *e;
+ struct idxset_entry *e;
unsigned h;
void *r;
=
- assert(s->hash_func);
+ pa_assert(s);
+
+ pa_assert(s->hash_func);
h =3D s->hash_func(data) % s->hash_table_size;
=
- assert(s->hash_table);
+ pa_assert(s->hash_table);
if (!(e =3D hash_scan(s, s->hash_table[h], data)))
return NULL;
=
@@ -321,8 +337,10 @@
}
=
void* pa_idxset_rrobin(pa_idxset *s, uint32_t *idx) {
- idxset_entry **a, *e =3D NULL;
- assert(s && idx);
+ struct idxset_entry **a, *e =3D NULL;
+ =
+ pa_assert(s);
+ pa_assert(idx);
=
if ((a =3D array_index(s, *idx)) && *a)
e =3D (*a)->iterate_next;
@@ -338,7 +356,7 @@
}
=
void* pa_idxset_first(pa_idxset *s, uint32_t *idx) {
- assert(s);
+ pa_assert(s);
=
if (!s->iterate_list_head)
return NULL;
@@ -349,9 +367,10 @@
}
=
void *pa_idxset_next(pa_idxset *s, uint32_t *idx) {
- idxset_entry **a, *e =3D NULL;
- assert(s);
- assert(idx);
+ struct idxset_entry **a, *e =3D NULL;
+ =
+ pa_assert(s);
+ pa_assert(idx);
=
if ((a =3D array_index(s, *idx)) && *a)
e =3D (*a)->iterate_next;
@@ -366,13 +385,15 @@
}
=
int pa_idxset_foreach(pa_idxset*s, int (*func)(void *p, uint32_t idx, int =
*del, void*userdata), void *userdata) {
- idxset_entry *e;
- assert(s && func);
+ struct idxset_entry *e;
+ =
+ pa_assert(s);
+ pa_assert(func);
=
e =3D s->iterate_list_head;
while (e) {
int del =3D 0, r;
- idxset_entry *n =3D e->iterate_next;
+ struct idxset_entry *n =3D e->iterate_next;
=
r =3D func(e->data, e->index, &del, userdata);
=
@@ -389,12 +410,14 @@
}
=
unsigned pa_idxset_size(pa_idxset*s) {
- assert(s);
+ pa_assert(s);
+ =
return s->n_entries;
}
=
int pa_idxset_isempty(pa_idxset *s) {
- assert(s);
+ pa_assert(s);
+ =
return s->n_entries =3D=3D 0;
}
=
More information about the pulseaudio-commits
mailing list