X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=a6500ac6007137df2da7136257621ae241973c4c;hp=77e55339cd1baf312ae3568d712c4c2183a6dc6b;hb=173e382182d7f1ad2b132b6e923ef731d6affdf7;hpb=41447faf1fc57463becabce399d983df762a104c diff --git a/manager.h b/manager.h index 77e55339c..a6500ac60 100644 --- a/manager.h +++ b/manager.h @@ -25,13 +25,26 @@ #include #include #include - #include +#include "fdset.h" + +/* Enforce upper limit how many names we allow */ +#define MANAGER_MAX_NAMES 2048 + 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 */ @@ -54,13 +67,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:1; + bool socket_accept:1; }; #include "unit.h" @@ -72,6 +85,12 @@ struct Watch { #define SPECIAL_DEFAULT_TARGET "default.target" +/* This is not really intended to be started by directly. This is + * mostly so that other targets (reboot/halt/poweroff) can depend on + * it to bring all services down that want to be brought down on + * system shutdown. */ +#define SPECIAL_SHUTDOWN_TARGET "shutdown.target" + #define SPECIAL_LOGGER_SOCKET "systemd-logger.socket" #define SPECIAL_KBREQUEST_TARGET "kbrequest.target" @@ -80,6 +99,7 @@ struct Watch { #define SPECIAL_LOCAL_FS_TARGET "local-fs.target" #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" +#define SPECIAL_SWAP_TARGET "swap.target" #define SPECIAL_NETWORK_TARGET "network.target" #define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */ #define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */ @@ -108,9 +128,6 @@ struct Watch { #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 @@ -138,33 +155,30 @@ struct Manager { LIST_HEAD(Meta, dbus_unit_queue); LIST_HEAD(Job, dbus_job_queue); + /* Units to remove */ LIST_HEAD(Meta, cleanup_queue); + /* Units to check when doing GC */ + LIST_HEAD(Meta, gc_queue); + /* Jobs to be added */ 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; - 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; char **sysvrcnd_path; + char **environment; + usec_t boot_timestamp; /* Data specific to the device subsystem */ @@ -176,29 +190,55 @@ struct Manager { FILE *proc_self_mountinfo; Watch mount_watch; + /* Data specific to the swap filesystem */ + FILE *proc_swaps; + /* 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; + /* 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; + usec_t gc_queue_timestamp; - /* Data specific to the Snapshot subsystem */ - unsigned n_snapshots; + int gc_marker; + unsigned n_in_gc_queue; + + /* Flags */ + ManagerRunningAs running_as; + ManagerExitCode exit_code:4; + + 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); void manager_free(Manager *m); +int manager_enumerate(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); @@ -206,6 +246,7 @@ Unit *manager_get_unit(Manager *m, const char *name); int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u); int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j); +int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Unit **_ret); int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret); int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret); @@ -230,6 +271,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); +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);