External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

nodedev: refactor mdevctl thread functions

Browse Source 
Factor out a new scheduleMdevctlUpdate() function so that we can re-use
it from other places. Now that other events can make it necessary to
re-query mdevctl for mdev updates, this function will be useful for
coalescing multiple updates in quick succession into a single mdevctl
query.

Also rename a couple functions. The names weren't very descriptive of
their behavior. For example, the old scheduleMdevctlHandler() function
didn't actually schedule anything, it just started a thread. So rename
it to free up the 'schedule' name for the above refactored function.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
This commit is contained in:
Jonathon Jongsma 2023-07-05 15:35:59 -05:00
parent 37481aa1f1
commit 9b7fadc5dc
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/node_device/node_device_udev.c
View File

@ -2083,7 +2083,7 @@ udevPCITranslateInit(bool privileged G_GNUC_UNUSED)
static void static void
mdevctlHandlerThread(void *opaque G_GNUC_UNUSED) mdevctlUpdateThreadFunc(void *opaque G_GNUC_UNUSED)
{ {
udevEventData *priv = driver->privateData; udevEventData *priv = driver->privateData;
VIR_LOCK_GUARD lock = virLockGuardLock(&priv->mdevctlLock); VIR_LOCK_GUARD lock = virLockGuardLock(&priv->mdevctlLock);
@ -2094,7 +2094,7 @@ mdevctlHandlerThread(void *opaque G_GNUC_UNUSED)
static void static void
scheduleMdevctlHandler(int timer G_GNUC_UNUSED, void *opaque) launchMdevctlUpdateThread(int timer G_GNUC_UNUSED, void *opaque)
{ {
udevEventData *priv = opaque; udevEventData *priv = opaque;
virThread thread; virThread thread;
@ -2104,7 +2104,7 @@ scheduleMdevctlHandler(int timer G_GNUC_UNUSED, void *opaque)
priv->mdevctlTimeout = -1; priv->mdevctlTimeout = -1;
} }
if (virThreadCreateFull(&thread, false, mdevctlHandlerThread, if (virThreadCreateFull(&thread, false, mdevctlUpdateThreadFunc,
"mdevctl-thread", false, NULL) < 0) { "mdevctl-thread", false, NULL) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to create mdevctl thread")); _("failed to create mdevctl thread"));
@ -2200,6 +2200,26 @@ 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,
* an update thread will be spawned immediately. */
static void
scheduleMdevctlUpdate(udevEventData *data,
bool force)
{
if (!force) {
if (data->mdevctlTimeout > 0)
virEventRemoveTimeout(data->mdevctlTimeout);
data->mdevctlTimeout = virEventAddTimeout(100, launchMdevctlUpdateThread,
data, NULL);
return;
}
launchMdevctlUpdateThread(-1, data);
}
static void static void
mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED, mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED,
GFile *file, GFile *file,
@ -2230,15 +2250,7 @@ mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED,
* configuration change, try to coalesce these changes by waiting for the * configuration change, try to coalesce these changes by waiting for the
* CHANGES_DONE_HINT event. As a fallback, add a timeout to trigger the * CHANGES_DONE_HINT event. As a fallback, add a timeout to trigger the
* signal if that event never comes */ * signal if that event never comes */
if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) { scheduleMdevctlUpdate(priv, (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT));
if (priv->mdevctlTimeout > 0)
virEventRemoveTimeout(priv->mdevctlTimeout);
priv->mdevctlTimeout = virEventAddTimeout(100, scheduleMdevctlHandler,
priv, NULL);
return;
}
scheduleMdevctlHandler(-1, priv);
} }