shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

node_device_udev: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-03-24 09:30:41 +01:00
parent 86f048c85e
commit dd057af7ae
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/node_device/node_device_udev.c
View File

@ -1688,10 +1688,10 @@ nodeStateCleanup(void)
priv = driver->privateData;
if (priv) {
virObjectLock(priv);
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
priv->threadQuit = true;
virCondSignal(&priv->threadCond);
virObjectUnlock(priv);
}
if (priv->initThread) {
virThreadJoin(priv->initThread);
g_clear_pointer(&priv->initThread, g_free);
@ -1807,24 +1807,21 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED)
/* continue rather than break from the loop on non-fatal errors */
while (1) {
virObjectLock(priv);
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
while (!priv->dataReady && !priv->threadQuit) {
if (virCondWait(&priv->threadCond, &priv->parent.lock)) {
virReportSystemError(errno, "%s",
_("handler failed to wait on condition"));
virObjectUnlock(priv);
return;
}
}
if (priv->threadQuit) {
virObjectUnlock(priv);
if (priv->threadQuit)
return;
}
errno = 0;
device = udev_monitor_receive_device(priv->udev_monitor);
virObjectUnlock(priv);
}
if (!device) {
if (errno == 0) {
@ -1848,9 +1845,9 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED)
/* Trying to move the reset of the @priv->dataReady flag to
* after the udev_monitor_receive_device wouldn't help much
* due to event mgmt and scheduler timing. */
virObjectLock(priv);
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
priv->dataReady = false;
virObjectUnlock(priv);
}
continue;
}
@ -1873,8 +1870,7 @@ udevEventHandleCallback(int watch G_GNUC_UNUSED,
void *data G_GNUC_UNUSED)
{
udevEventData *priv = driver->privateData;
virObjectLock(priv);
VIR_LOCK_GUARD lock = virObjectLockGuard(priv);
if (!udevEventMonitorSanityCheck(priv, fd))
priv->threadQuit = true;
@ -1882,7 +1878,6 @@ udevEventHandleCallback(int watch G_GNUC_UNUSED,
priv->dataReady = true;
virCondSignal(&priv->threadCond);
virObjectUnlock(priv);
}
@ -1897,7 +1892,7 @@ udevGetDMIData(virNodeDevCapSystem *syscap)
virNodeDevCapSystemHardware *hardware = &syscap->hardware;
virNodeDevCapSystemFirmware *firmware = &syscap->firmware;
virObjectLock(priv);
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
udev = udev_monitor_get_udev(priv->udev_monitor);
device = udev_device_new_from_syspath(udev, DMI_DEVPATH);
@ -1905,10 +1900,9 @@ udevGetDMIData(virNodeDevCapSystem *syscap)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to get udev device for syspath '%s'"),
DMI_DEVPATH);
virObjectUnlock(priv);
return;
}
virObjectUnlock(priv);
}
if (udevGetStringSysfsAttr(device, "product_name",
&syscap->product_name) < 0)
@ -2002,12 +1996,12 @@ nodeStateInitializeEnumerate(void *opaque)
return;
error:
virObjectLock(priv);
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
ignore_value(virEventRemoveHandle(priv->watch));
priv->watch = -1;
priv->threadQuit = true;
virCondSignal(&priv->threadCond);
virObjectUnlock(priv);
}
goto cleanup;
}