Merge pull request #7406 from poettering/timestamp-rework

timestamping rework

diff --cc src/core/main.c
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/core/timer.c
index 1a42b3847e43c2058e66e3859a0c3b7cc1163207,55197faa5932751570e3708fda89cd832a6ff41b..03935eea94964415b2455e9008d0c6f7640cea82
--- 1/src/core/timer.c
--- 2/src/core/timer.c
+++ b/src/core/timer.c
@@@ -417,9 -417,9 +417,9 @@@ static void timer_enter_waiting(Timer *
                                  /* In a container we don't want to include the time the host
                                   * was already up when the container started, so count from
                                   * our own startup. */
 -                                /* fall through */
 +                                _fallthrough_;
                          case TIMER_STARTUP:
-                                 base = UNIT(t)->manager->userspace_timestamp.monotonic;
+                                 base = UNIT(t)->manager->timestamps[MANAGER_TIMESTAMP_USERSPACE].monotonic;
                                  break;
  
                          case TIMER_UNIT_ACTIVE: