X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=53c2b38840d21a53d3e5d32df61a6986fb09a6af;hb=8331cb6e143dc261fd22af9a2a679196822326a9;hp=29432823e654d9eecd1f731c64a8238697591ec5;hpb=c286398e07a7a16aa88a3437318cb2edf8c082c1;p=elogind.git diff --git a/src/login/logind.h b/src/login/logind.h index 29432823e..53c2b3884 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -22,23 +20,27 @@ ***/ #include -#include -#include "config.h" -#include "sd-event.h" +#if 0 /// elogind needs the systems udev header +#include "libudev.h" +#else +#include +#endif // 0 #include "sd-bus.h" +#include "sd-event.h" + #include "cgroup-util.h" -#include "path-lookup.h" -#include "list.h" #include "hashmap.h" +#include "list.h" #include "set.h" typedef struct Manager Manager; +#include "logind-action.h" +#include "logind-button.h" #include "logind-device.h" #include "logind-inhibit.h" -#include "logind-button.h" -#include "logind-action.h" +#include "logind-sleep.h" struct Manager { sd_event *event; @@ -64,12 +66,19 @@ struct Manager { sd_event_source *udev_vcsa_event_source; sd_event_source *udev_button_event_source; +#if 0 /// elogind does not support autospawning of vts + int console_active_fd; + + unsigned n_autovts; + + unsigned reserve_vt; + int reserve_vt_fd; +#else /* 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 */ @@ -77,13 +86,6 @@ struct Manager { 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; @@ -103,8 +105,7 @@ 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 0 /// elogind does all relevant actions on its own. No systemd jobs and units. /* 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 */ @@ -118,8 +119,12 @@ struct Manager { contains the action we are supposed to perform after the delay is over */ HandleAction pending_action; -#endif // 0 + char **suspend_state, **suspend_mode; + char **hibernate_state, **hibernate_mode; + char **hybrid_sleep_state, **hybrid_sleep_mode; + +#endif // 0 sd_event_source *inhibit_timeout_source; char *scheduled_shutdown_type; @@ -134,6 +139,8 @@ struct Manager { unsigned enable_wall_messages; sd_event_source *wall_message_timeout_source; + bool shutdown_dry_run; + sd_event_source *idle_action_event_source; usec_t idle_action_usec; usec_t idle_action_not_before_usec; @@ -152,16 +159,15 @@ struct Manager { 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; + uint64_t user_tasks_max; + uint64_t sessions_max; + uint64_t inhibitors_max; }; int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device); @@ -176,7 +182,9 @@ 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); -// UNNEEDED int manager_spawn_autovt(Manager *m, unsigned int vtnr); +#if 0 /// UNNEEDED by elogind +int manager_spawn_autovt(Manager *m, unsigned int vtnr); +#endif // 0 bool manager_shall_kill(Manager *m, const char *user); @@ -185,34 +193,35 @@ 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_multiple_displays(Manager *m); +bool manager_is_docked_or_external_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; -// 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); +#if 0 /// UNNEEDED by elogind +int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); +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 +/// eloginds own version does the action itself 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_; -// 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); +#if 0 /// UNNEEDED by elogind +int manager_start_slice(Manager *manager, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, sd_bus_error *error, char **job); +int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, 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); +#endif // 0 /* gperf lookup function */ const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); @@ -225,5 +234,9 @@ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const ch 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); +#if 0 /// UNNEEDED by elogind int manager_setup_wall_message_timer(Manager *m); bool logind_wall_tty_filter(const char *tty, void *userdata); +#endif // 0 + +int manager_dispatch_delayed(Manager *manager, bool timeout);