Prep v228: Add remaining updates from upstream (3/3)

[elogind.git] / src / login / logind.h

diff --git a/src/login/logind.h b/src/login/logind.h
index 4783ea3b2106dc1d77222eca1f47638b07dc1a2d..b57e8d0a2ebe439dece54cd129008ea92b4e4632 100644 (file)
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -22,23 +22,23 @@
 ***/
 
 #include <stdbool.h>
-#include <libudev.h>
 
-#include "config.h"
-#include "sd-event.h"
+#include "libudev.h"
 #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 "path-lookup.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"
 
 struct Manager {
         sd_event *event;
@@ -134,6 +134,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;
@@ -162,6 +164,7 @@ struct Manager {
         sd_event_source *lid_switch_ignore_event_source;
 
         size_t runtime_dir_size;
+        uint64_t user_tasks_max;
 };
 
 int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device);
@@ -204,7 +207,7 @@ int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, HandleAction action,
 
 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_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);// 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);