summaryrefslogtreecommitdiff
path: root/manager.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-21 04:01:24 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-21 04:01:24 +0200
commit9d58f1dbdb77be332731fb490d0d7f91a5718da8 (patch)
treee1ea724ab245d1b37317f822185aff06af01d99c /manager.h
parent51f7e59683d103590e70d17a177f1710b0b0326c (diff)
reorder large structs a little, based on pahole info
Diffstat (limited to 'manager.h')
-rw-r--r--manager.h40
1 files changed, 20 insertions, 20 deletions
diff --git a/manager.h b/manager.h
index 9321e809b6..356e168bf6 100644
--- a/manager.h
+++ b/manager.h
@@ -64,13 +64,13 @@ enum WatchType {
struct Watch {
int fd;
WatchType type;
- bool fd_is_dupped;
union {
union Unit *unit;
DBusWatch *bus_watch;
DBusTimeout *bus_timeout;
bool socket_accept;
} data;
+ bool fd_is_dupped;
};
#include "unit.h"
@@ -151,25 +151,13 @@ struct Manager {
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
JobDependency *transaction_anchor;
- bool dispatching_load_queue:1;
- bool dispatching_run_queue:1;
- bool dispatching_dbus_queue:1;
-
- bool request_api_bus_dispatch:1;
- bool request_system_bus_dispatch:1;
-
- bool utmp_reboot_written:1;
-
- bool confirm_spawn:1;
-
- ManagerExitCode exit_code:4;
- ManagerRunningAs running_as;
-
Hashmap *watch_pids; /* pid => Unit object n:1 */
+ Watch signal_watch;
+
int epoll_fd;
- Watch signal_watch;
+ unsigned n_snapshots;
char **unit_path;
char **sysvinit_path;
@@ -197,16 +185,28 @@ struct Manager {
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
int32_t name_data_slot;
+ /* Data specific to the Automount subsystem */
+ int dev_autofs_fd;
+
/* Data specific to the cgroup subsystem */
Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
char *cgroup_controller;
char *cgroup_hierarchy;
- /* Data specific to the Automount subsystem */
- int dev_autofs_fd;
+ /* Flags */
+ ManagerRunningAs running_as;
+ ManagerExitCode exit_code:4;
- /* Data specific to the Snapshot subsystem */
- unsigned n_snapshots;
+ bool dispatching_load_queue:1;
+ bool dispatching_run_queue:1;
+ bool dispatching_dbus_queue:1;
+
+ bool request_api_bus_dispatch:1;
+ bool request_system_bus_dispatch:1;
+
+ bool utmp_reboot_written:1;
+
+ bool confirm_spawn:1;
};
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);