X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=device.c;h=520cbdb2c218cf05882ab554af4844c11a773a39;hp=6eeae036249beaa7369a3d2932b232fbef3a7689;hb=4f0f902fc8837999e5c9f3a6f7e2592cc6f096eb;hpb=f94ea366d38fed424200b748cb042ca44f8c8d50
diff --git a/device.c b/device.c
index 6eeae0362..520cbdb2c 100644
--- a/device.c
+++ b/device.c
@@ -1,5 +1,24 @@
/*-*- 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
@@ -8,22 +27,21 @@
#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);
assert(d);
+
free(d->sysfs);
+ d->sysfs = NULL;
}
static void device_set_state(Device *d, DeviceState state) {
@@ -33,7 +51,11 @@ static void device_set_state(Device *d, DeviceState state) {
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]);
+ if (state != old_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]);
}
@@ -58,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));
}
@@ -68,7 +90,13 @@ static UnitActiveState device_active_state(Unit *u) {
return state_translation_table[DEVICE(u)->state];
}
-static int device_add_escaped_name(Unit *u, const char *prefix, const char *dn, bool make_id) {
+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;
@@ -76,7 +104,7 @@ static int device_add_escaped_name(Unit *u, const char *prefix, const char *dn,
assert(dn);
assert(dn[0] == '/');
- if (!(e = unit_name_escape_path(prefix, dn+1, ".device")))
+ if (!(e = unit_name_from_path(dn, ".device")))
return -ENOMEM;
r = unit_add_name(u, e);
@@ -92,95 +120,131 @@ static int device_add_escaped_name(Unit *u, const char *prefix, const char *dn,
return 0;
}
+static int device_find_escape_name(Manager *m, const char *dn, Unit **_u) {
+ char *e;
+ Unit *u;
+
+ assert(m);
+ assert(dn);
+ assert(dn[0] == '/');
+ assert(_u);
+
+ if (!(e = unit_name_from_path(dn, ".device")))
+ return -ENOMEM;
+
+ u = manager_get_unit(m, e);
+ free(e);
+
+ if (u) {
+ *_u = u;
+ return 1;
+ }
+
+ return 0;
+}
+
static int device_process_new_device(Manager *m, struct udev_device *dev, bool update_state) {
- const char *dn, *names, *wants, *sysfs;
+ const char *dn, *wants, *sysfs, *expose, *model;
Unit *u = NULL;
int r;
- char *e, *w, *state;
+ 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;
+
+ 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)
+ return 0;
+
/* Check whether this entry is even relevant for us. */
dn = udev_device_get_devnode(dev);
- names = udev_device_get_property_value(dev, "SYSTEMD_NAMES");
wants = udev_device_get_property_value(dev, "SYSTEMD_WANTS");
- if (!dn && !names && !wants)
- return 0;
+ if ((r = device_find_escape_name(m, sysfs, &u)) < 0)
+ return r;
- /* Ok, seems kinda interesting. Now, let's see if this one
- * already exists. */
+ if (r == 0 && dn)
+ if ((r = device_find_escape_name(m, dn, &u)) < 0)
+ return r;
- if (!(sysfs = udev_device_get_syspath(dev)))
- return -ENOMEM;
+ if (r == 0) {
+ first = udev_device_get_devlinks_list_entry(dev);
+ udev_list_entry_foreach(item, first) {
+ if ((r = device_find_escape_name(m, udev_list_entry_get_name(item), &u)) < 0)
+ return r;
- assert(sysfs[0] == '/');
- if (!(e = unit_name_escape_path("sysfs-", sysfs+1, ".device")))
- return -ENOMEM;
+ if (r > 0)
+ break;
+ }
+ }
- if (!(u = manager_get_unit(m, e))) {
- const char *model;
+ /* FIXME: this needs proper merging */
+ assert((r > 0) == !!u);
+
+ /* If this is a different unit, then let's not merge things */
+ if (u && DEVICE(u)->sysfs && !streq(DEVICE(u)->sysfs, sysfs))
+ u = NULL;
+
+ if (!u) {
delete = true;
- if (!(u = unit_new(m))) {
- free(e);
+ if (!(u = unit_new(m)))
return -ENOMEM;
- }
- r = unit_add_name(u, e);
- free(e);
-
- if (r < 0)
+ if ((r = device_add_escaped_name(u, sysfs, true)) < 0)
goto fail;
+ unit_add_to_load_queue(u);
+ } else
+ delete = false;
+
+ if (!(DEVICE(u)->sysfs))
if (!(DEVICE(u)->sysfs = strdup(sysfs))) {
r = -ENOMEM;
goto fail;
}
- if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
- (model = udev_device_get_property_value(dev, "ID_MODEL")))
- if ((r = unit_set_description(u, model)) < 0)
- goto fail;
-
- unit_add_to_load_queue(u);
- } else {
- delete = false;
- free(e);
- }
-
if (dn)
- if ((r = device_add_escaped_name(u, "node-", dn, true)) < 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, "node-", udev_list_entry_get_name(item), false)) < 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)))
- goto fail;
-
- r = unit_add_name(u, e);
- free(e);
-
- if (r < 0 && r != -EEXIST)
- goto fail;
- }
- }
+ if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
+ (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;
if (wants) {
FOREACH_WORD(w, l, wants, state) {
- if (!(e = strndup(w, l)))
+ char *e;
+
+ if (!(e = strndup(w, l))) {
+ r = -ENOMEM;
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)
@@ -193,6 +257,8 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
device_set_state(DEVICE(u), DEVICE_AVAILABLE);
}
+ unit_add_to_dbus_queue(u);
+
return 0;
fail:
@@ -231,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-", sysfs+1, ".device")))
+ if (!(e = unit_name_from_path(sysfs, ".device")))
return -ENOMEM;
u = manager_get_unit(m, e);
@@ -251,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) {
@@ -266,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;
@@ -322,8 +394,6 @@ void device_fd_event(Manager *m, int events) {
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;
@@ -350,16 +420,31 @@ 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 = unit_load_fragment_and_dropin,
+ .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,
.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