picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udev-event: make udev_event_new() take exec_delay

Browse source
This commit is contained in:
Yu Watanabe 2018-11-01 22:13:57 +09:00
parent 13d8a53aae
commit 0f86dc900e
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/test-udev.c
View file

@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
goto out;
}
assert_se(event = udev_event_new(dev));
assert_se(event = udev_event_new(dev, 0));
assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, SIGHUP, SIGCHLD, -1) >= 0);

3
src/udev/udev-event.c
View file

@ -42,7 +42,7 @@ typedef struct Spawn {
size_t result_len;
} Spawn;
struct udev_event *udev_event_new(struct udev_device *dev) {
struct udev_event *udev_event_new(struct udev_device *dev, int exec_delay) {
struct udev_event *event;
assert(dev);
@ -54,6 +54,7 @@ struct udev_event *udev_event_new(struct udev_device *dev) {
*event = (struct udev_event) {
.dev = dev,
.birth_usec = now(CLOCK_MONOTONIC),
.exec_delay = exec_delay,
};
return event;

2
src/udev/udev.h
View file

@ -60,7 +60,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
int udev_rules_apply_static_dev_perms(struct udev_rules *rules);
/* udev-event.c */
struct udev_event *udev_event_new(struct udev_device *dev);
struct udev_event *udev_event_new(struct udev_device *dev, int exec_delay);
struct udev_event *udev_event_free(struct udev_event *event);
ssize_t udev_event_apply_format(struct udev_event *event,
const char *src, char *dest, size_t size,

2
src/udev/udevadm-test.c
View file

@ -128,7 +128,7 @@ int test_main(int argc, char *argv[], void *userdata) {
/* don't read info from the db */
udev_device_set_info_loaded(dev);
event = udev_event_new(dev);
event = udev_event_new(dev, 0);
sigfillset(&mask);
sigprocmask(SIG_SETMASK, &mask, &sigmask_orig);

7
src/udev/udevd.c
View file

@ -409,15 +409,12 @@ static void worker_spawn(Manager *manager, struct event *event) {
assert(dev);
log_debug("seq %llu running", udev_device_get_seqnum(dev));
udev_event = udev_event_new(dev);
if (udev_event == NULL) {
udev_event = udev_event_new(dev, arg_exec_delay);
if (!udev_event) {
r = -ENOMEM;
goto out;
}
if (arg_exec_delay > 0)
udev_event->exec_delay = arg_exec_delay;
/*
* Take a shared lock on the device node; this establishes
* a concept of device "ownership" to serialize device