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=533554d4bbe82a92e8e19c2118c26354a1051d14;hb=3d1092eab0f4a5c771225c78072a7b6eccb82849;hpb=1c231f56482546725c4dbd3303f70300bd3c63e9 diff --git a/src/login/logind.h b/src/login/logind.h index 533554d4b..4783ea3b2 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -22,12 +22,13 @@ ***/ #include -#include #include +#include "config.h" #include "sd-event.h" #include "sd-bus.h" -#include "util.h" +#include "cgroup-util.h" +#include "path-lookup.h" #include "list.h" #include "hashmap.h" #include "set.h" @@ -35,16 +36,10 @@ 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" -#define IGNORE_LID_SWITCH_STARTUP_USEC (3 * USEC_PER_MINUTE) -#define IGNORE_LID_SWITCH_SUSPEND_USEC (30 * USEC_PER_SEC) - struct Manager { sd_event *event; sd_bus *bus; @@ -56,8 +51,6 @@ struct Manager { Hashmap *inhibitors; Hashmap *buttons; - Set *busnames; - LIST_HEAD(Seat, seat_gc_queue); LIST_HEAD(Session, session_gc_queue); LIST_HEAD(User, user_gc_queue); @@ -71,12 +64,27 @@ struct Manager { 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; + + /* Flags */ + ManagerRunningAs running_as; + bool test_run:1; + + /* Data specific to the cgroup subsystem */ + CGroupMask cgroup_supported; + char *cgroup_root; + int console_active_fd; +/// elogind does not support autospawning of vts +#if 0 unsigned n_autovts; unsigned reserve_vt; int reserve_vt_fd; +#endif // 0 Seat *seat0; @@ -95,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 */ @@ -103,7 +113,26 @@ 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; sd_event_source *idle_action_event_source; usec_t idle_action_usec; @@ -114,22 +143,27 @@ 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; + bool remove_ipc; + + char **suspend_state, **suspend_mode; + char **hibernate_state, **hibernate_mode; + char **hybrid_sleep_state, **hybrid_sleep_mode; + Hashmap *polkit_registry; + usec_t holdoff_timeout_usec; sd_event_source *lid_switch_ignore_event_source; size_t runtime_dir_size; }; -Manager *manager_new(void); -void manager_free(Manager *m); - 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); @@ -142,11 +176,7 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor); int manager_process_seat_device(Manager *m, struct udev_device *d); int manager_process_button_device(Manager *m, struct udev_device *d); -int manager_startup(Manager *m); -int manager_run(Manager *m); -int manager_spawn_autovt(Manager *m, unsigned int vtnr); - -void manager_gc(Manager *m, bool drop_not_started); +// UNNEEDED int manager_spawn_autovt(Manager *m, unsigned int vtnr); bool manager_shall_kill(Manager *m, const char *user); @@ -155,37 +185,45 @@ 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); -bool manager_is_docked(Manager *m); -int manager_count_displays(Manager *m); +bool manager_is_docked_or_external_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; -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); +// 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); +/// 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 *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, const char *after, const char *after2, 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_abandon_scope(Manager *manager, const char *scope, sd_bus_error *error); -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); +// 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); - -int manager_watch_busname(Manager *manager, const char *name); -void manager_drop_busname(Manager *manager, const char *name); +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);