X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=b97ba6df3ea54a721f37d70323e082bb3d63dd79;hb=bf5332d2bf2a1acbba9daacf40570a4addbd3411;hp=b54689e1d55ee8d4bd6930ae85127751bba3239e;hpb=afc6adb5ec7e73bc13156c43f52fb015cd80cc68;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index b54689e1d..b97ba6df3 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -34,6 +34,7 @@ #include "bus-util.h" #include "bus-error.h" #include "logind.h" +#include "udev-util.h" Manager *manager_new(void) { Manager *m; @@ -96,6 +97,8 @@ Manager *manager_new(void) { return NULL; } + sd_event_set_watchdog(m->event, true); + return m; } @@ -179,7 +182,7 @@ void manager_free(Manager *m) { static int manager_enumerate_devices(Manager *m) { struct udev_list_entry *item = NULL, *first = NULL; - struct udev_enumerate *e; + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; int r; assert(m); @@ -188,47 +191,40 @@ static int manager_enumerate_devices(Manager *m) { * necessary */ e = udev_enumerate_new(m->udev); - if (!e) { - r = -ENOMEM; - goto finish; - } + if (!e) + return -ENOMEM; r = udev_enumerate_add_match_tag(e, "master-of-seat"); if (r < 0) - goto finish; + return r; r = udev_enumerate_scan_devices(e); if (r < 0) - goto finish; + return r; first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { - struct udev_device *d; + _cleanup_udev_device_unref_ struct udev_device *d = NULL; int k; d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); - if (!d) { - r = -ENOMEM; - goto finish; - } + if (!d) + return -ENOMEM; - k = manager_process_seat_device(m, d); - udev_device_unref(d); + if (!udev_device_get_is_initialized(d)) + continue; + k = manager_process_seat_device(m, d); if (k < 0) r = k; } -finish: - if (e) - udev_enumerate_unref(e); - return r; } static int manager_enumerate_buttons(Manager *m) { + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; - struct udev_enumerate *e; int r; assert(m); @@ -242,45 +238,38 @@ static int manager_enumerate_buttons(Manager *m) { return 0; e = udev_enumerate_new(m->udev); - if (!e) { - r = -ENOMEM; - goto finish; - } + if (!e) + return -ENOMEM; r = udev_enumerate_add_match_subsystem(e, "input"); if (r < 0) - goto finish; + return r; r = udev_enumerate_add_match_tag(e, "power-switch"); if (r < 0) - goto finish; + return r; r = udev_enumerate_scan_devices(e); if (r < 0) - goto finish; + return r; first = udev_enumerate_get_list_entry(e); udev_list_entry_foreach(item, first) { - struct udev_device *d; + _cleanup_udev_device_unref_ struct udev_device *d = NULL; int k; d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); - if (!d) { - r = -ENOMEM; - goto finish; - } + if (!d) + return -ENOMEM; - k = manager_process_button_device(m, d); - udev_device_unref(d); + if (!udev_device_get_is_initialized(d)) + continue; + k = manager_process_button_device(m, d); if (k < 0) r = k; } -finish: - if (e) - udev_enumerate_unref(e); - return r; } @@ -488,9 +477,8 @@ static int manager_enumerate_inhibitors(Manager *m) { } static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; Manager *m = userdata; - struct udev_device *d; - int r; assert(m); @@ -498,16 +486,13 @@ static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t reven if (!d) return -ENOMEM; - r = manager_process_seat_device(m, d); - udev_device_unref(d); - - return r; + manager_process_seat_device(m, d); + return 0; } static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; Manager *m = userdata; - struct udev_device *d; - int r; assert(m); @@ -515,16 +500,13 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev if (!d) return -ENOMEM; - r = manager_process_seat_device(m, d); - udev_device_unref(d); - - return r; + manager_process_seat_device(m, d); + return 0; } static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; Manager *m = userdata; - struct udev_device *d; - int r = 0; const char *name; assert(m); @@ -539,17 +521,14 @@ static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t reven * VTs, to make sure our auto VTs never go away. */ if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove")) - r = seat_preallocate_vts(m->seat0); - - udev_device_unref(d); + seat_preallocate_vts(m->seat0); - return r; + return 0; } static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; Manager *m = userdata; - struct udev_device *d; - int r; assert(m); @@ -557,10 +536,8 @@ static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t rev if (!d) return -ENOMEM; - r = manager_process_button_device(m, d); - udev_device_unref(d); - - return r; + manager_process_button_device(m, d); + return 0; } static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) { @@ -571,7 +548,6 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents assert(m->console_active_fd == fd); seat_read_active_vt(m->seat0); - return 0; } @@ -605,7 +581,7 @@ static int manager_connect_bus(Manager *m) { assert(m); assert(!m->bus); - r = sd_bus_open_system(&m->bus); + r = sd_bus_default_system(&m->bus); if (r < 0) { log_error("Failed to connect to system bus: %s", strerror(-r)); return r; @@ -725,17 +701,12 @@ static int manager_connect_bus(Manager *m) { return r; } - r = sd_bus_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_DO_NOT_QUEUE); + r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) { log_error("Failed to register name: %s", strerror(-r)); return r; } - if (r != SD_BUS_NAME_PRIMARY_OWNER) { - log_error("Failed to acquire name."); - return -EEXIST; - } - r = sd_bus_attach_event(m->bus, m->event, 0); if (r < 0) { log_error("Failed to attach bus to event loop: %s", strerror(-r)); @@ -958,7 +929,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us return r; } - r = sd_event_source_set_priority(m->idle_action_event_source, SD_PRIORITY_IDLE+10); + r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); if (r < 0) { log_error("Failed to set idle event source priority: %s", strerror(-r)); return r;