X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=d1a226673e6df8244ce8e5bbb071539ccb84657d;hp=27e64dae3acbb9a8a6d6f3388ac2842686b4e01e;hb=540f46698dd5a3bed767fa1c761ead1c9e41ed2e;hpb=03e0170db3ef69c70db7cd74e6689c7b78c91c3d diff --git a/udev/udevd.c b/udev/udevd.c index 27e64dae3..d1a226673 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2004-2008 Kay Sievers * Copyright (C) 2004 Chris Friesen + * Copyright (C) 2009 Canonical Ltd. + * Copyright (C) 2009 Scott James Remnant * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,6 +71,7 @@ static volatile int sigchilds_waiting; static volatile int udev_exit; static volatile int reload_config; static volatile int signal_received; +static volatile pid_t settle_pid; static int run_exec_q; static int stop_exec_q; static int max_childs; @@ -192,7 +195,6 @@ static void event_fork(struct udev_event *event) switch (pid) { case 0: /* child */ - udev_monitor_unref(kernel_monitor); udev_ctrl_unref(udev_ctrl); logging_close(); logging_init("udevd-event"); @@ -215,9 +217,6 @@ static void event_fork(struct udev_event *event) /* set timeout to prevent hanging processes */ alarm(UDEV_EVENT_TIMEOUT); - /* clear any existing udev watch on the node */ - udev_watch_clear(event->udev, event->dev); - /* apply rules, create node, symlinks */ err = udev_event_execute_rules(event, rules); @@ -230,10 +229,13 @@ static void event_fork(struct udev_event *event) udev_event_execute_run(event); /* apply/restore inotify watch */ - if (err == 0 && event->inotify_watch && - strcmp(udev_device_get_action(event->dev), "remove") != 0) - info(event->udev, "device will be watched for changes\n"); + if (err == 0 && event->inotify_watch) { udev_watch_begin(event->udev, event->dev); + udev_device_update_db(event->dev); + } + + /* send processed event back to the kernel netlink socket */ + udev_monitor_send_device(kernel_monitor, event->dev); info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err); logging_close(); @@ -293,7 +295,7 @@ static void event_queue_insert(struct udev_event *event) static int mem_size_mb(void) { - FILE* f; + FILE *f; char buf[4096]; long int memsize = -1; @@ -516,6 +518,11 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl) info(udev, "udevd message (SET_MAX_CHILDS) received, max_childs=%i\n", i); max_childs = i; } + + settle_pid = udev_ctrl_get_settle(ctrl_msg); + if (settle_pid > 0) { + info(udev, "udevd message (SETTLE) received\n"); + } udev_ctrl_msg_unref(ctrl_msg); } @@ -539,20 +546,25 @@ static int handle_inotify(struct udev *udev) read(inotify_fd, buf, nbytes); - for (pos = 0, ev = (struct inotify_event *)(buf + pos); pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) { - const char *syspath; + for (pos = 0; pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) { + struct udev_device *dev; - dbg(udev, "inotify event: %x for %d (%s)\n", ev->mask, ev->wd, ev->len ? ev->name : "*"); + ev = (struct inotify_event *)(buf + pos); + if (ev->len) { + dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name); + reload_config = 1; + continue; + } - syspath = udev_watch_lookup(udev, ev->wd); - if (syspath != NULL) { - dbg(udev, "inotify event: %x for %s\n", ev->mask, syspath); + dev = udev_watch_lookup(udev, ev->wd); + if (dev != NULL) { + dbg(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev)); if (ev->mask & IN_CLOSE_WRITE) { char filename[UTIL_PATH_SIZE]; int fd; - info(udev, "device %s closed, synthesising 'change'\n", syspath); - util_strlcpy(filename, syspath, sizeof(filename)); + info(udev, "device %s closed, synthesising 'change'\n", udev_device_get_devnode(dev)); + util_strlcpy(filename, udev_device_get_syspath(dev), sizeof(filename)); util_strlcat(filename, "/uevent", sizeof(filename)); fd = open(filename, O_WRONLY); if (fd < 0 || write(fd, "change", 6) < 0) @@ -560,10 +572,11 @@ static int handle_inotify(struct udev *udev) close(fd); } if (ev->mask & IN_IGNORED) - udev_watch_end(udev, ev->wd); - } else { - reload_config = 1; + udev_watch_end(udev, dev); + + udev_device_unref(dev); } + } free (buf); @@ -695,6 +708,56 @@ static void export_initial_seqnum(struct udev *udev) } } +/* create the nodes the we depend on to properly start up */ +static void setup_initial_nodes(struct udev *udev) +{ + struct udev_device *dev; + + dev = udev_device_new_from_subsystem_sysname(udev, "mem", "null"); + if (dev != NULL) { + udev_node_mknod(dev, "null", makedev(0,0), 0666, 0, 0); + udev_device_unref(dev); + } + dev = udev_device_new_from_subsystem_sysname(udev, "mem", "kmsg"); + if (dev != NULL) { + udev_node_mknod(dev, "kmsg", makedev(0,0), 0660, 0, 0); + udev_device_unref(dev); + } + dev = udev_device_new_from_subsystem_sysname(udev, "tty", "console"); + if (dev != NULL) { + udev_node_mknod(dev, "console", makedev(0,0), 0600, 0, 0); + udev_device_unref(dev); + } +} + +static void startup_log(struct udev *udev) +{ + FILE *f; + char path[UTIL_PATH_SIZE]; + struct stat statbuf; + + f = fopen("/dev/kmsg", "w"); + if (f != NULL) + fprintf(f, "<6>udev: starting version " VERSION "\n"); + + util_strlcpy(path, udev_get_sys_path(udev), sizeof(path)); + util_strlcat(path, "/class/mem/null", sizeof(path)); + if (lstat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) { + const char *depr_str = + "udev: missing sysfs features; please update the kernel " + "or disable the kernel's CONFIG_SYSFS_DEPRECATED option; " + "udev may fail to work correctly"; + + if (f != NULL) + fprintf(f, "<3>%s\n", depr_str); + err(udev, "%s\n", depr_str); + sleep(3); + } + + if (f != NULL) + fclose(f); +} + int main(int argc, char *argv[]) { struct udev *udev; @@ -773,6 +836,8 @@ int main(int argc, char *argv[]) goto exit; } + setup_initial_nodes(udev); + /* make sure std{in,out,err} fd's are in a sane state */ fd = open("/dev/null", O_RDWR); if (fd < 0) { @@ -800,7 +865,7 @@ int main(int argc, char *argv[]) goto exit; } - kernel_monitor = udev_monitor_new_from_netlink(udev); + kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel"); if (kernel_monitor == NULL || udev_monitor_enable_receiving(kernel_monitor) < 0) { fprintf(stderr, "error initializing netlink socket\n"); err(udev, "error initializing netlink socket\n"); @@ -862,27 +927,7 @@ int main(int argc, char *argv[]) close(fd); } - fd = open("/dev/kmsg", O_WRONLY); - if (fd > 0) { - const char *ver_str = "<6>udev: starting version " VERSION "\n"; - char path[UTIL_PATH_SIZE]; - struct stat statbuf; - - write(fd, ver_str, strlen(ver_str)); - util_strlcpy(path, udev_get_sys_path(udev), sizeof(path)); - util_strlcat(path, "/class/mem/null", sizeof(path)); - if (lstat(path, &statbuf) == 0) { - if (S_ISDIR(statbuf.st_mode)) { - const char *depr_str = - "<6>udev: deprecated sysfs layout; update the kernel or " - "disable CONFIG_SYSFS_DEPRECATED; some udev features will " - "not work correctly\n"; - - write(fd, depr_str, strlen(depr_str)); - } - } - close(fd); - } + startup_log(udev); /* set signal handlers */ memset(&act, 0x00, sizeof(struct sigaction)); @@ -1020,6 +1065,11 @@ handle_signals: if (!stop_exec_q) event_queue_manager(udev); } + + if (settle_pid > 0) { + kill(settle_pid, SIGUSR1); + settle_pid = 0; + } } cleanup_queue_dir(udev); rc = 0;