X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=4783ea3b2106dc1d77222eca1f47638b07dc1a2d;hp=ce252118786dd9aca070de635a600ba19f9a67f3;hb=3d1092eab0f4a5c771225c78072a7b6eccb82849;hpb=9444b1f20e311f073864d81e913bd4f32fe95cfd diff --git a/src/login/logind.h b/src/login/logind.h index ce2521187..4783ea3b2 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -22,29 +22,27 @@ ***/ #include -#include -#include #include -#include "util.h" -#include "audit.h" +#include "config.h" +#include "sd-event.h" +#include "sd-bus.h" +#include "cgroup-util.h" +#include "path-lookup.h" #include "list.h" #include "hashmap.h" -#include "cgroup-util.h" +#include "set.h" typedef struct Manager Manager; #include "logind-device.h" -#include "logind-seat.h" -#include "logind-session.h" -#include "logind-user.h" #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,48 +50,52 @@ struct Manager { Hashmap *users; Hashmap *inhibitors; Hashmap *buttons; - Hashmap *machines; 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; + + 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; + + /* Make sure the user cannot accidentally unmount our cgroup + * file system */ + int pin_cgroupfs_fd; - int udev_seat_fd; - int udev_vcsa_fd; - int udev_button_fd; + /* Flags */ + ManagerRunningAs running_as; + bool test_run:1; + + /* Data specific to the cgroup subsystem */ + CGroupMask cgroup_supported; + char *cgroup_root; int console_active_fd; - int bus_fd; - int epoll_fd; +/// elogind does not support autospawning of vts +#if 0 unsigned n_autovts; unsigned reserve_vt; int reserve_vt_fd; +#endif // 0 - Seat *vtconsole; - - char *cgroup_root; - char **controllers, **reset_controllers; + Seat *seat0; char **kill_only_users, **kill_exclude_users; - bool kill_user_processes; unsigned long session_counter; unsigned long inhibit_counter; - Hashmap *session_cgroups; - Hashmap *user_cgroups; - Hashmap *machine_cgroups; - - Hashmap *session_fds; - Hashmap *inhibitor_fds; - Hashmap *button_fds; + Hashmap *session_units; + Hashmap *user_units; usec_t inhibit_delay_max; @@ -101,6 +103,8 @@ struct Manager { * this is != 0 and encodes what is being done */ InhibitWhat action_what; +/// elogind does all relevant actions on its own. No systemd jobs and units. +#if 0 /* If a shutdown/suspend was delayed due to a inhibitor this contains the unit name we are supposed to start after the delay is over */ @@ -109,9 +113,28 @@ struct Manager { /* If a shutdown/suspend is currently executed, then this is * the job of it */ char *action_job; - usec_t action_timestamp; +#else + /* If a shutdown/suspend was delayed due to a inhibitor this + contains the action we are supposed to perform after the + delay is over */ + HandleAction pending_action; +#endif // 0 + + sd_event_source *inhibit_timeout_source; + + char *scheduled_shutdown_type; + usec_t scheduled_shutdown_timeout; + sd_event_source *scheduled_shutdown_timeout_source; + uid_t scheduled_shutdown_uid; + char *scheduled_shutdown_tty; + sd_event_source *nologin_timeout_source; + bool unlink_nologin; + + char *wall_message; + unsigned enable_wall_messages; + sd_event_source *wall_message_timeout_source; - 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; @@ -120,27 +143,28 @@ struct Manager { HandleAction handle_suspend_key; HandleAction handle_hibernate_key; HandleAction handle_lid_switch; + HandleAction handle_lid_switch_docked; bool power_key_ignore_inhibited; 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 -}; + bool remove_ipc; + + char **suspend_state, **suspend_mode; + char **hibernate_state, **hibernate_mode; + char **hybrid_sleep_state, **hybrid_sleep_mode; + + Hashmap *polkit_registry; -Manager *manager_new(void); -void manager_free(Manager *m); + usec_t holdoff_timeout_usec; + sd_event_source *lid_switch_ignore_event_source; -int manager_add_device(Manager *m, const char *sysfs, Device **_device); + size_t runtime_dir_size; +}; + +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); @@ -148,51 +172,58 @@ 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); +// UNNEEDED int manager_spawn_autovt(Manager *m, unsigned int vtnr); -void manager_cgroup_notify_empty(Manager *m, const char *cgroup); - -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_cgroup(Manager *m, const char *cgroup, User **user); int manager_get_user_by_pid(Manager *m, pid_t pid, User **user); -int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session); int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session); -int manager_get_machine_by_cgroup(Manager *m, const char *cgroup, Machine **machine); -int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine); -extern const DBusObjectPathVTable bus_manager_vtable; +bool manager_is_docked_or_external_displays(Manager *m); + +extern const sd_bus_vtable manager_vtable[]; -DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata); +// UNNEEDED int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_name_owner_changed(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); +/// eloginds own version does the action itself +#if 0 +int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error); +#else +int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, HandleAction action, InhibitWhat w, sd_bus_error *error); +#endif // 0 -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); +// UNNEEDED int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job); +// UNNEEDED int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +// UNNEEDED int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +// UNNEEDED int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *error); +// UNNEEDED int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error); +// UNNEEDED int manager_unit_is_active(Manager *manager, const char *unit); +// UNNEEDED int manager_job_is_active(Manager *manager, const char *path); /* gperf lookup function */ -const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); +const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + +int manager_set_lid_switch_ignore(Manager *m, usec_t until); + +int config_parse_tmpfs_size(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret); +int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret); +int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Seat **ret); + +int manager_setup_wall_message_timer(Manager *m); +bool logind_wall_tty_filter(const char *tty, void *userdata); + +int manager_dispatch_delayed(Manager *manager, bool timeout);