mirror of
https://github.com/troglobit/finit.git
synced 2026-11-20 19:41:51 +00:00
keventd: generalize coldplug into a filtered trigger
coldplug_trigger(action, subsystem-glob) replays events for a subset
of devices, the D-Bus Trigger method needs both knobs; coldplug() is
now the ("add", NULL) case. nftw() has no user cookie, so the
parameters ride in file statics.
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
2 files changed
+54
-12
No files matched your search
@@ -160,6 +160,8 @@ int firmware_load (struct uevent *ev);
|
|||||||
int modprobe_load (const char *modalias);
|
int modprobe_load (const char *modalias);
|
||||||
|
|
||||||
int coldplug (void);
|
int coldplug (void);
|
||||||
|
int coldplug_trigger (const char *action, const char *subsys_glob);
|
||||||
|
int uevent_action_valid(const char *action);
|
||||||
|
|
||||||
#endif /* FINIT_KEVENTD_H_ */
|
#endif /* FINIT_KEVENTD_H_ */
|
||||||
|
|
||||||
|
|||||||
+52
-12
@@ -52,6 +52,7 @@
|
|||||||
|
|
||||||
#include "keventd.h"
|
#include "keventd.h"
|
||||||
#include "cond.h"
|
#include "cond.h"
|
||||||
|
#include "sysfs.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
/* Forward declarations */
|
/* Forward declarations */
|
||||||
@@ -1154,8 +1155,13 @@ int modprobe_load(const char *modalias)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Coldplug callback for nftw().
|
* Coldplug callback for nftw().
|
||||||
* Writes "add" to each uevent file to trigger kernel to resend events.
|
* Writes the requested action to each matching uevent file to trigger
|
||||||
|
* the kernel to resend events. nftw() has no user cookie, so the
|
||||||
|
* action and subsystem filter ride in file statics.
|
||||||
*/
|
*/
|
||||||
|
static const char *trigger_action = "add";
|
||||||
|
static const char *trigger_glob;
|
||||||
|
|
||||||
static int coldplug_cb(const char *path, const struct stat *st,
|
static int coldplug_cb(const char *path, const struct stat *st,
|
||||||
int type, struct FTW *ftw)
|
int type, struct FTW *ftw)
|
||||||
{
|
{
|
||||||
@@ -1175,27 +1181,61 @@ static int coldplug_cb(const char *path, const struct stat *st,
|
|||||||
if (strcmp(path + len - 6, "uevent"))
|
if (strcmp(path + len - 6, "uevent"))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Trigger add event */
|
if (trigger_glob) {
|
||||||
fnwrite("add", "%s", path);
|
char syspath[PATH_MAX];
|
||||||
|
char subsys[64];
|
||||||
|
|
||||||
|
/* Strip "/uevent" to get the device directory */
|
||||||
|
snprintf(syspath, sizeof(syspath), "%.*s",
|
||||||
|
(int)(len - 7), path);
|
||||||
|
if (sysfs_read_subsystem(syspath, subsys, sizeof(subsys)) < 0 ||
|
||||||
|
fnmatch(trigger_glob, subsys, 0))
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
fnwrite((char *)trigger_action, "%s", path);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Replay device events, optionally scoped: NULL/empty glob matches
|
||||||
|
* every subsystem. Serves both boot-time coldplug and the D-Bus
|
||||||
|
* Trigger method.
|
||||||
|
*/
|
||||||
|
int coldplug_trigger(const char *action, const char *subsys_glob)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
trigger_action = action && *action ? action : "add";
|
||||||
|
trigger_glob = subsys_glob && *subsys_glob ? subsys_glob : NULL;
|
||||||
|
|
||||||
|
logit(LOG_INFO, "Triggering %s events%s%s ...", trigger_action,
|
||||||
|
trigger_glob ? " for subsystem " : "", trigger_glob ?: "");
|
||||||
|
|
||||||
|
rc = nftw("/sys/devices", coldplug_cb, 64, FTW_PHYS);
|
||||||
|
if (rc < 0)
|
||||||
|
logit(LOG_ERR, "Trigger failed: %s", strerror(errno));
|
||||||
|
else
|
||||||
|
logit(LOG_INFO, "Trigger complete");
|
||||||
|
|
||||||
|
trigger_action = "add";
|
||||||
|
trigger_glob = NULL;
|
||||||
|
|
||||||
|
return rc < 0 ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Trigger coldplug - replay device events for devices already present.
|
* Trigger coldplug - replay device events for devices already present.
|
||||||
*/
|
*/
|
||||||
int coldplug(void)
|
int coldplug(void)
|
||||||
{
|
{
|
||||||
logit(LOG_INFO, "Starting coldplug...");
|
return coldplug_trigger("add", NULL);
|
||||||
|
}
|
||||||
|
|
||||||
/* Walk /sys/devices and trigger uevents */
|
int uevent_action_valid(const char *action)
|
||||||
if (nftw("/sys/devices", coldplug_cb, 64, FTW_PHYS) < 0) {
|
{
|
||||||
logit(LOG_ERR, "Coldplug failed: %s", strerror(errno));
|
return action && parse_action(action) != ACT_UNKNOWN;
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
logit(LOG_INFO, "Coldplug complete");
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in new issue
Block a user