X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=b84137c78b0587c8dd4dfc805c310ee87fdf4c1d;hp=b7277af73d5669c262479aaf2958941bd00ce465;hb=a0a6be9f6ab55ea76215c7fa4a5eab2235687348;hpb=fb6becb4436ae4078337011b2017ce294e7361cf diff --git a/src/login/logind.h b/src/login/logind.h index b7277af73..b84137c78 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -23,14 +23,14 @@ #include #include -#include #include +#include "sd-event.h" +#include "sd-bus.h" #include "util.h" -#include "audit.h" #include "list.h" #include "hashmap.h" -#include "cgroup-util.h" +#include "set.h" typedef struct Manager Manager; @@ -41,10 +41,10 @@ typedef struct Manager Manager; #include "logind-inhibit.h" #include "logind-button.h" #include "logind-action.h" -#include "logind-machine.h" struct Manager { - DBusConnection *bus; + sd_event *event; + sd_bus *bus; Hashmap *devices; Hashmap *seats; @@ -52,30 +52,30 @@ struct Manager { Hashmap *users; Hashmap *inhibitors; Hashmap *buttons; - Hashmap *machines; + + Set *busnames; LIST_HEAD(Seat, seat_gc_queue); LIST_HEAD(Session, session_gc_queue); LIST_HEAD(User, user_gc_queue); - LIST_HEAD(Machine, machine_gc_queue); struct udev *udev; - struct udev_monitor *udev_seat_monitor, *udev_vcsa_monitor, *udev_button_monitor; + struct udev_monitor *udev_seat_monitor, *udev_device_monitor, *udev_vcsa_monitor, *udev_button_monitor; - int udev_seat_fd; - int udev_vcsa_fd; - int udev_button_fd; + sd_event_source *console_active_event_source; + sd_event_source *udev_seat_event_source; + sd_event_source *udev_device_event_source; + sd_event_source *udev_vcsa_event_source; + sd_event_source *udev_button_event_source; int console_active_fd; - int bus_fd; - int epoll_fd; unsigned n_autovts; unsigned reserve_vt; int reserve_vt_fd; - Seat *vtconsole; + Seat *seat0; char **kill_only_users, **kill_exclude_users; bool kill_user_processes; @@ -85,11 +85,6 @@ struct Manager { Hashmap *session_units; Hashmap *user_units; - Hashmap *machine_units; - - Hashmap *session_fds; - Hashmap *inhibitor_fds; - Hashmap *button_fds; usec_t inhibit_delay_max; @@ -107,7 +102,7 @@ struct Manager { char *action_job; usec_t action_timestamp; - int idle_action_fd; /* the timer_fd */ + sd_event_source *idle_action_event_source; usec_t idle_action_usec; usec_t idle_action_not_before_usec; HandleAction idle_action; @@ -121,22 +116,14 @@ struct Manager { bool suspend_key_ignore_inhibited; bool hibernate_key_ignore_inhibited; bool lid_switch_ignore_inhibited; -}; -enum { - FD_SEAT_UDEV, - FD_VCSA_UDEV, - FD_BUTTON_UDEV, - FD_CONSOLE, - FD_BUS, - FD_IDLE_ACTION, - FD_OTHER_BASE + Hashmap *polkit_registry; }; Manager *manager_new(void); void manager_free(Manager *m); -int manager_add_device(Manager *m, const char *sysfs, Device **_device); +int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device); int manager_add_button(Manager *m, const char *name, Button **_button); int manager_add_seat(Manager *m, const char *id, Seat **_seat); int manager_add_session(Manager *m, const char *id, Session **_session); @@ -144,52 +131,46 @@ 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_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor); -int manager_add_machine(Manager *m, const char *name, Machine **_machine); int manager_process_seat_device(Manager *m, struct udev_device *d); int manager_process_button_device(Manager *m, struct udev_device *d); -int manager_dispatch_seat_udev(Manager *m); -int manager_dispatch_vcsa_udev(Manager *m); -int manager_dispatch_button_udev(Manager *m); -int manager_dispatch_console(Manager *m); -int manager_dispatch_idle_action(Manager *m); - -int manager_enumerate_devices(Manager *m); -int manager_enumerate_buttons(Manager *m); -int manager_enumerate_seats(Manager *m); -int manager_enumerate_sessions(Manager *m); -int manager_enumerate_users(Manager *m); -int manager_enumerate_inhibitors(Manager *m); -int manager_enumerate_machines(Manager *m); - int manager_startup(Manager *m); int manager_run(Manager *m); -int manager_spawn_autovt(Manager *m, int vtnr); +int manager_spawn_autovt(Manager *m, unsigned int vtnr); void manager_gc(Manager *m, bool drop_not_started); +bool manager_shall_kill(Manager *m, const char *user); + int manager_get_idle_hint(Manager *m, dual_timestamp *t); int manager_get_user_by_pid(Manager *m, pid_t pid, User **user); int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session); -int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine); -extern const DBusObjectPathVTable bus_manager_vtable; +extern const sd_bus_vtable manager_vtable[]; -DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata); +int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, DBusError *error); +int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error); -int manager_send_changed(Manager *manager, const char *properties); +int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_; int manager_dispatch_delayed(Manager *manager); -int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, DBusError *error, char **job); -int manager_start_unit(Manager *manager, const char *unit, DBusError *error, char **job); -int manager_stop_unit(Manager *manager, const char *unit, DBusError *error, char **job); -int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, DBusError *error); +int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *kill_mode, sd_bus_error *error, char **job); +int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error); int manager_unit_is_active(Manager *manager, const char *unit); +int manager_job_is_active(Manager *manager, const char *path); /* gperf lookup function */ const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); + +int manager_watch_busname(Manager *manager, const char *name); +void manager_drop_busname(Manager *manager, const char *name);