X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=356e168bf65c541a36dd16acbd0231ca01b6aa8d;hp=b6c0a51ecf1da67da58bf0ccacb1331b5bf6a5fd;hb=9d58f1dbdb77be332731fb490d0d7f91a5718da8;hpb=adcbe07c2f8d753dd8e1bcd577b383e2dd64cb7d diff --git a/manager.h b/manager.h index b6c0a51ec..356e168bf 100644 --- a/manager.h +++ b/manager.h @@ -25,17 +25,27 @@ #include #include #include - #include +#include "fdset.h" + 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 */ - MANAGER_SESSION, /* non-root */ + MANAGER_SESSION, /* non-root, for a session */ _MANAGER_RUNNING_AS_MAX, _MANAGER_RUNNING_AS_INVALID = -1 } ManagerRunningAs; @@ -54,12 +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" @@ -70,19 +81,31 @@ struct Watch { #include "dbus.h" #define SPECIAL_DEFAULT_TARGET "default.target" -#define SPECIAL_SYSLOG_SERVICE "syslog.service" -#define SPECIAL_DBUS_SERVICE "messagebus.service" + #define SPECIAL_LOGGER_SOCKET "systemd-logger.socket" + #define SPECIAL_KBREQUEST_TARGET "kbrequest.target" +#define SPECIAL_SIGPWR_TARGET "sigpwr.target" #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" + #define SPECIAL_LOCAL_FS_TARGET "local-fs.target" +#define SPECIAL_REMOTE_FS_TARGET "remote-fs.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 */ -#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" #define SPECIAL_SYSLOG_TARGET "syslog.target" /* Should pull in syslog.socket or syslog.service */ #define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */ + #define SPECIAL_BASIC_TARGET "basic.target" +#define SPECIAL_RESCUE_TARGET "rescue.target" + +#ifndef SPECIAL_DBUS_SERVICE +#define SPECIAL_DBUS_SERVICE "dbus.service" +#endif + +#ifndef SPECIAL_SYSLOG_SERVICE +#define SPECIAL_SYSLOG_SERVICE "syslog.service" +#endif /* For SysV compatibility. Usually an alias for a saner target. On * SysV-free systems this doesn't exist. */ @@ -95,9 +118,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 @@ -131,23 +151,20 @@ 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; - 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; + usec_t boot_timestamp; + /* Data specific to the device subsystem */ struct udev* udev; struct udev_monitor* udev_monitor; @@ -160,17 +177,44 @@ struct Manager { /* 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; + + /* 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, 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_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); @@ -178,8 +222,10 @@ 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(Manager *m, const char *path_or_name, 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); +int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, Job **_ret); void manager_dump_units(Manager *s, FILE *f, const char *prefix); void manager_dump_jobs(Manager *s, FILE *f, const char *prefix); @@ -194,6 +240,19 @@ unsigned manager_dispatch_dbus_queue(Manager *m); int manager_loop(Manager *m); +void manager_write_utmp_reboot(Manager *m); +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);