summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-16 20:24:52 +0200
committerwm4 <wm4@nowhere>2016-09-16 20:24:52 +0200
commit4395a4f83709a538538cee9d14de522c024b1713 (patch)
tree8b0dabf5261c7a3b3946fc000e5d3547c7212a39 /misc
parent56616b0b013cbeae69555ae95ff577482e82bb1f (diff)
downloadmpv-4395a4f83709a538538cee9d14de522c024b1713.tar.bz2
mpv-4395a4f83709a538538cee9d14de522c024b1713.tar.xz
player: don't enter playloop for client API requests
This _actually_ does what commit 8716c2e8 promised, and gives a slight performance improvement for client API users which make a lot of requests (like reading properties). The main issue was that mp_dispatch_lock() (which client.c uses to get exclusive access to the core) still called the wakeup callback, which made mp_dispatch_queue_process() exit. So the playloop got executed again, and since it does a lot of stuff, performance could be reduced.
Diffstat (limited to 'misc')
-rw-r--r--misc/dispatch.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/misc/dispatch.c b/misc/dispatch.c
index 40729d9e8d..086896ba79 100644
--- a/misc/dispatch.c
+++ b/misc/dispatch.c
@@ -122,6 +122,10 @@ static void mp_dispatch_append(struct mp_dispatch_queue *queue,
// Wake up the main thread; note that other threads might wait on this
// condition for reasons, so broadcast the condition.
pthread_cond_broadcast(&queue->cond);
+ // No wakeup callback -> assume mp_dispatch_queue_process() needs to be
+ // interrupted instead.
+ if (!queue->wakeup_fn)
+ queue->interrupted = true;
pthread_mutex_unlock(&queue->lock);
if (queue->wakeup_fn)
queue->wakeup_fn(queue->wakeup_ctx);