meson.build

@@ -144,7 +144,7 @@ pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgc
 polkitpolicydir = join_paths(datadir, 'polkit-1/actions')
 polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
 polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
-xinitrcdir = get_option('xinitrcdir') == '' ? join_paths(sysconfdir, 'X11/xinit/xinitrc.d') : get_option('xinitrcdir')
+xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
 rpmmacrosdir = get_option('rpmmacrosdir')
 if rpmmacrosdir != 'no'
         rpmmacrosdir = join_paths(prefixdir, rpmmacrosdir)

meson_options.txt

@@ -178,8 +178,6 @@ option('pkgconfigdatadir', type : 'string', value : '',
        description : 'directory for arch-independent pkg-config files')
 option('pkgconfiglibdir', type : 'string', value : '',
        description : 'directory for standard pkg-config files')
-option('xinitrcdir', type : 'string', value : '',
-       description : 'directory for xinitrc files')
 option('rpmmacrosdir', type : 'string', value : 'lib/rpm/macros.d',
        description : 'directory for rpm macros ["no" disables]')
 option('pamlibdir', type : 'string',

src/libsystemd/sd-event/sd-event.c

@@ -1039,7 +1039,7 @@ static int source_set_pending(sd_event_source *s, bool b) {
                 }
         }
 
