X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=device.c;h=6de7d518c718cfc30496f7a5fb45f9824a25ad2e;hp=22b0f6085ecbd753ed91f43f85250d1a98630528;hb=b866264a18095d5302443ab0a95560d973ba4b10;hpb=25ac040b489a7bf9c8608308a721d32e20a22911 diff --git a/device.c b/device.c index 22b0f6085..6de7d518c 100644 --- a/device.c +++ b/device.c @@ -1,6 +1,26 @@ /*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see . +***/ + #include +#include #include #include "unit.h" @@ -8,6 +28,16 @@ #include "strv.h" #include "log.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); @@ -15,13 +45,31 @@ static void device_done(Unit *u) { free(d->sysfs); } -static void device_dump(Unit *u, FILE *f, const char *prefix) { +static void device_set_state(Device *d, DeviceState state) { + DeviceState old_state; + assert(d); + + old_state = d->state; + d->state = state; + + log_debug("%s changed %s → %s", unit_id(UNIT(d)), state_string_table[old_state], state_string_table[state]); - static const char* const state_table[_DEVICE_STATE_MAX] = { - [DEVICE_DEAD] = "dead", - [DEVICE_AVAILABLE] = "available" - }; + unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state]); +} +static int device_coldplug(Unit *u) { + Device *d = DEVICE(u); + + assert(d); + assert(d->state == DEVICE_DEAD); + + if (d->sysfs) + device_set_state(d, DEVICE_AVAILABLE); + + return 0; +} + +static void device_dump(Unit *u, FILE *f, const char *prefix) { Device *d = DEVICE(u); assert(d); @@ -29,11 +77,17 @@ static void device_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%sDevice State: %s\n" "%sSysfs Path: %s\n", - prefix, state_table[d->state], - prefix, d->sysfs); + prefix, state_string_table[d->state], + prefix, strna(d->sysfs)); } -static int device_add_escaped_name(Unit *u, const char *dn) { +static UnitActiveState device_active_state(Unit *u) { + assert(u); + + return state_translation_table[DEVICE(u)->state]; +} + +static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) { char *e; int r; @@ -45,6 +99,10 @@ static int device_add_escaped_name(Unit *u, const char *dn) { return -ENOMEM; r = unit_add_name(u, e); + + if (r >= 0 && make_id) + unit_choose_id(u, e); + free(e); if (r < 0 && r != -EEXIST) @@ -53,7 +111,7 @@ static int device_add_escaped_name(Unit *u, const char *dn) { return 0; } -static int device_process_device(Manager *m, struct udev_device *dev) { +static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) { const char *dn, *names, *wants, *sysfs; Unit *u = NULL; int r; @@ -104,30 +162,34 @@ static int device_process_device(Manager *m, struct udev_device *dev) { } if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) || - (model = udev_device_get_property_value(dev, "ID_MODEL"))) - if (!(u->meta.description = strdup(model))) { - r = -ENOMEM; + (model = udev_device_get_property_value(dev, "ID_MODEL"))) { + if ((r = unit_set_description(u, model)) < 0) + goto fail; + } else if (dn) + if ((r = unit_set_description(u, dn)) < 0) goto fail; - } + unit_add_to_load_queue(u); } else { delete = false; free(e); } if (dn) - if ((r = device_add_escaped_name(u, dn)) < 0) + if ((r = device_add_escaped_name(u, dn, true)) < 0) goto fail; first = udev_device_get_devlinks_list_entry(dev); udev_list_entry_foreach(item, first) - if ((r = device_add_escaped_name(u, udev_list_entry_get_name(item))) < 0) + if ((r = device_add_escaped_name(u, udev_list_entry_get_name(item), false)) < 0) goto fail; if (names) { FOREACH_WORD(w, l, names, state) { - if (!(e = strndup(w, l))) + if (!(e = strndup(w, l))) { + r = -ENOMEM; goto fail; + } r = unit_add_name(u, e); free(e); @@ -137,16 +199,12 @@ static int device_process_device(Manager *m, struct udev_device *dev) { } } - - if (set_isempty(u->meta.names)) { - r = -EEXIST; - goto fail; - } - if (wants) { FOREACH_WORD(w, l, wants, state) { - if (!(e = strndup(w, l))) + if (!(e = strndup(w, l))) { + r = -ENOMEM; goto fail; + } r = unit_add_dependency_by_name(u, UNIT_WANTS, e); free(e); @@ -156,7 +214,13 @@ static int device_process_device(Manager *m, struct udev_device *dev) { } } - unit_add_to_load_queue(u); + if (update_state) { + manager_dispatch_load_queue(u->meta.manager); + device_set_state(DEVICE(u), DEVICE_AVAILABLE); + } + + unit_add_to_dbus_queue(u); + return 0; fail: @@ -165,7 +229,7 @@ fail: return r; } -static int device_process_path(Manager *m, const char *path) { +static int device_process_path(Manager *m, const char *path, bool update_state) { int r; struct udev_device *dev; @@ -177,19 +241,53 @@ static int device_process_path(Manager *m, const char *path) { return -ENOMEM; } - r = device_process_device(m, dev); + r = device_process_new_device(m, dev, update_state); udev_device_unref(dev); return r; } +static int device_process_removed_device(Manager *m, struct udev_device *dev) { + const char *sysfs; + char *e; + Unit *u; + Device *d; + + assert(m); + assert(dev); + + if (!(sysfs = udev_device_get_syspath(dev))) + return -ENOMEM; + + assert(sysfs[0] == '/'); + if (!(e = unit_name_escape_path(sysfs+1, ".device"))) + return -ENOMEM; + + u = manager_get_unit(m, e); + free(e); + + if (!u) + return 0; + + d = DEVICE(u); + free(d->sysfs); + d->sysfs = NULL; + + device_set_state(d, DEVICE_DEAD); + return 0; +} + static void device_shutdown(Manager *m) { assert(m); + if (m->udev_monitor) + udev_monitor_unref(m->udev_monitor); + if (m->udev) udev_unref(m->udev); } static int device_enumerate(Manager *m) { + struct epoll_event ev; int r; struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; @@ -199,6 +297,26 @@ static int device_enumerate(Manager *m) { if (!(m->udev = udev_new())) return -ENOMEM; + 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; + } + + 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; + + 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; goto fail; @@ -211,10 +329,9 @@ static int device_enumerate(Manager *m) { first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) - device_process_path(m, udev_list_entry_get_name(item)); + device_process_path(m, udev_list_entry_get_name(item), false); udev_enumerate_unref(e); - return 0; fail: @@ -225,8 +342,40 @@ fail: return r; } -static UnitActiveState device_active_state(Unit *u) { - return DEVICE(u)->state == DEVICE_DEAD ? UNIT_INACTIVE : UNIT_ACTIVE; +void device_fd_event(Manager *m, int events) { + struct udev_device *dev; + int r; + const char *action; + + assert(m); + assert(events == EPOLLIN); + + log_debug("got udev event"); + + if (!(dev = udev_monitor_receive_device(m->udev_monitor))) { + log_error("Failed to receive device."); + return; + } + + if (!(action = udev_device_get_action(dev))) { + log_error("Failed to get udev action string."); + goto fail; + } + + if (streq(action, "remove")) { + if ((r = device_process_removed_device(m, dev)) < 0) { + log_error("Failed to process udev device event: %s", strerror(-r)); + goto fail; + } + } else { + if ((r = device_process_new_device(m, dev, true)) < 0) { + log_error("Failed to process udev device event: %s", strerror(-r)); + goto fail; + } + } + +fail: + udev_device_unref(dev); } const UnitVTable device_vtable = { @@ -234,10 +383,12 @@ const UnitVTable device_vtable = { .init = unit_load_fragment_and_dropin, .done = device_done, + .coldplug = device_coldplug, + .dump = device_dump, - .enumerate = device_enumerate, - .shutdown = device_shutdown, + .active_state = device_active_state, - .active_state = device_active_state + .enumerate = device_enumerate, + .shutdown = device_shutdown };