mailing list of musl libc
 help / color / mirror / code / Atom feed
97a48c28e0d78484171b99e0e926e861c41d859c blob 4644 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
 
#define _GNU_SOURCE

#include <inttypes.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "test.h"

void *expected_arg;

static int scmp(const void *a, const void *b, void *arg)
{
	if (arg != expected_arg) {
		t_error("argument passing failed\n");
		t_printf("\tgot:  %p\n", arg);
		t_printf("\twant: %p\n", expected_arg);
	}

	return strcmp(*(char **)a, *(char **)b);
}

static int icmp(const void *a, const void *b, void *arg)
{
	if (arg != expected_arg) {
		t_error("argument passing failed\n");
		t_printf("\tgot:  %p\n", arg);
		t_printf("\twant: %p\n", expected_arg);
	}

	return *(int*)a - *(int*)b;
}

static int ccmp(const void *a, const void *b, void *arg)
{
	if (arg != expected_arg) {
		t_error("argument passing failed\n");
		t_printf("\tgot:  %p\n", arg);
		t_printf("\twant: %p\n", expected_arg);
	}

	return *(char*)a - *(char*)b;
}

static int cmp64(const void *a, const void *b, void *arg)
{
	if (arg != expected_arg) {
		t_error("argument passing failed\n");
		t_printf("\tgot:  %p\n", arg);
		t_printf("\twant: %p\n", expected_arg);
	}

	const uint64_t *ua = a, *ub = b;
	return *ua < *ub ? -1 : *ua != *ub;
}

/* 26 items -- even */
static const char *s[] = {
	"Bob", "Alice", "John", "Ceres",
	"Helga", "Drepper", "Emeralda", "Zoran",
	"Momo", "Frank", "Pema", "Xavier",
	"Yeva", "Gedun", "Irina", "Nono",
	"Wiener", "Vincent", "Tsering", "Karnica",
	"Lulu", "Quincy", "Osama", "Riley",
	"Ursula", "Sam"
};
static const char *s_sorted[] = {
	"Alice", "Bob", "Ceres", "Drepper",
	"Emeralda", "Frank", "Gedun", "Helga",
	"Irina", "John", "Karnica", "Lulu",
	"Momo", "Nono", "Osama", "Pema",
	"Quincy", "Riley", "Sam", "Tsering",
	"Ursula", "Vincent", "Wiener", "Xavier",
	"Yeva", "Zoran"
};

/* 23 items -- odd, prime */
static int n[] = {
	879045, 394, 99405644, 33434, 232323, 4334, 5454,
	343, 45545, 454, 324, 22, 34344, 233, 45345, 343,
	848405, 3434, 3434344, 3535, 93994, 2230404, 4334
};
static int n_sorted[] = {
	22, 233, 324, 343, 343, 394, 454, 3434,
	3535, 4334, 4334, 5454, 33434, 34344, 45345, 45545,
	93994, 232323, 848405, 879045, 2230404, 3434344, 99405644
};

static void str_test(const char **a, const char **a_sorted, int len)
{
	int i;
	qsort_r(a, len, sizeof *a, scmp, expected_arg);
	for (i=0; i<len; i++) {
		if (strcmp(a[i], a_sorted[i]) != 0) {
			t_error("string sort failed at index %d\n", i);
			t_printf("\ti\tgot\twant\n");
			for (i=0; i<len; i++)
				t_printf("\t%d\t%s\t%s\n", i, a[i], a_sorted[i]);
			break;
		}
	}
}

static void int_test(int *a, int *a_sorted, int len)
{
	int i;
	qsort_r(a, len, sizeof *a, icmp, expected_arg);
	for (i=0; i<len; i++) {
		if (a[i] != a_sorted[i]) {
			t_error("integer sort failed at index %d\n", i);
			t_printf("\ti\tgot\twant\n");
			for (i=0; i<len; i++)
				t_printf("\t%d\t%d\t%d\n", i, a[i], a_sorted[i]);
			break;
		}
	}
}

static void uint64_gen(uint64_t *p, uint64_t *p_sorted, int n)
{
	int i;
	uint64_t r = 0;
	t_randseed(n);
	for (i = 0; i < n; i++) {
		r += t_randn(20);
		p[i] = r;
	}
	memcpy(p_sorted, p, n * sizeof *p);
	t_shuffle(p, n);
}

static void uint64_test(uint64_t *a, uint64_t *a_sorted, int len)
{
	int i;
	qsort_r(a, len, sizeof *a, cmp64, expected_arg);
	for (i=0; i<len; i++) {
		if (a[i] != a_sorted[i]) {
			t_error("uint64 sort failed at index %d\n", i);
			t_printf("\ti\tgot\twant\n");
			for (i=0; i<len; i++)
				t_printf("\t%d\t%" PRIu64 "\t%" PRIu64 "\n", i, a[i], a_sorted[i]);
			break;
		}
	}
}

#define T(a, a_sorted) do { \
	char p[] = a; \
	qsort_r(p, sizeof p - 1, 1, ccmp, expected_arg);	  \
	if (memcmp(p, a_sorted, sizeof p) != 0) { \
		t_error("character sort failed\n"); \
		t_printf("\tgot:  \"%s\"\n", p); \
		t_printf("\twant: \"%s\"\n", a_sorted); \
	} \
} while(0)

static void char_test(void)
{
	T("", "");
	T("1", "1");
	T("11", "11");
	T("12", "12");
	T("21", "12");
	T("111", "111");
	T("211", "112");
	T("121", "112");
	T("112", "112");
	T("221", "122");
	T("212", "122");
	T("122", "122");
	T("123", "123");
	T("132", "123");
	T("213", "123");
	T("231", "123");
	T("321", "123");
	T("312", "123");
	T("1423", "1234");
	T("51342", "12345");
	T("261435", "123456");
	T("4517263", "1234567");
	T("37245618", "12345678");
	T("812436597", "123456789");
	T("987654321", "123456789");
	T("321321321", "111222333");
	T("49735862185236174", "11223344556677889");
}

int main(void)
{
	int i;

	expected_arg = &expected_arg;

	str_test(s, s_sorted, sizeof s/sizeof*s);
	int_test(n, n_sorted, sizeof n/sizeof*n);
	char_test();
	for (i = 1023; i<=1026; i++) {
		uint64_t p[1026], p_sorted[1026];
		uint64_gen(p, p_sorted, i);
		uint64_test(p, p_sorted, i);
	}
	return t_status;
}
debug log:

solving 97a48c2 ...
found 97a48c2 in https://inbox.vuxu.org/musl/20210808112908.44345-1-galibert@pobox.com/

applying [1/1] https://inbox.vuxu.org/musl/20210808112908.44345-1-galibert@pobox.com/
diff --git a/src/functional/qsort_r.c b/src/functional/qsort_r.c
new file mode 100644
index 0000000..97a48c2

Checking patch src/functional/qsort_r.c...
Applied patch src/functional/qsort_r.c cleanly.

index at:
100644 97a48c28e0d78484171b99e0e926e861c41d859c	src/functional/qsort_r.c

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).