chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: pack structs a bit tighter
[elogind.git]
/
manager.h
diff --git
a/manager.h
b/manager.h
index cb4af820d9ce9c35f4c4f8c8668d69c1c983140b..9321e809b64037df0750d29bfe307fff22b3371e 100644
(file)
--- a/
manager.h
+++ b/
manager.h
@@
-25,13
+25,23
@@
#include <stdbool.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdbool.h>
#include <inttypes.h>
#include <stdio.h>
-
#include <dbus/dbus.h>
#include <dbus/dbus.h>
+#include "fdset.h"
+
typedef struct Manager Manager;
typedef enum WatchType WatchType;
typedef struct Watch Watch;
typedef struct Manager Manager;
typedef enum WatchType WatchType;
typedef struct Watch Watch;
+typedef enum ManagerExitCode {
+ MANAGER_RUNNING,
+ MANAGER_EXIT,
+ MANAGER_RELOAD,
+ MANAGER_REEXECUTE,
+ _MANAGER_EXIT_CODE_MAX,
+ _MANAGER_EXIT_CODE_INVALID = -1
+} ManagerExitCode;
+
typedef enum ManagerRunningAs {
MANAGER_INIT, /* root and pid=1 */
MANAGER_SYSTEM, /* root and pid!=1 */
typedef enum ManagerRunningAs {
MANAGER_INIT, /* root and pid=1 */
MANAGER_SYSTEM, /* root and pid!=1 */
@@
-108,9
+118,6
@@
struct Watch {
#define SPECIAL_RUNLEVEL6_TARGET "runlevel6.target"
struct Manager {
#define SPECIAL_RUNLEVEL6_TARGET "runlevel6.target"
struct Manager {
- /* In which mode are we running */
- ManagerRunningAs running_as;
-
uint32_t current_job_id;
/* Note that the set of units we know of is allowed to be
uint32_t current_job_id;
/* Note that the set of units we know of is allowed to be
@@
-155,6
+162,9
@@
struct Manager {
bool confirm_spawn:1;
bool confirm_spawn:1;
+ ManagerExitCode exit_code:4;
+ ManagerRunningAs running_as;
+
Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
@@
-165,6
+175,8
@@
struct Manager {
char **sysvinit_path;
char **sysvrcnd_path;
char **sysvinit_path;
char **sysvrcnd_path;
+ usec_t boot_timestamp;
+
/* Data specific to the device subsystem */
struct udev* udev;
struct udev_monitor* udev_monitor;
/* Data specific to the device subsystem */
struct udev* udev;
struct udev_monitor* udev_monitor;
@@
-177,6
+189,10
@@
struct Manager {
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
Set *subscribed;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
Set *subscribed;
+ DBusMessage *queued_message; /* This is used during reloading:
+ * before the reload we queue the
+ * reply message here, and
+ * afterwards we send it */
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;
@@
-186,13
+202,19
@@
struct Manager {
char *cgroup_controller;
char *cgroup_hierarchy;
char *cgroup_controller;
char *cgroup_hierarchy;
- usec_t boot_timestamp;
+ /* Data specific to the Automount subsystem */
+ int dev_autofs_fd;
+
+ /* Data specific to the Snapshot subsystem */
+ unsigned n_snapshots;
};
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);
void manager_free(Manager *m);
};
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);
void manager_free(Manager *m);
+int manager_enumerate(Manager *m);
int manager_coldplug(Manager *m);
int manager_coldplug(Manager *m);
+int manager_startup(Manager *m, FILE *serialization, FDSet *fds);
Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);
Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);
@@
-224,6
+246,13
@@
void manager_write_utmp_runlevel(Manager *m, Unit *t);
void manager_dispatch_bus_name_owner_changed(Manager *m, const char *name, const char* old_owner, const char *new_owner);
void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid);
void manager_dispatch_bus_name_owner_changed(Manager *m, const char *name, const char* old_owner, const char *new_owner);
void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid);
+int manager_open_serialization(FILE **_f);
+
+int manager_serialize(Manager *m, FILE *f, FDSet *fds);
+int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
+
+int manager_reload(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);