External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-13 00:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_device_udev: Make the code easier to read

Browse Source 
There is only one case where force is true, therefore let's inline that case.

Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
This commit is contained in:
Marc Hartmayer 2024-04-23 20:09:03 +02:00 committed by Jonathon Jongsma
parent b56458d443
commit 140cdf7f9a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/node_device/node_device_udev.c
View File

@ -2210,21 +2210,14 @@ mdevctlEnableMonitor(udevEventData *priv)
/* Schedules an mdevctl update for 100ms in the future, canceling any existing
* timeout that may have been set. In this way, multiple update requests in
* quick succession can be collapsed into a single update. if @force is true,
* the worker job is submitted immediately. */
* quick succession can be collapsed into a single update. */
static void
scheduleMdevctlUpdate(udevEventData *data,
bool force)
scheduleMdevctlUpdate(udevEventData *data)
{
if (!force) {
if (data->mdevctlTimeout != -1)
virEventRemoveTimeout(data->mdevctlTimeout);
data->mdevctlTimeout = virEventAddTimeout(100, submitMdevctlUpdate,
data, NULL);
return;
}
submitMdevctlUpdate(-1, data);
if (data->mdevctlTimeout != -1)
virEventRemoveTimeout(data->mdevctlTimeout);
data->mdevctlTimeout = virEventAddTimeout(100, submitMdevctlUpdate,
data, NULL);
}
@ -2259,7 +2252,11 @@ mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED,
* CHANGES_DONE_HINT event. As a fallback, add a timeout to trigger the
* signal if that event never comes */
VIR_WITH_OBJECT_LOCK_GUARD(priv) {
scheduleMdevctlUpdate(priv, (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT));
if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) {
submitMdevctlUpdate(-1, priv);
} else {
scheduleMdevctlUpdate(priv);
}
}
}