X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmanager.h;h=3ec8d707d2887705c4d05ea8481701c3cc210ec3;hb=25cee55076a7c00c0a584731c2705686cc843210;hp=be2780bafe2a53e6375da5e21ee944f80da71ca6;hpb=d081dffbd3e57dc9da494a3384e333bf565d4175;p=elogind.git

diff --git a/src/core/manager.h b/src/core/manager.h
index be2780baf..3ec8d707d 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foomanagerhfoo
-#define foomanagerhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -50,13 +49,6 @@ typedef enum ManagerExitCode {
         _MANAGER_EXIT_CODE_INVALID = -1
 } ManagerExitCode;
 
-typedef enum ManagerRunningAs {
-        MANAGER_SYSTEM,
-        MANAGER_USER,
-        _MANAGER_RUNNING_AS_MAX,
-        _MANAGER_RUNNING_AS_INVALID = -1
-} ManagerRunningAs;
-
 enum WatchType {
         WATCH_INVALID,
         WATCH_SIGNAL,
@@ -68,7 +60,8 @@ enum WatchType {
         WATCH_SWAP,
         WATCH_UDEV,
         WATCH_DBUS_WATCH,
-        WATCH_DBUS_TIMEOUT
+        WATCH_DBUS_TIMEOUT,
+        WATCH_TIME_CHANGE
 };
 
 struct Watch {
@@ -133,6 +126,7 @@ struct Manager {
 
         Watch notify_watch;
         Watch signal_watch;
+        Watch time_change_watch;
 
         int epoll_fd;
 
@@ -147,8 +141,11 @@ struct Manager {
         usec_t runtime_watchdog;
         usec_t shutdown_watchdog;
 
+        dual_timestamp firmware_timestamp;
+        dual_timestamp loader_timestamp;
+        dual_timestamp kernel_timestamp;
         dual_timestamp initrd_timestamp;
-        dual_timestamp startup_timestamp;
+        dual_timestamp userspace_timestamp;
         dual_timestamp finish_timestamp;
 
         char *generator_unit_path;
@@ -205,13 +202,8 @@ struct Manager {
          * file system */
         int pin_cgroupfs_fd;
 
-        /* Audit fd */
-#ifdef HAVE_AUDIT
-        int audit_fd;
-#endif
-
         /* Flags */
-        ManagerRunningAs running_as;
+        SystemdRunningAs running_as;
         ManagerExitCode exit_code:5;
 
         bool dispatching_load_queue:1;
@@ -233,6 +225,8 @@ struct Manager {
         unsigned n_installed_jobs;
         unsigned n_failed_jobs;
 
+        unsigned n_running_jobs;
+
         /* Type=idle pipes */
         int idle_pipe[2];
 
@@ -240,7 +234,7 @@ struct Manager {
         char *switch_root_init;
 };
 
-int manager_new(ManagerRunningAs running_as, Manager **m);
+int manager_new(SystemdRunningAs running_as, Manager **m);
 void manager_free(Manager *m);
 
 int manager_enumerate(Manager *m);
@@ -278,8 +272,9 @@ void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid
 
 int manager_open_serialization(Manager *m, FILE **_f);
 
-int manager_serialize(Manager *m, FILE *f, FDSet *fds);
+int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool serialize_jobs);
 int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
+int manager_distribute_fds(Manager *m, FDSet *fds);
 
 int manager_reload(Manager *m);
 
@@ -300,9 +295,7 @@ void manager_undo_generators(Manager *m);
 void manager_recheck_journal(Manager *m);
 
 void manager_set_show_status(Manager *m, bool b);
+void manager_status_printf(Manager *m, const char *status, const char *format, ...);
 bool manager_get_show_status(Manager *m);
 
-const char *manager_running_as_to_string(ManagerRunningAs i);
-ManagerRunningAs manager_running_as_from_string(const char *s);
-
-#endif
+void watch_init(Watch *w);