X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=device.c;h=95c458f3d775aaa5beb7b7dbf3b89e12ef520326;hp=0a7c967fabb230d280935d4c3b933b94c1491ea7;hb=cabab516b38fbb2146bb62980b6770b1f70403fa;hpb=e537352b9bfffe6f6286483bff2c7601c78407e3 diff --git a/device.c b/device.c index 0a7c967fa..95c458f3d 100644 --- a/device.c +++ b/device.c @@ -27,17 +27,14 @@ #include "device.h" #include "strv.h" #include "log.h" +#include "unit-name.h" +#include "dbus-device.h" static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = { [DEVICE_DEAD] = UNIT_INACTIVE, [DEVICE_AVAILABLE] = UNIT_ACTIVE }; -static const char* const state_string_table[_DEVICE_STATE_MAX] = { - [DEVICE_DEAD] = "dead", - [DEVICE_AVAILABLE] = "available" -}; - static void device_done(Unit *u) { Device *d = DEVICE(u); @@ -47,15 +44,6 @@ static void device_done(Unit *u) { d->sysfs = NULL; } -static void device_init(Unit *u) { - Device *d = DEVICE(u); - - assert(d); - assert(u->meta.load_state == UNIT_STUB); - - d->state = 0; -} - static void device_set_state(Device *d, DeviceState state) { DeviceState old_state; assert(d); @@ -64,7 +52,10 @@ static void device_set_state(Device *d, DeviceState state) { d->state = state; if (state != old_state) - log_debug("%s changed %s → %s", unit_id(UNIT(d)), state_string_table[old_state], state_string_table[state]); + log_debug("%s changed %s -> %s", + UNIT(d)->meta.id, + device_state_to_string(old_state), + device_state_to_string(state)); unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state]); } @@ -89,7 +80,7 @@ static void device_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%sDevice State: %s\n" "%sSysfs Path: %s\n", - prefix, state_string_table[d->state], + prefix, device_state_to_string(d->state), prefix, strna(d->sysfs)); } @@ -99,6 +90,12 @@ static UnitActiveState device_active_state(Unit *u) { return state_translation_table[DEVICE(u)->state]; } +static const char *device_sub_state_to_string(Unit *u) { + assert(u); + + return device_state_to_string(DEVICE(u)->state); +} + static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) { char *e; int r; @@ -107,7 +104,7 @@ static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) { assert(dn); assert(dn[0] == '/'); - if (!(e = unit_name_escape_path(dn+1, ".device"))) + if (!(e = unit_name_from_path(dn, ".device"))) return -ENOMEM; r = unit_add_name(u, e); @@ -132,7 +129,7 @@ static int device_find_escape_name(Manager *m, const char *dn, Unit **_u) { assert(dn[0] == '/'); assert(_u); - if (!(e = unit_name_escape_path(dn+1, ".device"))) + if (!(e = unit_name_from_path(dn, ".device"))) return -ENOMEM; u = manager_get_unit(m, e); @@ -146,64 +143,35 @@ static int device_find_escape_name(Manager *m, const char *dn, Unit **_u) { return 0; } -static bool devnode_is_api(const char *node) { - unsigned i; - - static const char * const table[] = { - "/dev/null", - "/dev/zero", - "/dev/urandom", - "/dev/random", - "/dev/port", - "/dev/oldmem", - "/dev/full", - "/dev/kmsg", - "/dev/mem" - }; - - for (i = 0; i < ELEMENTSOF(table); i++) - if (streq(table[i], node)) - return true; - - return false; -} - static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) { - const char *dn, *names, *wants, *sysfs, *expose, *model; + const char *dn, *wants, *sysfs, *expose, *model; Unit *u = NULL; int r; char *w, *state; size_t l; bool delete; struct udev_list_entry *item = NULL, *first = NULL; + int b; assert(m); if (!(sysfs = udev_device_get_syspath(dev))) return -ENOMEM; - /* Check whether this entry is even relevant for us. */ - dn = udev_device_get_devnode(dev); - expose = udev_device_get_property_value(dev, "SYSTEMD_EXPOSE"); - names = udev_device_get_property_value(dev, "SYSTEMD_NAMES"); - wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS"); - - if (expose) { - int b; + if (!(expose = udev_device_get_property_value(dev, "SYSTEMD_EXPOSE"))) + return 0; - if ((b = parse_boolean(expose)) < 0) { - log_error("Failed to parse SYSTEMD_EXPOSE udev property for device %s: %s", sysfs, expose); - return 0; - } + if ((b = parse_boolean(expose)) < 0) { + log_error("Failed to parse SYSTEMD_EXPOSE udev property for device %s: %s", sysfs, expose); + return 0; + } - if (!b) - return 0; - } else - if ((!dn || devnode_is_api(dn)) && !names && !wants) - return 0; + if (!b) + return 0; - /* Ok, seems kinda interesting. Now, let's see if this one - * already exists. */ + /* Check whether this entry is even relevant for us. */ + dn = udev_device_get_devnode(dev); + wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS"); if ((r = device_find_escape_name(m, sysfs, &u)) < 0) return r; @@ -267,27 +235,6 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u if ((r = unit_set_description(u, dn)) < 0) goto fail; - /* We don't remove names that are gone. But that should be - * fine and should probably be fixed only on a configuration - * refresh. */ - - if (names) { - FOREACH_WORD(w, l, names, state) { - char *e; - - if (!(e = strndup(w, l))) { - r = -ENOMEM; - goto fail; - } - - r = unit_add_name(u, e); - free(e); - - if (r < 0 && r != -EEXIST) - goto fail; - } - } - if (wants) { FOREACH_WORD(w, l, wants, state) { char *e; @@ -297,7 +244,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u goto fail; } - r = unit_add_dependency_by_name(u, UNIT_WANTS, e); + r = unit_add_dependency_by_name(u, UNIT_WANTS, NULL, e, true); free(e); if (r < 0) @@ -350,7 +297,7 @@ static int device_process_removed_device(Manager *m, struct udev_device *dev) { return -ENOMEM; assert(sysfs[0] == '/'); - if (!(e = unit_name_escape_path(sysfs+1, ".device"))) + if (!(e = unit_name_from_path(sysfs, ".device"))) return -ENOMEM; u = manager_get_unit(m, e); @@ -370,11 +317,15 @@ static int device_process_removed_device(Manager *m, struct udev_device *dev) { static void device_shutdown(Manager *m) { assert(m); - if (m->udev_monitor) + if (m->udev_monitor) { udev_monitor_unref(m->udev_monitor); + m->udev_monitor = NULL; + } - if (m->udev) + if (m->udev) { udev_unref(m->udev); + m->udev = NULL; + } } static int device_enumerate(Manager *m) { @@ -385,28 +336,30 @@ static int device_enumerate(Manager *m) { assert(m); - if (!(m->udev = udev_new())) - return -ENOMEM; + if (!m->udev) { + if (!(m->udev = udev_new())) + return -ENOMEM; - if (!(m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"))) { - r = -ENOMEM; - goto fail; - } + if (!(m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"))) { + r = -ENOMEM; + goto fail; + } - if (udev_monitor_enable_receiving(m->udev_monitor) < 0) { - r = -EIO; - goto fail; - } + if (udev_monitor_enable_receiving(m->udev_monitor) < 0) { + r = -EIO; + goto fail; + } - m->udev_watch.type = WATCH_UDEV; - m->udev_watch.fd = udev_monitor_get_fd(m->udev_monitor); + m->udev_watch.type = WATCH_UDEV; + m->udev_watch.fd = udev_monitor_get_fd(m->udev_monitor); - zero(ev); - ev.events = EPOLLIN; - ev.data.ptr = &m->udev_watch; + zero(ev); + ev.events = EPOLLIN; + ev.data.ptr = &m->udev_watch; - if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_watch.fd, &ev) < 0) - return -errno; + if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_watch.fd, &ev) < 0) + return -errno; + } if (!(e = udev_enumerate_new(m->udev))) { r = -ENOMEM; @@ -467,10 +420,21 @@ fail: udev_device_unref(dev); } +static const char* const device_state_table[_DEVICE_STATE_MAX] = { + [DEVICE_DEAD] = "dead", + [DEVICE_AVAILABLE] = "available" +}; + +DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState); + const UnitVTable device_vtable = { .suffix = ".device", - .init = device_init, + .no_requires = true, + .no_instances = true, + .no_snapshots = true, + .no_isolate = true, + .load = unit_load_fragment_and_dropin_optional, .done = device_done, .coldplug = device_coldplug, @@ -478,6 +442,9 @@ const UnitVTable device_vtable = { .dump = device_dump, .active_state = device_active_state, + .sub_state_to_string = device_sub_state_to_string, + + .bus_message_handler = bus_device_message_handler, .enumerate = device_enumerate, .shutdown = device_shutdown