X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogind.h;h=fd668a2c19cc7863dd0260afb326e3c731852239;hp=e4b7a3c4e03b5460d77694cd8180500ab4d4ae8f;hb=57a8eca84a1eda99c8cfb63889fa300ba982cb77;hpb=3f49d45a45c6c585098590174c3245d2d9bdde0a diff --git a/src/logind.h b/src/logind.h index e4b7a3c4e..fd668a2c1 100644 --- a/src/logind.h +++ b/src/logind.h @@ -32,19 +32,6 @@ #include "hashmap.h" #include "cgroup-util.h" -/* TODO: - * - * recreate VTs when disallocated - * udev rules - * PAM rewrite - * spawn user systemd - * dbus API - * don't allow everybody to take logind name - * - * non-local X11 server - * reboot/shutdown halt management - */ - typedef struct Manager Manager; #include "logind-device.h" @@ -65,9 +52,11 @@ struct Manager { 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; @@ -82,6 +71,19 @@ struct Manager { char **kill_only_users, **kill_exclude_users; bool kill_user_processes; + + unsigned long session_counter; + + Hashmap *cgroups; + Hashmap *fifo_fds; +}; + +enum { + FD_SEAT_UDEV, + FD_VCSA_UDEV, + FD_CONSOLE, + FD_BUS, + FD_FIFO_BASE }; Manager *manager_new(void); @@ -94,8 +96,9 @@ int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, 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); @@ -107,10 +110,19 @@ int manager_startup(Manager *m); int manager_run(Manager *m); int manager_spawn_autovt(Manager *m, int vtnr); -void manager_gc(Manager *m); +void manager_cgroup_notify_empty(Manager *m, const char *cgroup); + +void manager_gc(Manager *m, bool drop_not_started); -bool x11_display_is_local(const char *display); +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); + +/* gperf lookup function */ +const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); + #endif