Merge pull request #20030 from keszybz/exec_fd-event-source

exec_fd event source rework

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

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

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

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

diff --cc src/core/mount.c
index ee4dd0eea19045ddc778d665c2255b9235b8f66f,2a91ad76f93036890ab09542ca64fceb88ed39b8..053deac14dbfafb835ebefa29dad6f47de3c1e1a
--- 1/src/core/mount.c
--- 2/src/core/mount.c
+++ b/src/core/mount.c
@@@ -266,9 -231,27 +266,9 @@@ static void mount_done(Unit *u) 
  
          mount_unwatch_control_pid(m);
  
-         m->timer_event_source = sd_event_source_unref(m->timer_event_source);
+         m->timer_event_source = sd_event_source_disable_unref(m->timer_event_source);
  }
  
 -static MountParameters* get_mount_parameters_fragment(Mount *m) {
 -        assert(m);
 -
 -        if (m->from_fragment)
 -                return &m->parameters_fragment;
 -
 -        return NULL;
 -}
 -
 -static MountParameters* get_mount_parameters(Mount *m) {
 -        assert(m);
 -
 -        if (m->from_proc_self_mountinfo)
 -                return &m->parameters_proc_self_mountinfo;
 -
 -        return get_mount_parameters_fragment(m);
 -}
 -
  static int update_parameters_proc_self_mountinfo(
                  Mount *m,
                  const char *what,

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

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

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

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

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

diff --cc src/libsystemd/sd-event/sd-event.c
index cc9d9f5d9bc33f993d960f7230202150160df455,bdf812ee32b494808815ecdad9e64849913742dd..e9199deb418c8b26ddd1ee790c5c0700def65e2d
--- 1/src/libsystemd/sd-event/sd-event.c
--- 2/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@@ -2970,10 -2993,11 +2976,11 @@@ static int event_arm_timer
  
          if (!d->needs_rearm)
                  return 0;
 -        else
 -                d->needs_rearm = false;
 +
 +        d->needs_rearm = false;
  
          a = prioq_peek(d->earliest);
+         assert(!a || EVENT_SOURCE_USES_TIME_PRIOQ(a->type));
          if (!a || a->enabled == SD_EVENT_OFF || time_event_source_next(a) == USEC_INFINITY) {
  
                  if (d->fd < 0)