mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-10 13:30:05 -05:00
Use refcounting for async shutdown
fix some memory leaks
This commit is contained in:
parent
ee0aa6a2ac
commit
6d4db64767
21 changed files with 216 additions and 260 deletions
|
|
@ -59,28 +59,12 @@ pinos_resource_new (PinosClient *client,
|
|||
return this;
|
||||
}
|
||||
|
||||
static void
|
||||
sync_destroy (void *object,
|
||||
void *data,
|
||||
SpaResult res,
|
||||
uint32_t id)
|
||||
{
|
||||
PinosResource *resource = object;
|
||||
pinos_log_debug ("resource %p: sync destroy", resource);
|
||||
free (resource);
|
||||
}
|
||||
|
||||
SpaResult
|
||||
void
|
||||
pinos_resource_destroy (PinosResource *resource)
|
||||
{
|
||||
pinos_log_debug ("resource %p: destroy", resource);
|
||||
pinos_signal_emit (&resource->destroy_signal, resource);
|
||||
|
||||
pinos_map_remove (&resource->client->objects, resource->id);
|
||||
|
||||
if (resource->destroy)
|
||||
resource->destroy (resource);
|
||||
|
||||
if (resource->client->core_resource) {
|
||||
PinosMessageRemoveId m;
|
||||
m.id = resource->id;
|
||||
|
|
@ -90,13 +74,13 @@ pinos_resource_destroy (PinosResource *resource)
|
|||
true);
|
||||
}
|
||||
|
||||
pinos_main_loop_defer (resource->core->main_loop,
|
||||
resource,
|
||||
SPA_RESULT_WAIT_SYNC,
|
||||
sync_destroy,
|
||||
resource);
|
||||
pinos_map_remove (&resource->client->objects, resource->id);
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
if (resource->destroy)
|
||||
resource->destroy (resource);
|
||||
|
||||
pinos_log_debug ("resource %p: free", resource);
|
||||
free (resource);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue