X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=device.c;h=e3814dd933ee7158fe20fc3aded6fe918d38b667;hp=34d760a48a55930982958aa3a129cf8c3de86e31;hb=c1e1601e8c6cace85b19a0eebe50076e5d119688;hpb=f50e0a012340fa8dfe6ec7f0cd869f5f3a052d7a
diff --git a/device.c b/device.c
index 34d760a48..e3814dd93 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"
@@ -91,7 +111,7 @@ static int device_add_escaped_name(Unit *u, const char *prefix, 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;
@@ -146,6 +166,7 @@ static int device_process_device(Manager *m, struct udev_device *dev) {
if ((r = unit_set_description(u, model)) < 0)
goto fail;
+ unit_add_to_load_queue(u);
} else {
delete = false;
free(e);
@@ -173,12 +194,6 @@ 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)))
@@ -192,7 +207,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:
@@ -201,7 +222,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;
@@ -213,19 +234,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-", 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;
@@ -235,6 +290,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;
@@ -247,10 +322,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:
@@ -261,6 +335,42 @@ fail:
return r;
}
+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 = {
.suffix = ".device",