diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-29 21:16:14 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-29 21:16:14 +0200 |
| commit | 04c45070984d097dde1d10fee344f78a004714e1 (patch) | |
| tree | 8a1ef9b6eb4afdc573d7a297e9c932dd0cd0f0c6 | |
| parent | 9d66db1d0390ef8ca7a32a3fe142d5c3732903b6 (diff) | |
| parent | 6fe869c251790a0e3cef5b243169dda363723f49 (diff) | |
Merge pull request #1407 from dvdhrm/prioq
prioq: drop stability guarantee
| -rw-r--r-- | src/basic/prioq.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 30 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/basic/prioq.c b/src/basic/prioq.c index 69ec45d97e..d55b348c22 100644 --- a/src/basic/prioq.c +++ b/src/basic/prioq.c @@ -111,7 +111,7 @@ static unsigned shuffle_up(Prioq *q, unsigned idx) { k = (idx-1)/2; - if (q->compare_func(q->items[k].data, q->items[idx].data) < 0) + if (q->compare_func(q->items[k].data, q->items[idx].data) <= 0) break; swap(q, idx, k); diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 48a5219275..1a82c4c940 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -242,12 +242,6 @@ static int pending_prioq_compare(const void *a, const void *b) { if (x->pending_iteration > y->pending_iteration) return 1; - /* Stability for the rest */ - if (x < y) - return -1; - if (x > y) - return 1; - return 0; } @@ -277,12 +271,6 @@ static int prepare_prioq_compare(const void *a, const void *b) { if (x->priority > y->priority) return 1; - /* Stability for the rest */ - if (x < y) - return -1; - if (x > y) - return 1; - return 0; } @@ -310,12 +298,6 @@ static int earliest_time_prioq_compare(const void *a, const void *b) { if (x->time.next > y->time.next) return 1; - /* Stability for the rest */ - if (x < y) - return -1; - if (x > y) - return 1; - return 0; } @@ -343,12 +325,6 @@ static int latest_time_prioq_compare(const void *a, const void *b) { if (x->time.next + x->time.accuracy > y->time.next + y->time.accuracy) return 1; - /* Stability for the rest */ - if (x < y) - return -1; - if (x > y) - return 1; - return 0; } @@ -370,12 +346,6 @@ static int exit_prioq_compare(const void *a, const void *b) { if (x->priority > y->priority) return 1; - /* Stability for the rest */ - if (x < y) - return -1; - if (x > y) - return 1; - return 0; } |