aupdate: implicitly call _write_swap() if it wasn't called explicitly

This commit is contained in:
Lennart Poettering 2009-08-16 02:02:51 +02:00
parent 8dd0d871a7
commit 01e4b61a91
2 changed files with 12 additions and 0 deletions

View file

@ -39,6 +39,7 @@ struct pa_aupdate {
pa_atomic_t read_lock; pa_atomic_t read_lock;
pa_mutex *write_lock; pa_mutex *write_lock;
pa_semaphore *semaphore; pa_semaphore *semaphore;
pa_bool_t swapped;
}; };
pa_aupdate *pa_aupdate_new(void) { pa_aupdate *pa_aupdate_new(void) {
@ -101,6 +102,8 @@ unsigned pa_aupdate_write_begin(pa_aupdate *a) {
n = (unsigned) pa_atomic_load(&a->read_lock); n = (unsigned) pa_atomic_load(&a->read_lock);
a->swapped = FALSE;
return !WHICH(n); return !WHICH(n);
} }
@ -119,11 +122,16 @@ unsigned pa_aupdate_write_swap(pa_aupdate *a) {
break; break;
} }
a->swapped = TRUE;
return WHICH(n); return WHICH(n);
} }
void pa_aupdate_write_end(pa_aupdate *a) { void pa_aupdate_write_end(pa_aupdate *a) {
pa_assert(a); pa_assert(a);
if (!a->swapped)
pa_aupdate_write_swap(a);
pa_mutex_unlock(a->write_lock); pa_mutex_unlock(a->write_lock);
} }

View file

@ -93,6 +93,10 @@ unsigned pa_aupdate_write_swap(pa_aupdate *a);
* pa_update_write_end(a) * pa_update_write_end(a)
* } * }
* *
* In some cases keeping both structures up-to-date might not be
* necessary, since they are fully rebuilt on each iteration
* anyway. In that case you may leave the _write_swap() call out, it
* will then be done implicitly in the _write_end() invocation.
*/ */
#endif #endif