chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: suppress messages about adm group if ACL support is not enabled
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index f9c769e42b7eb4c4f665659f9bb92b6657b5488d..a9d08f0a25d0ebe9fc904190cd6a3f5ce91a8b04 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;
@@
-74,7
+74,7
@@
struct Watch {
int fd;
WatchType type;
union {
int fd;
WatchType type;
union {
-
union
Unit *unit;
+
struct
Unit *unit;
struct Job *job;
DBusWatch *bus_watch;
DBusTimeout *bus_timeout;
struct Job *job;
DBusWatch *bus_watch;
DBusTimeout *bus_timeout;
@@
-93,7
+93,7
@@
struct Watch {
struct Manager {
/* Note that the set of units we know of is allowed to be
struct Manager {
/* Note that the set of units we know of is allowed to be
- * incosistent. However the subset of it that is loaded may
+ * inco
n
sistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
/* Active jobs and units */
* not, and the list of jobs may neither. */
/* Active jobs and units */
@@
-102,10
+102,10
@@
struct Manager {
/* To make it easy to iterate through the units of a specific
* type we maintain a per type linked list */
/* To make it easy to iterate through the units of a specific
* type we maintain a per type linked list */
- LIST_HEAD(
Meta, units_per
_type[_UNIT_TYPE_MAX]);
+ LIST_HEAD(
Unit, units_by
_type[_UNIT_TYPE_MAX]);
/* Units that need to be loaded */
/* Units that need to be loaded */
- LIST_HEAD(
Meta
, load_queue); /* this is actually more a stack than a queue, but uh. */
+ LIST_HEAD(
Unit
, load_queue); /* this is actually more a stack than a queue, but uh. */
/* Jobs that need to be run */
LIST_HEAD(Job, run_queue); /* more a stack than a queue, too */
/* Jobs that need to be run */
LIST_HEAD(Job, run_queue); /* more a stack than a queue, too */
@@
-114,14
+114,14
@@
struct Manager {
* D-Bus. When something about a job changes it is added here
* if it is not in there yet. This allows easy coalescing of
* D-Bus change signals. */
* D-Bus. When something about a job changes it is added here
* if it is not in there yet. This allows easy coalescing of
* D-Bus change signals. */
- LIST_HEAD(
Meta
, dbus_unit_queue);
+ LIST_HEAD(
Unit
, dbus_unit_queue);
LIST_HEAD(Job, dbus_job_queue);
/* Units to remove */
LIST_HEAD(Job, dbus_job_queue);
/* Units to remove */
- LIST_HEAD(
Meta
, cleanup_queue);
+ LIST_HEAD(
Unit
, cleanup_queue);
/* Units to check when doing GC */
/* Units to check when doing GC */
- LIST_HEAD(
Meta
, gc_queue);
+ LIST_HEAD(
Unit
, gc_queue);
/* Jobs to be added */
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
/* Jobs to be added */
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
@@
-148,7
+148,6
@@
struct Manager {
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
- char *console;
char *generator_unit_path;
/* Data specific to the device subsystem */
char *generator_unit_path;
/* Data specific to the device subsystem */
@@
-180,9
+179,11
@@
struct Manager {
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
int32_t name_data_slot;
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
int32_t name_data_slot;
+ int32_t conn_data_slot;
int32_t subscribed_data_slot;
uint32_t current_job_id;
int32_t subscribed_data_slot;
uint32_t current_job_id;
+ uint32_t default_unit_job_id;
/* Data specific to the Automount subsystem */
int dev_autofs_fd;
/* Data specific to the Automount subsystem */
int dev_autofs_fd;
@@
-195,7
+196,7
@@
struct Manager {
int gc_marker;
unsigned n_in_gc_queue;
int gc_marker;
unsigned n_in_gc_queue;
- /* Make sure the user cannot accidentaly unmount our cgroup
+ /* Make sure the user cannot accidental
l
y unmount our cgroup
* file system */
int pin_cgroupfs_fd;
* file system */
int pin_cgroupfs_fd;
@@
-212,6
+213,8
@@
struct Manager {
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
+ bool taint_usr:1;
+
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
@@
-220,7
+223,10
@@
struct Manager {
bool mount_auto;
bool swap_auto;
bool mount_auto;
bool swap_auto;
- int n_deserializing;
+ ExecOutput default_std_output, default_std_error;
+
+ /* non-zero if we are reloading or reexecuting, */
+ int n_reloading;
unsigned n_installed_jobs;
unsigned n_failed_jobs;
unsigned n_installed_jobs;
unsigned n_failed_jobs;
@@
-256,7
+262,6
@@
unsigned manager_dispatch_load_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
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_set_default_controllers(Manager *m, char **controllers);
int manager_loop(Manager *m);
@@
-285,6
+290,11
@@
void manager_check_finished(Manager *m);
void manager_run_generators(Manager *m);
void manager_undo_generators(Manager *m);
void manager_run_generators(Manager *m);
void manager_undo_generators(Manager *m);
+void manager_recheck_journal(Manager *m);
+
+void manager_set_show_status(Manager *m, bool b);
+bool manager_get_show_status(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);