From 92e4fb318e5f1e483911ed44743115bae1d0fd54 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Jun 2008 19:45:57 +0000
Subject: merge Colin Guthrie's module-always-sink module, and add priorization
 to the hook subsystem while doing so.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2516 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pulsecore/hook-list.c | 37 +++++++++++++++++++++----------------
 src/pulsecore/hook-list.h | 14 ++++++++++----
 2 files changed, 31 insertions(+), 20 deletions(-)

(limited to 'src/pulsecore')

diff --git a/src/pulsecore/hook-list.c b/src/pulsecore/hook-list.c
index 3a6874c4..5d306faa 100644
--- a/src/pulsecore/hook-list.c
+++ b/src/pulsecore/hook-list.c
@@ -33,8 +33,7 @@ void pa_hook_init(pa_hook *hook, void *data) {
     pa_assert(hook);
 
     PA_LLIST_HEAD_INIT(pa_hook_slot, hook->slots);
-    hook->last = NULL;
-    hook->n_dead = hook->firing = 0;
+    hook->n_dead = hook->n_firing = 0;
     hook->data = data;
 }
 
@@ -42,9 +41,6 @@ static void slot_free(pa_hook *hook, pa_hook_slot *slot) {
     pa_assert(hook);
     pa_assert(slot);
 
-    if (hook->last == slot)
-        hook->last = slot->prev;
-
     PA_LLIST_REMOVE(pa_hook_slot, hook->slots, slot);
 
     pa_xfree(slot);
@@ -52,7 +48,7 @@ static void slot_free(pa_hook *hook, pa_hook_slot *slot) {
 
 void pa_hook_free(pa_hook *hook) {
     pa_assert(hook);
-    pa_assert(!hook->firing);
+    pa_assert(hook->n_firing == 0);
 
     while (hook->slots)
         slot_free(hook, hook->slots);
@@ -60,19 +56,26 @@ void pa_hook_free(pa_hook *hook) {
     pa_hook_init(hook, NULL);
 }
 
-pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t cb, void *data) {
-    pa_hook_slot *slot;
+pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data) {
+    pa_hook_slot *slot, *where, *prev;
 
     pa_assert(cb);
 
     slot = pa_xnew(pa_hook_slot, 1);
     slot->hook = hook;
-    slot->dead = 0;
+    slot->dead = FALSE;
     slot->callback = cb;
     slot->data = data;
+    slot->priority = prio;
+
+    prev = NULL;
+    for (where = hook->slots; where; where = where->next) {
+        if (prio < where->priority)
+            break;
+        prev = where;
+    }
 
-    PA_LLIST_INSERT_AFTER(pa_hook_slot, hook->slots, hook->last, slot);
-    hook->last = slot;
+    PA_LLIST_INSERT_AFTER(pa_hook_slot, hook->slots, prev, slot);
 
     return slot;
 }
@@ -81,8 +84,8 @@ void pa_hook_slot_free(pa_hook_slot *slot) {
     pa_assert(slot);
     pa_assert(!slot->dead);
 
-    if (slot->hook->firing > 0) {
-        slot->dead = 1;
+    if (slot->hook->n_firing > 0) {
+        slot->dead = TRUE;
         slot->hook->n_dead++;
     } else
         slot_free(slot->hook, slot);
@@ -94,7 +97,7 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
 
     pa_assert(hook);
 
-    hook->firing ++;
+    hook->n_firing ++;
 
     for (slot = hook->slots; slot; slot = slot->next) {
         if (slot->dead)
@@ -104,7 +107,8 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
             break;
     }
 
-    hook->firing --;
+    hook->n_firing --;
+    pa_assert(hook->n_firing >= 0);
 
     for (slot = hook->slots; hook->n_dead > 0 && slot; slot = next) {
         next = slot->next;
@@ -115,6 +119,7 @@ pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
         }
     }
 
+    pa_assert(hook->n_dead == 0);
+
     return result;
 }
-
diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h
index c288980d..d91f6f4d 100644
--- a/src/pulsecore/hook-list.h
+++ b/src/pulsecore/hook-list.h
@@ -38,14 +38,21 @@ typedef enum pa_hook_result {
     PA_HOOK_CANCEL = -1
 } pa_hook_result_t;
 
+typedef enum pa_hook_priority {
+    PA_HOOK_EARLY = -100,
+    PA_HOOK_NORMAL = 0,
+    PA_HOOK_LATE = 100
+} pa_hook_priority_t;
+
 typedef pa_hook_result_t (*pa_hook_cb_t)(
         void *hook_data,
         void *call_data,
         void *slot_data);
 
 struct pa_hook_slot {
-    int dead;
+    pa_bool_t dead;
     pa_hook *hook;
+    pa_hook_priority_t priority;
     pa_hook_cb_t callback;
     void *data;
     PA_LLIST_FIELDS(pa_hook_slot);
@@ -53,8 +60,7 @@ struct pa_hook_slot {
 
 struct pa_hook {
     PA_LLIST_HEAD(pa_hook_slot, slots);
-    pa_hook_slot *last;
-    int firing, n_dead;
+    int n_firing, n_dead;
 
     void *data;
 };
@@ -62,7 +68,7 @@ struct pa_hook {
 void pa_hook_init(pa_hook *hook, void *data);
 void pa_hook_free(pa_hook *hook);
 
-pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t, void *data);
+pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data);
 void pa_hook_slot_free(pa_hook_slot *slot);
 
 pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data);
-- 
cgit