-        return 1;
+        return 0;
 }
 
 static sd_event_source *source_new(sd_event *e, bool floating, EventSourceType type) {
@@ -3116,19 +3116,11 @@ static int process_timer(
         return 0;
 }
 
-static int process_child(sd_event *e, int64_t threshold, int64_t *ret_min_priority) {
-        int64_t min_priority = threshold;
-        bool something_new = false;
+static int process_child(sd_event *e) {
         sd_event_source *s;
         int r;
 
         assert(e);
-        assert(ret_min_priority);
-
-        if (!e->need_process_child) {
-                *ret_min_priority = min_priority;
-                return 0;
-        }
 
         e->need_process_child = false;
 
@@ -3153,9 +3145,6 @@ static int process_child(sd_event *e, int64_t threshold, int64_t *ret_min_priori
         HASHMAP_FOREACH(s, e->child_sources) {
                 assert(s->type == SOURCE_CHILD);
 
-                if (s->priority > threshold)
-                        continue;
-
                 if (s->pending)
                         continue;
 
@@ -3192,15 +3181,10 @@ static int process_child(sd_event *e, int64_t threshold, int64_t *ret_min_priori
                         r = source_set_pending(s, true);
                         if (r < 0)
                                 return r;
-                        if (r > 0) {
-                                something_new = true;
-                                min_priority = MIN(min_priority, s->priority);
-                        }
                 }
         }
 
-        *ret_min_priority = min_priority;
-        return something_new;
+        return 0;
 }
 
 static int process_pidfd(sd_event *e, sd_event_source *s, uint32_t revents) {
@@ -3230,13 +3214,13 @@ static int process_pidfd(sd_event *e, sd_event_source *s, uint32_t revents) {
         return source_set_pending(s, true);
 }
 
-static int process_signal(sd_event *e, struct signal_data *d, uint32_t events, int64_t *min_priority) {
+static int process_signal(sd_event *e, struct signal_data *d, uint32_t events) {
+        bool read_one = false;
         int r;
 
         assert(e);
         assert(d);
         assert_return(events == EPOLLIN, -EIO);
-        assert(min_priority);
 
         /* If there's a signal queued on this priority and SIGCHLD is
            on this priority too, then make sure to recheck the
@@ -3262,7 +3246,7 @@ static int process_signal(sd_event *e, struct signal_data *d, uint32_t events, i
                 n = read(d->fd, &si, sizeof(si));
                 if (n < 0) {
                         if (IN_SET(errno, EAGAIN, EINTR))
-                                return 0;
+                                return read_one;
 
                         return -errno;
                 }
@@ -3272,6 +3256,8 @@ static int process_signal(sd_event *e, struct signal_data *d, uint32_t events, i
 
                 assert(SIGNAL_VALID(si.ssi_signo));
 
+                read_one = true;
+
                 if (e->signal_sources)
                         s = e->signal_sources[si.ssi_signo];
                 if (!s)
@@ -3285,16 +3271,12 @@ static int process_signal(sd_event *e, struct signal_data *d, uint32_t events, i
                 r = source_set_pending(s, true);
                 if (r < 0)
                         return r;
-                if (r > 0 && *min_priority >= s->priority) {
-                        *min_priority = s->priority;
-                        return 1; /* an event source with smaller priority is queued. */
-                }
 
-                return 0;
+                return 1;
         }
 }
 
-static int event_inotify_data_read(sd_event *e, struct inotify_data *d, uint32_t revents, int64_t threshold) {
+static int event_inotify_data_read(sd_event *e, struct inotify_data *d, uint32_t revents) {
         ssize_t n;
 
         assert(e);
@@ -3310,9 +3292,6 @@ static int event_inotify_data_read(sd_event *e, struct inotify_data *d, uint32_t
         if (d->buffer_filled > 0)
                 return 0;
 
-        if (d->priority > threshold)
-                return 0;
-
         n = read(d->fd, &d->buffer, sizeof(d->buffer));
         if (n < 0) {
                 if (IN_SET(errno, EAGAIN, EINTR))
@@ -3852,14 +3831,20 @@ static int epoll_wait_usec(
         return r;
 }
 
-static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t *ret_min_priority) {
-        int64_t min_priority = threshold;
-        bool something_new = false;
+_public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
         size_t n_event_queue, m;
         int r;
 
-        assert(e);
-        assert(ret_min_priority);
+        assert_return(e, -EINVAL);
+        assert_return(e = event_resolve(e), -ENOPKG);
+        assert_return(!event_pid_changed(e), -ECHILD);
+        assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
+        assert_return(e->state == SD_EVENT_ARMED, -EBUSY);
+
+        if (e->exit_requested) {
+                e->state = SD_EVENT_PENDING;
+                return 1;
+        }
 
         n_event_queue = MAX(e->n_sources, 1u);
         if (!GREEDY_REALLOC(e->event_queue, e->event_queue_allocated, n_event_queue))
@@ -3871,8 +3856,12 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t
 
         for (;;) {
                 r = epoll_wait_usec(e->epoll_fd, e->event_queue, e->event_queue_allocated, timeout);
+                if (r == -EINTR) {
+                        e->state = SD_EVENT_PENDING;
+                        return 1;
+                }
                 if (r < 0)
-                        return r;
+                        goto finish;
 
                 m = (size_t) r;
 
@@ -3888,8 +3877,6 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t
                 timeout = 0;
         }
 
-        /* Set timestamp only when this is called first time. */
-        if (threshold == INT64_MAX)
         triple_timestamp_get(&e->timestamp);
 
         for (size_t i = 0; i < m; i++) {
@@ -3906,11 +3893,6 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t
 
                                 assert(s);
 
-                                if (s->priority > threshold)
-                                        continue;
-
-                                min_priority = MIN(min_priority, s->priority);
-
                                 switch (s->type) {
 
                                 case SOURCE_IO:
@@ -3938,75 +3920,19 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t
                         }
 
                         case WAKEUP_SIGNAL_DATA:
-                                r = process_signal(e, e->event_queue[i].data.ptr, e->event_queue[i].events, &min_priority);
+                                r = process_signal(e, e->event_queue[i].data.ptr, e->event_queue[i].events);
                                 break;
 
                         case WAKEUP_INOTIFY_DATA:
-                                r = event_inotify_data_read(e, e->event_queue[i].data.ptr, e->event_queue[i].events, threshold);
+                                r = event_inotify_data_read(e, e->event_queue[i].data.ptr, e->event_queue[i].events);
                                 break;
 
                         default:
                                 assert_not_reached("Invalid wake-up pointer");
                         }
                 }
-                if (r < 0)
-                        return r;
-                if (r > 0)
-                        something_new = true;
-        }
-
-        *ret_min_priority = min_priority;
-        return something_new;
-}
-
-_public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
-        int r;
-
-        assert_return(e, -EINVAL);
-        assert_return(e = event_resolve(e), -ENOPKG);
-        assert_return(!event_pid_changed(e), -ECHILD);
-        assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
-        assert_return(e->state == SD_EVENT_ARMED, -EBUSY);
-
-        if (e->exit_requested) {
-                e->state = SD_EVENT_PENDING;
-                return 1;
-        }
-
-        for (int64_t threshold = INT64_MAX; ; threshold--) {
-                int64_t epoll_min_priority, child_min_priority;
-
-                /* There may be a possibility that new epoll (especially IO) and child events are
-                 * triggered just after process_epoll() call but before process_child(), and the new IO
-                 * events may have higher priority than the child events. To salvage these events,
-                 * let's call epoll_wait() again, but accepts only events with higher priority than the
-                 * previous. See issue https://github.com/systemd/systemd/issues/18190 and comments
-                 * https://github.com/systemd/systemd/pull/18750#issuecomment-785801085
-                 * https://github.com/systemd/systemd/pull/18922#issuecomment-792825226 */
-
-                r = process_epoll(e, timeout, threshold, &epoll_min_priority);
-                if (r == -EINTR) {
-                        e->state = SD_EVENT_PENDING;
-                        return 1;
-                }
                 if (r < 0)
                         goto finish;
-                if (r == 0 && threshold < INT64_MAX)
-                        /* No new epoll event. */
-                        break;
-
-                r = process_child(e, threshold, &child_min_priority);
-                if (r < 0)
-                        goto finish;
-                if (r == 0)
-                        /* No new child event. */
-                        break;
-
-                threshold = MIN(epoll_min_priority, child_min_priority);
-                if (threshold == INT64_MIN)
-                        break;
-
-                timeout = 0;
         }
 
         r = process_watchdog(e);
@@ -4033,12 +3959,19 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
         if (r < 0)
                 goto finish;
 
+        if (e->need_process_child) {
+                r = process_child(e);
+                if (r < 0)
+                        goto finish;
+        }
+
         r = process_inotify(e);
         if (r < 0)
                 goto finish;
 
         if (event_next_pending(e)) {
                 e->state = SD_EVENT_PENDING;
+
                 return 1;
         }