opensourcemirror
/
pipewire
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spa: clear all devices when udev monitor stops 

Otherwise the udev device leaks when restarting the monitor
This commit is contained in:
Julian Bouzas 2021-07-08 14:34:46 -04:00 committed by Wim Taymans
parent 7bf50fd8ed
commit 4732aea0c6
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spa/plugins/alsa/alsa-udev.c
View File

@ -131,6 +131,14 @@ static void remove_device(struct impl *this, struct device *device)
*device = this->devices[--this->n_devices];
}
static void clear_devices(struct impl *this)
{
uint32_t i;
for (i = 0; i < this->n_devices; i++)
udev_device_unref(this->devices[i].dev);
this->n_devices = 0;
}
static uint32_t get_card_id(struct impl *this, struct udev_device *dev)
{
const char *e, *str;
@ -595,6 +603,8 @@ static int stop_monitor(struct impl *this)
if (this->umonitor == NULL)
return 0;
clear_devices (this);
spa_loop_remove_source(this->main_loop, &this->source);
udev_monitor_unref(this->umonitor);
this->umonitor = NULL;

10
spa/plugins/v4l2/v4l2-udev.c
View File

@ -130,6 +130,14 @@ static void remove_device(struct impl *this, struct device *device)
*device = this->devices[--this->n_devices];
}
static void clear_devices(struct impl *this)
{
uint32_t i;
for (i = 0; i < this->n_devices; i++)
udev_device_unref(this->devices[i].dev);
this->n_devices = 0;
}
static uint32_t get_device_id(struct impl *this, struct udev_device *dev)
{
const char *str;
@ -543,6 +551,8 @@ static int stop_monitor(struct impl *this)
if (this->umonitor == NULL)
return 0;
clear_devices (this);
spa_loop_remove_source(this->main_loop, &this->source);
udev_monitor_unref(this->umonitor);
this->umonitor = NULL;