X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.h;h=d8559f1bec40a7ccf580215e0929801606ca60a9;hp=eed137b10ab1d34effa6c61a8f7416f9af9117c2;hb=59d1a83370e333e906015a48dc9c1f1a458911f5;hpb=6398320759ce4ed84922bb28f715d3c6c66166c4 diff --git a/src/manager.h b/src/manager.h index eed137b10..d8559f1be 100644 --- a/src/manager.h +++ b/src/manager.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef foomanagerhfoo #define foomanagerhfoo @@ -30,7 +30,7 @@ #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; @@ -41,13 +41,17 @@ typedef enum ManagerExitCode { MANAGER_EXIT, MANAGER_RELOAD, MANAGER_REEXECUTE, + MANAGER_REBOOT, + MANAGER_POWEROFF, + MANAGER_HALT, + MANAGER_KEXEC, _MANAGER_EXIT_CODE_MAX, _MANAGER_EXIT_CODE_INVALID = -1 } ManagerExitCode; typedef enum ManagerRunningAs { MANAGER_SYSTEM, - MANAGER_SESSION, + MANAGER_USER, _MANAGER_RUNNING_AS_MAX, _MANAGER_RUNNING_AS_INVALID = -1 } ManagerRunningAs; @@ -57,8 +61,10 @@ enum WatchType { WATCH_SIGNAL, WATCH_NOTIFY, WATCH_FD, - WATCH_TIMER, + WATCH_UNIT_TIMER, + WATCH_JOB_TIMER, WATCH_MOUNT, + WATCH_SWAP, WATCH_UDEV, WATCH_DBUS_WATCH, WATCH_DBUS_TIMEOUT @@ -69,6 +75,7 @@ struct Watch { WatchType type; union { union Unit *unit; + struct Job *job; DBusWatch *bus_watch; DBusTimeout *bus_timeout; } data; @@ -85,8 +92,6 @@ struct Watch { #include "path-lookup.h" struct Manager { - uint32_t current_job_id; - /* Note that the set of units we know of is allowed to be * incosistent. However the subset of it that is loaded may * not, and the list of jobs may neither. */ @@ -134,15 +139,23 @@ struct Manager { unsigned n_snapshots; LookupPaths lookup_paths; + Set *unit_path_cache; char **environment; + char **default_controllers; + dual_timestamp initrd_timestamp; dual_timestamp startup_timestamp; + dual_timestamp finish_timestamp; + + char *console; + char *generator_unit_path; /* Data specific to the device subsystem */ struct udev* udev; struct udev_monitor* udev_monitor; Watch udev_watch; + Hashmap *devices_by_sysfs; /* Data specific to the mount subsystem */ FILE *proc_self_mountinfo; @@ -150,28 +163,32 @@ struct Manager { /* Data specific to the swap filesystem */ 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; DBusServer *private_bus; Set *bus_connections, *bus_connections_for_dispatch; - Set *subscribed; DBusMessage *queued_message; /* This is used during reloading: * before the reload we queue the * reply message here, and * afterwards we send it */ + DBusConnection *queued_message_connection; /* The connection to send the queued message on */ Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */ int32_t name_data_slot; + int32_t subscribed_data_slot; + + uint32_t current_job_id; /* 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_mount_point; char *cgroup_hierarchy; usec_t gc_queue_timestamp; @@ -182,20 +199,34 @@ struct Manager { * file system */ int pin_cgroupfs_fd; + /* Audit fd */ +#ifdef HAVE_AUDIT + int audit_fd; +#endif + /* Flags */ ManagerRunningAs running_as; - ManagerExitCode exit_code:4; + ManagerExitCode exit_code:5; bool dispatching_load_queue:1; bool dispatching_run_queue:1; bool dispatching_dbus_queue:1; - bool utmp_reboot_written:1; + bool show_status; + bool confirm_spawn; +#ifdef HAVE_SYSV_COMPAT + bool sysv_console; +#endif + bool mount_auto; + bool swap_auto; + + int n_deserializing; - bool confirm_spawn:1; + unsigned n_installed_jobs; + unsigned n_failed_jobs; }; -int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m); +int manager_new(ManagerRunningAs running_as, Manager **m); void manager_free(Manager *m); int manager_enumerate(Manager *m); @@ -208,11 +239,11 @@ 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_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret); +int manager_load_unit(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret); -int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret); -int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, Job **_ret); +int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, DBusError *e, Job **_ret); +int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, DBusError *e, Job **_ret); void manager_dump_units(Manager *s, FILE *f, const char *prefix); void manager_dump_jobs(Manager *s, FILE *f, const char *prefix); @@ -225,21 +256,35 @@ unsigned manager_dispatch_load_queue(Manager *m); unsigned manager_dispatch_run_queue(Manager *m); unsigned manager_dispatch_dbus_queue(Manager *m); -int manager_loop(Manager *m); +int manager_set_console(Manager *m, const char *console); +int manager_set_default_controllers(Manager *m, char **controllers); -void manager_write_utmp_reboot(Manager *m); -void manager_write_utmp_runlevel(Manager *m, Unit *t); +int manager_loop(Manager *m); 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_open_serialization(Manager *m, 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); +bool manager_is_booting_or_shutting_down(Manager *m); + +void manager_reset_failed(Manager *m); + +void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success); +void manager_send_unit_plymouth(Manager *m, Unit *u); + +bool manager_unit_pending_inactive(Manager *m, const char *name); + +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);