Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 3eb12a6ba0bce149717eaabeb1505d379b3d705a Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 25 Feb 2019 13:41:41 +0800 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 4 | Subject: [PATCH] don't use glibc-specific qsort_r |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [musl specific] |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 9 | [Rebased for v241] |
| 10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 11 | [Rebased for v242] |
| 12 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 13 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 14 | --- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 15 | src/basic/sort-util.h | 14 ------------ |
| 16 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- |
| 17 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 18 | 3 files changed, 38 insertions(+), 31 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 19 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 20 | Index: systemd-stable/src/basic/sort-util.h |
| 21 | =================================================================== |
| 22 | --- systemd-stable.orig/src/basic/sort-util.h |
| 23 | +++ systemd-stable/src/basic/sort-util.h |
| 24 | @@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 25 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 26 | _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 27 | }) |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 28 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 29 | -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { |
| 30 | - if (nmemb <= 1) |
| 31 | - return; |
| 32 | - |
| 33 | - assert(base); |
| 34 | - qsort_r(base, nmemb, size, compar, userdata); |
| 35 | -} |
| 36 | - |
| 37 | -#define typesafe_qsort_r(p, n, func, userdata) \ |
| 38 | - ({ \ |
| 39 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ |
| 40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
| 41 | - }) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 42 | Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c |
| 43 | =================================================================== |
| 44 | --- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c |
| 45 | +++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c |
| 46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 47 | |
| 48 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); |
| 49 | |
| 50 | -static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { |
| 51 | - return strcmp(trie->strings->buf + a->key_off, |
| 52 | - trie->strings->buf + b->key_off); |
| 53 | +static struct trie *trie_node_add_value_trie; |
| 54 | +static int trie_values_cmp(const void *v1, const void *v2) { |
| 55 | + const struct trie_value_entry *a = v1; |
| 56 | + const struct trie_value_entry *b = v2; |
| 57 | + |
| 58 | + return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, |
| 59 | + trie_node_add_value_trie->strings->buf + b->key_off); |
| 60 | } |
| 61 | |
| 62 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 63 | @@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 64 | .value_off = v, |
| 65 | }; |
| 66 | |
| 67 | - val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); |
| 68 | + trie_node_add_value_trie = trie; |
| 69 | + val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); |
| 70 | + trie_node_add_value_trie = NULL; |
| 71 | + |
| 72 | if (val) { |
| 73 | /* At this point we have 2 identical properties on the same match-string. |
| 74 | * Since we process files in order, we just replace the previous value. */ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 75 | @@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 76 | .line_number = line_number, |
| 77 | }; |
| 78 | node->values_count++; |
| 79 | - typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); |
| 80 | + trie_node_add_value_trie = trie; |
| 81 | + qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); |
| 82 | + trie_node_add_value_trie = NULL; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 83 | return 0; |
| 84 | } |
| 85 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 86 | Index: systemd-stable/src/shared/format-table.c |
| 87 | =================================================================== |
| 88 | --- systemd-stable.orig/src/shared/format-table.c |
| 89 | +++ systemd-stable/src/shared/format-table.c |
| 90 | @@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData * |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 91 | return CMP(index_a, index_b); |
| 92 | } |
| 93 | |
| 94 | -static int table_data_compare(const size_t *a, const size_t *b, Table *t) { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 95 | +static Table *user_table; |
| 96 | +static int table_data_compare(const void *x, const void *y) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 97 | + const size_t *a = x, *b=y; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 98 | size_t i; |
| 99 | int r; |
| 100 | |
| 101 | - assert(t); |
| 102 | - assert(t->sort_map); |
| 103 | + assert(user_table); |
| 104 | + assert(user_table->sort_map); |
| 105 | |
| 106 | /* Make sure the header stays at the beginning */ |
| 107 | - if (*a < t->n_columns && *b < t->n_columns) |
| 108 | + if (*a < user_table->n_columns && *b < user_table->n_columns) |
| 109 | return 0; |
| 110 | - if (*a < t->n_columns) |
| 111 | + if (*a < user_table->n_columns) |
| 112 | return -1; |
| 113 | - if (*b < t->n_columns) |
| 114 | + if (*b < user_table->n_columns) |
| 115 | return 1; |
| 116 | |
| 117 | /* Order other lines by the sorting map */ |
| 118 | - for (i = 0; i < t->n_sort_map; i++) { |
| 119 | + for (i = 0; i < user_table->n_sort_map; i++) { |
| 120 | TableData *d, *dd; |
| 121 | |
| 122 | - d = t->data[*a + t->sort_map[i]]; |
| 123 | - dd = t->data[*b + t->sort_map[i]]; |
| 124 | + d = user_table->data[*a + user_table->sort_map[i]]; |
| 125 | + dd = user_table->data[*b + user_table->sort_map[i]]; |
| 126 | |
| 127 | r = cell_data_compare(d, *a, dd, *b); |
| 128 | if (r != 0) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 129 | - return t->reverse_map && t->reverse_map[t->sort_map[i]] ? -r : r; |
| 130 | + return user_table->reverse_map && user_table->reverse_map[user_table->sort_map[i]] ? -r : r; |
| 131 | } |
| 132 | |
| 133 | /* Order identical lines by the order there were originally added in */ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 134 | @@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) { |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 135 | for (i = 0; i < n_rows; i++) |
| 136 | sorted[i] = i * t->n_columns; |
| 137 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 138 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 139 | + if (n_rows <= 1) |
| 140 | + return 0; |
| 141 | + assert(sorted); |
| 142 | + user_table = t; |
| 143 | + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); |
| 144 | + user_table = NULL; |
| 145 | } |
| 146 | |
| 147 | if (t->display_map) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 148 | @@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 149 | for (i = 0; i < n_rows; i++) |
| 150 | sorted[i] = i * t->n_columns; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 151 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 152 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); |
| 153 | + if (n_rows <= 1) |
| 154 | + return 0; |
| 155 | + assert(sorted); |
| 156 | + user_table = t; |
| 157 | + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); |
| 158 | + user_table = NULL; |
| 159 | } |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 160 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 161 | if (t->display_map) |