From 9e60fd0b57f0607237ffd972f88d421eb56e7b5f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 17 Sep 2018 12:24:15 +0200
Subject: [PATCH] stream: improve cleanup

Destroy proxies before disconnect, they might still need the connection.
Destroy the stream related objects when the stream node is destroyed.
Don't try to remove the mainloop sources from the data loop.
Don't try to create properties in _connect, we already created them
in _new.
In disconnect, make the server destroy the node and destroy our local
proxy.
---
 src/pipewire/remote.c | 11 +++++-----
 src/pipewire/stream.c | 47 +++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c
index 99a3c689c..26e656806 100644
--- a/src/pipewire/remote.c
+++ b/src/pipewire/remote.c
@@ -180,11 +180,10 @@ static void core_event_remove_id(void *data, uint32_t id)
 	struct pw_remote *this = data;
 	struct pw_proxy *proxy;
 
-	proxy = pw_map_lookup(&this->objects, id);
-	if (proxy) {
-		pw_log_debug("remote %p: object remove %u", this, id);
+	pw_log_debug("remote %p: object remove %u", this, id);
+	if ((proxy = pw_map_lookup(&this->objects, id)) != NULL)
 		pw_proxy_destroy(proxy);
-	}
+
 	pw_map_remove(&this->objects, id);
 }
 
@@ -442,12 +441,12 @@ int pw_remote_disconnect(struct pw_remote *remote)
 	spa_list_for_each_safe(stream, s2, &remote->stream_list, link)
 		pw_stream_disconnect(stream);
 
-	pw_protocol_client_disconnect (remote->conn);
-
 	spa_list_for_each_safe(proxy, t2, &remote->proxy_list, link)
 		pw_proxy_destroy(proxy);
 	remote->core_proxy = NULL;
 
+	pw_protocol_client_disconnect (remote->conn);
+
 	pw_map_clear(&remote->objects);
 	pw_map_clear(&remote->types);
 	remote->n_types = 0;
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index c7736be8e..fa8922c16 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -229,7 +229,7 @@ static void clear_buffers(struct pw_stream *stream)
 	struct buffer *b;
 	int i, j;
 
-	pw_log_debug("stream %p: clear buffers", stream);
+	pw_log_debug("stream %p: clear %d buffers", stream, impl->n_buffers);
 
 	for (i = 0; i < impl->n_buffers; i++) {
 		b = &impl->buffers[i];
@@ -534,33 +534,21 @@ void pw_stream_destroy(struct pw_stream *stream)
 
 	pw_stream_events_destroy(stream);
 
-	if (impl->node_proxy)
-		spa_hook_remove(&impl->proxy_listener);
-
 	pw_stream_disconnect(stream);
 
 	spa_list_remove(&stream->link);
 
-	set_init_params(stream, 0, NULL);
-	set_params(stream, 0, NULL);
-
-	if (impl->format)
-		free(impl->format);
+	pw_array_clear(&impl->mem_ids);
 
 	if (stream->error)
 		free(stream->error);
 
-	clear_buffers(stream);
-
-	clear_mems(stream);
-	pw_array_clear(&impl->mem_ids);
+	if (stream->name)
+		free(stream->name);
 
 	if (stream->properties)
 		pw_properties_free(stream->properties);
 
-	if (stream->name)
-		free(stream->name);
-
 	free(impl);
 }
 
@@ -821,7 +809,7 @@ on_rtsocket_condition(void *data, int fd, enum spa_io mask)
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
 		pw_log_warn("got error");
-		unhandle_socket(stream);
+		do_remove_sources(stream->remote->core->data_loop->loop, false, 0, NULL, 0, impl);
 		return;
 	}
 
@@ -1241,6 +1229,21 @@ static void on_node_proxy_destroy(void *data)
 	impl->node_proxy = NULL;
 	spa_hook_remove(&impl->proxy_listener);
 
+	set_init_params(this, 0, NULL);
+	set_params(this, 0, NULL);
+
+	clear_buffers(this);
+	clear_mems(this);
+
+	if (impl->format) {
+		free(impl->format);
+		impl->format = NULL;
+	}
+	if (impl->trans) {
+		pw_client_node_transport_destroy(impl->trans);
+		impl->trans = NULL;
+	}
+
 	stream_set_state(this, PW_STREAM_STATE_UNCONNECTED, NULL);
 }
 
@@ -1268,8 +1271,6 @@ pw_stream_connect(struct pw_stream *stream,
 
 	stream_set_state(stream, PW_STREAM_STATE_CONNECTING, NULL);
 
-	if (stream->properties == NULL)
-		stream->properties = pw_properties_new(NULL, NULL);
 	if (port_path)
 		pw_properties_set(stream->properties, PW_NODE_PROP_TARGET_NODE, port_path);
 	if (flags & PW_STREAM_FLAG_AUTOCONNECT)
@@ -1332,17 +1333,15 @@ int pw_stream_disconnect(struct pw_stream *stream)
 {
 	struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
 
+	pw_log_debug("stream %p: disconnect", stream);
+
 	impl->disconnecting = true;
 
 	unhandle_socket(stream);
 
 	if (impl->node_proxy) {
 		pw_client_node_proxy_destroy(impl->node_proxy);
-		impl->node_proxy = NULL;
-	}
-	if (impl->trans) {
-		pw_client_node_transport_destroy(impl->trans);
-		impl->trans = NULL;
+		pw_proxy_destroy((struct pw_proxy *)impl->node_proxy);
 	}
 	return 0;
 }