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

proxy: only call destroy once

Browse source 
Make sure only emit destroy once by making the proxy a zombie
from the first call to destroy. Also make sure we don't call destroy
twice without remove.
This commit is contained in:
Wim Taymans 2019-12-17 10:44:22 +01:00
parent 3c846fbb1d
commit 98c81fff93
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/pipewire/private.h
View file

@ -740,6 +740,7 @@ struct pw_proxy {
unsigned int zombie:1; /**< proxy is removed locally and waiting to unsigned int zombie:1; /**< proxy is removed locally and waiting to
* be removed from server */ * be removed from server */
unsigned int removed:1; /**< proxy was removed from server */ unsigned int removed:1; /**< proxy was removed from server */
unsigned int destroyed:1; /**< proxy was destroyed by client */
struct spa_hook_list listener_list; struct spa_hook_list listener_list;
struct spa_hook_list object_listener_list; struct spa_hook_list object_listener_list;

13
src/pipewire/proxy.c
View file

@ -22,6 +22,8 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <assert.h>
#include <pipewire/log.h> #include <pipewire/log.h>
#include <pipewire/proxy.h> #include <pipewire/proxy.h>
#include <pipewire/core.h> #include <pipewire/core.h>
@ -214,15 +216,20 @@ void pw_proxy_add_object_listener(struct pw_proxy *proxy,
SPA_EXPORT SPA_EXPORT
void pw_proxy_destroy(struct pw_proxy *proxy) void pw_proxy_destroy(struct pw_proxy *proxy)
{ {
assert(!proxy->destroyed);
proxy->destroyed = true;
pw_log_debug(NAME" %p: destroy id:%u removed:%u zombie:%u", proxy,
proxy->id, proxy->removed, proxy->zombie);
if (!proxy->zombie) { if (!proxy->zombie) {
pw_log_debug(NAME" %p: destroy %u", proxy, proxy->id); proxy->zombie = true;
pw_proxy_emit_destroy(proxy); pw_proxy_emit_destroy(proxy);
} }
if (!proxy->removed) { if (!proxy->removed) {
/* if the server did not remove this proxy, remove ourselves /* if the server did not remove this proxy, remove ourselves
* from the proxy objects and schedule a destroy. */ * from the proxy objects and schedule a destroy. */
if (proxy->core && !proxy->core->destroyed) { if (proxy->core && !proxy->core->destroyed) {
proxy->zombie = true;
pw_core_destroy(proxy->core, proxy); pw_core_destroy(proxy->core, proxy);
} else { } else {
proxy->removed = true; proxy->removed = true;
@ -239,12 +246,14 @@ void pw_proxy_destroy(struct pw_proxy *proxy)
void pw_proxy_remove(struct pw_proxy *proxy) void pw_proxy_remove(struct pw_proxy *proxy)
{ {
proxy->removed = true; proxy->removed = true;
proxy->destroyed = false;
pw_proxy_destroy(proxy); pw_proxy_destroy(proxy);
} }
SPA_EXPORT SPA_EXPORT
void pw_proxy_unref(struct pw_proxy *proxy) void pw_proxy_unref(struct pw_proxy *proxy)
{ {
assert(proxy->refcount > 0);
if (--proxy->refcount > 0) if (--proxy->refcount > 0)
return; return;