X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.h;h=5b3aaf3364fe95d8be0a9d926253f125653d2fc1;hp=d78bcf5d76d82f2c281390504a0651e23fc42a0e;hb=7b97f4773207d9e1301f5263229ceba26b515756;hpb=84e3543ef4c4758621f8a304b14642072303ef82 diff --git a/src/manager.h b/src/manager.h index d78bcf5d7..5b3aaf336 100644 --- a/src/manager.h +++ b/src/manager.h @@ -46,9 +46,8 @@ typedef enum ManagerExitCode { } ManagerExitCode; typedef enum ManagerRunningAs { - MANAGER_INIT, /* root and pid=1 */ - MANAGER_SYSTEM, /* root and pid!=1 */ - MANAGER_SESSION, /* non-root, for a session */ + MANAGER_SYSTEM, + MANAGER_SESSION, _MANAGER_RUNNING_AS_MAX, _MANAGER_RUNNING_AS_INVALID = -1 } ManagerRunningAs; @@ -56,6 +55,7 @@ typedef enum ManagerRunningAs { enum WatchType { WATCH_INVALID, WATCH_SIGNAL, + WATCH_NOTIFY, WATCH_FD, WATCH_TIMER, WATCH_MOUNT, @@ -84,53 +84,6 @@ struct Watch { #include "dbus.h" #include "path-lookup.h" -#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" -#define SPECIAL_SIGPWR_TARGET "sigpwr.target" -#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" - -#define SPECIAL_LOCAL_FS_TARGET "local-fs.target" /* LSB's $local_fs */ -#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */ -#define SPECIAL_SWAP_TARGET "swap.target" -#define SPECIAL_NETWORK_TARGET "network.target" /* LSB's $network */ -#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */ -#define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */ -#define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */ -#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */ -#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */ -#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */ -#define SPECIAL_BASIC_TARGET "basic.target" -#define SPECIAL_SYSINIT_TARGET "sysinit.target" -#define SPECIAL_RESCUE_TARGET "rescue.target" -#define SPECIAL_EXIT_SERVICE "exit.service" - -#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. */ -#define SPECIAL_RUNLEVEL0_TARGET "runlevel0.target" -#define SPECIAL_RUNLEVEL1_TARGET "runlevel1.target" -#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target" -#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target" -#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target" -#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target" -#define SPECIAL_RUNLEVEL6_TARGET "runlevel6.target" - struct Manager { uint32_t current_job_id; @@ -171,6 +124,9 @@ struct Manager { Hashmap *watch_pids; /* pid => Unit object n:1 */ + char *notify_socket; + + Watch notify_watch; Watch signal_watch; int epoll_fd; @@ -181,7 +137,7 @@ struct Manager { char **environment; - timestamp startup_timestamp; + dual_timestamp startup_timestamp; /* Data specific to the device subsystem */ struct udev* udev; @@ -197,14 +153,18 @@ struct Manager { /* Data specific to the D-Bus subsystem */ DBusConnection *api_bus, *system_bus; - Set *subscribed; + DBusServer *private_bus; + Set *bus_connections, *bus_connections_for_dispatch; + 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; /* Data specific to the Automount subsystem */ int dev_autofs_fd; @@ -212,13 +172,17 @@ struct Manager { /* 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; - int gc_marker; unsigned n_in_gc_queue; + /* Make sure the user cannot accidentaly unmount our cgroup + * file system */ + int pin_cgroupfs_fd; + /* Flags */ ManagerRunningAs running_as; ManagerExitCode exit_code:4; @@ -227,15 +191,13 @@ struct Manager { 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; + bool show_status; + bool confirm_spawn; }; -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); @@ -280,6 +242,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds); int manager_reload(Manager *m); +bool manager_is_booting_or_shutting_down(Manager *m); + const char *manager_running_as_to_string(ManagerRunningAs i); ManagerRunningAs manager_running_as_from_string(const char *s);