mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: protect time updates with atomic seqlock

Browse source
This commit is contained in:
Wim Taymans 2018-09-21 16:39:06 +02:00
parent 3af7b42193
commit 375df60384
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pipewire/stream.c
View file

@ -125,7 +125,7 @@ struct stream {
bool free_data; bool free_data;
struct data data; struct data data;
uint32_t seq1, seq2; uintptr_t seq;
struct pw_time time; struct pw_time time;
}; };
@ -647,13 +647,13 @@ static int process_notify(struct stream *impl, struct spa_pod_sequence *sequence
static inline void copy_quantum(struct stream *impl, int64_t queued) static inline void copy_quantum(struct stream *impl, int64_t queued)
{ {
struct pw_driver_quantum *q = impl->node->rt.quantum; struct pw_driver_quantum *q = impl->node->rt.quantum;
impl->seq1++; __atomic_add_fetch(&impl->seq, 1, __ATOMIC_SEQ_CST);
impl->time.now = q->nsec; impl->time.now = q->nsec;
impl->time.rate = q->rate; impl->time.rate = q->rate;
impl->time.ticks = q->position; impl->time.ticks = q->position;
impl->time.delay = q->delay; impl->time.delay = q->delay;
impl->time.queued = queued; impl->time.queued = queued;
impl->seq2 = impl->seq1; __atomic_add_fetch(&impl->seq, 1, __ATOMIC_SEQ_CST);
if (impl->io_control) if (impl->io_control)
process_control(impl, &impl->io_control->sequence); process_control(impl, &impl->io_control->sequence);
@ -1143,12 +1143,13 @@ int pw_stream_set_active(struct pw_stream *stream, bool active)
int pw_stream_get_time(struct pw_stream *stream, struct pw_time *time) int pw_stream_get_time(struct pw_stream *stream, struct pw_time *time)
{ {
struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this); struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
uint32_t seq; uintptr_t seq1, seq2;
do { do {
seq = impl->seq2; seq1 = __atomic_load_n(&impl->seq, __ATOMIC_SEQ_CST);
*time = impl->time; *time = impl->time;
} while (impl->seq1 != seq); seq2 = __atomic_load_n(&impl->seq, __ATOMIC_SEQ_CST);
} while (seq1 != seq2 || seq1 & 1);
if (impl->direction == SPA_DIRECTION_INPUT) if (impl->direction == SPA_DIRECTION_INPUT)
time->queued = (int64_t)(time->queued - impl->dequeued.outcount); time->queued = (int64_t)(time->queued - impl->dequeued.outcount);