X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind.h;h=8702d1aed27247244ddd054e69377d53063dcc8b;hb=88bb8d215aa0f5576eb3f9c77c30cdc4b17783fe;hp=be5dab7464ca0e040d8f13cad168963352d5b79d;hpb=5eda94dda25bccda928c4b33c790dbe748573a22;p=elogind.git diff --git a/src/logind.h b/src/logind.h index be5dab746..8702d1aed 100644 --- a/src/logind.h +++ b/src/logind.h @@ -34,11 +34,11 @@ /* TODO: * - * recreate VTs when disallocated - * udev rules - * PAM rewrite * spawn user systemd - * dbus API + * direct client API + * add configuration file + * D-Bus method: AttachDevices(seat, devices[]); + * use named pipes to detect when a session dies * * non-local X11 server * reboot/shutdown halt management @@ -59,47 +59,79 @@ struct Manager { Hashmap *sessions; Hashmap *users; + LIST_HEAD(Seat, seat_gc_queue); + LIST_HEAD(Session, session_gc_queue); + LIST_HEAD(User, user_gc_queue); + struct udev *udev; - struct udev_monitor *udev_monitor; + struct udev_monitor *udev_seat_monitor, *udev_vcsa_monitor; + + int udev_seat_fd; + int udev_vcsa_fd; - int udev_fd; int console_active_fd; int bus_fd; int epoll_fd; - int n_autovts; + unsigned n_autovts; Seat *vtconsole; char *cgroup_path; - char **controllers, **reset_controllers; + char **controllers; - char **kill_only_users, **kill_exlude_users; + char **kill_only_users, **kill_exclude_users; bool kill_user_processes; + + unsigned long session_counter; + + Hashmap *cgroups; + Hashmap *pipe_fds; +}; + +enum { + FD_SEAT_UDEV, + FD_VCSA_UDEV, + FD_CONSOLE, + FD_BUS, + FD_PIPE_BASE }; Manager *manager_new(void); void manager_free(Manager *m); + int manager_add_device(Manager *m, const char *sysfs, Device **_device); int manager_add_seat(Manager *m, const char *id, Seat **_seat); int manager_add_session(Manager *m, User *u, const char *id, Session **_session); int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user); int manager_add_user_by_name(Manager *m, const char *name, User **_user); int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user); -int manager_process_device(Manager *m, struct udev_device *d); -int manager_dispatch_udev(Manager *m); + +int manager_process_seat_device(Manager *m, struct udev_device *d); +int manager_dispatch_seat_udev(Manager *m); +int manager_dispatch_vcsa_udev(Manager *m); int manager_dispatch_console(Manager *m); + int manager_enumerate_devices(Manager *m); int manager_enumerate_seats(Manager *m); int manager_enumerate_sessions(Manager *m); int manager_enumerate_users(Manager *m); -int manager_start_one_linger_user(Manager *m, const char *user); -int manager_start_linger_users(Manager *m); + int manager_startup(Manager *m); int manager_run(Manager *m); int manager_spawn_autovt(Manager *m, int vtnr); -bool x11_display_is_local(const char *display); +void manager_cgroup_notify_empty(Manager *m, const char *cgroup); + +void manager_gc(Manager *m); + +int manager_get_idle_hint(Manager *m, dual_timestamp *t); + +extern const DBusObjectPathVTable bus_manager_vtable; + +DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata); + +int manager_send_changed(Manager *manager, const char *properties); #endif