chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: make chain of main commands and control commands independent of each other...
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index a573debe034df8c74f01cb1987f6bb7b313967cd..d8559f1bec40a7ccf580215e0929801606ca60a9 100644
(file)
--- a/
src/manager.h
+++ b/
src/manager.h
@@
-30,7
+30,7
@@
#include "fdset.h"
/* Enforce upper limit how many names we allow */
#include "fdset.h"
/* Enforce upper limit how many names we allow */
-#define MANAGER_MAX_NAMES
2048
+#define MANAGER_MAX_NAMES
131072 /* 128K */
typedef struct Manager Manager;
typedef enum WatchType WatchType;
typedef struct Manager Manager;
typedef enum WatchType WatchType;
@@
-51,7
+51,7
@@
typedef enum ManagerExitCode {
typedef enum ManagerRunningAs {
MANAGER_SYSTEM,
typedef enum ManagerRunningAs {
MANAGER_SYSTEM,
- MANAGER_
SESSION
,
+ MANAGER_
USER
,
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
@@
-64,6
+64,7
@@
enum WatchType {
WATCH_UNIT_TIMER,
WATCH_JOB_TIMER,
WATCH_MOUNT,
WATCH_UNIT_TIMER,
WATCH_JOB_TIMER,
WATCH_MOUNT,
+ WATCH_SWAP,
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT
@@
-141,11
+142,14
@@
struct Manager {
Set *unit_path_cache;
char **environment;
Set *unit_path_cache;
char **environment;
+ char **default_controllers;
+ dual_timestamp initrd_timestamp;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
char *console;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
char *console;
+ char *generator_unit_path;
/* Data specific to the device subsystem */
struct udev* udev;
/* Data specific to the device subsystem */
struct udev* udev;
@@
-161,6
+165,7
@@
struct Manager {
FILE *proc_swaps;
Hashmap *swaps_by_proc_swaps;
bool request_reload;
FILE *proc_swaps;
Hashmap *swaps_by_proc_swaps;
bool request_reload;
+ Watch swap_watch;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
@@
-252,6
+257,7
@@
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
int manager_set_console(Manager *m, const char *console);
unsigned manager_dispatch_dbus_queue(Manager *m);
int manager_set_console(Manager *m, const char *console);
+int manager_set_default_controllers(Manager *m, char **controllers);
int manager_loop(Manager *m);
int manager_loop(Manager *m);
@@
-276,6
+282,9
@@
bool manager_unit_pending_inactive(Manager *m, const char *name);
void manager_check_finished(Manager *m);
void manager_check_finished(Manager *m);
+void manager_run_generators(Manager *m);
+void manager_undo_generators(Manager *m);
+
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);