Skip to content

Commit 2a19a2b

Browse files
Stop timing qutil sort runs.
This avoids a bizarre segfault on arm/MUSL that appeared after some kind of change upstream.
1 parent 1a74e0d commit 2a19a2b

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

test/features/qutil.c

+5-19
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include <stdio.h>
55
#include <stdlib.h>
66

7-
#include <sys/time.h> /* for gettimeofday() */
8-
#include <time.h> /* for gettimeofday() */
9-
107
#include "argparsing.h"
118
#include <qthread/qthread.h>
129
#include <qthread/qutil.h>
@@ -19,16 +16,15 @@
1916
aligned_t *ui_array;
2017
aligned_t ui_out, ui_sum_authoritative = 0, ui_mult_authoritative = 1,
2118
ui_max_authoritative = 0, ui_min_authoritative = UINT_MAX;
22-
size_t ui_len = 1000000;
19+
size_t ui_len = 10000;
2320
saligned_t *i_array;
2421
saligned_t i_out, i_sum_authoritative = 0, i_mult_authoritative = 1,
2522
i_max_authoritative = INT_MIN, i_min_authoritative = INT_MAX;
26-
size_t i_len = 1000000;
23+
size_t i_len = 10000;
2724
double *d_array;
2825
double d_out, d_sum_authoritative = 0.0, d_mult_authoritative = 1.0,
2926
d_max_authoritative = DBL_MIN, d_min_authoritative = DBL_MAX;
30-
size_t d_len = 1000000;
31-
struct timeval start, stop;
27+
size_t d_len = 10000;
3228

3329
static aligned_t qmain(void *junk) {
3430
size_t i;
@@ -59,9 +55,8 @@ static aligned_t qmain(void *junk) {
5955
ui_out = qutil_uint_min(ui_array, ui_len, 0);
6056
test_check(ui_out == ui_min_authoritative);
6157
iprintf(" - qutil_uint_min is correct\n");
62-
gettimeofday(&start, NULL);
58+
6359
qutil_aligned_qsort(ui_array, ui_len);
64-
gettimeofday(&stop, NULL);
6560
iprintf("done sorting, checking correctness...\n");
6661
for (i = 0; i < ui_len - 1; i++) {
6762
if (ui_array[i] > ui_array[i + 1]) {
@@ -82,10 +77,7 @@ static aligned_t qmain(void *junk) {
8277
abort();
8378
}
8479
}
85-
iprintf("[qutil] aligned_t sorting %lu numbers took: %f seconds\n",
86-
(unsigned long)d_len,
87-
(stop.tv_sec + (stop.tv_usec * 1.0e-6)) -
88-
(start.tv_sec + (start.tv_usec * 1.0e-6)));
80+
iprintf("%lu\n", (unsigned long)d_len);
8981
free(ui_array);
9082

9183
i_array = (saligned_t *)calloc(i_len, sizeof(saligned_t));
@@ -166,9 +158,7 @@ static aligned_t qmain(void *junk) {
166158
* } */
167159

168160
// printf("[qutil] sorting...\n");
169-
gettimeofday(&start, NULL);
170161
qutil_qsort(d_array, d_len);
171-
gettimeofday(&stop, NULL);
172162
iprintf("done sorting, checking correctness...\n");
173163
for (i = 0; i < d_len - 1; i++) {
174164
if (fabs(d_array[i] - d_array[i + 1]) >
@@ -192,10 +182,6 @@ static aligned_t qmain(void *junk) {
192182
abort();
193183
}
194184
}
195-
iprintf("[qutil] sorting %lu numbers took: %f seconds\n",
196-
(unsigned long)d_len,
197-
(stop.tv_sec + (stop.tv_usec * 1.0e-6)) -
198-
(start.tv_sec + (start.tv_usec * 1.0e-6)));
199185
free(d_array);
200186
return 0;
201187
}

0 commit comments

Comments
 (0)