src/array.c

Sat, 10 Aug 2019 11:12:49 +0200

author
Mike Becker <universe@uap-core.de>
date
Sat, 10 Aug 2019 11:12:49 +0200
branch
feature/array
changeset 354
7fd13b9f8f60
parent 353
135ce35d5108
child 355
d315a068235a
permissions
-rw-r--r--

improves array append/prepend/set interface

103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
1 /*
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
3 *
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
4 * Copyright 2019 Mike Becker, Olaf Wintermann All rights reserved.
103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
5 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
6 * Redistribution and use in source and binary forms, with or without
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
7 * modification, are permitted provided that the following conditions are met:
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
8 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
10 * notice, this list of conditions and the following disclaimer.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
11 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
14 * documentation and/or other materials provided with the distribution.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
15 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
27 */
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
28
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
29 #define _GNU_SOURCE /* we want to use qsort_r(), if available */
348
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
30 #define __STDC_WANT_LIB_EXT1__ 1 /* use qsort_s, if available */
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
31
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
32
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
33 #include "ucx/array.h"
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
34 #include "ucx/utils.h"
4
dbc31727b38e added dlist specification
Mike Becker <universe@uap-core.de>
parents:
diff changeset
35
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
36 #include <string.h>
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
37 #include <stdlib.h>
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
38
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
39 #ifndef UCX_ARRAY_DISABLE_QSORT
346
1a9c112f4116 fixes #ifdefs to be sure no redefine can ever happen
Mike Becker <universe@uap-core.de>
parents: 345
diff changeset
40 #ifdef __GLIBC__
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
41 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8)
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
42 #define ucx_array_sort_impl qsort_r
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
43 #endif /* glibc version >= 2.8 */
346
1a9c112f4116 fixes #ifdefs to be sure no redefine can ever happen
Mike Becker <universe@uap-core.de>
parents: 345
diff changeset
44 #elif /* not __GLIBC__ */ defined(__APPLE__) || defined(__FreeBSD__)
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
45 #define ucx_array_sort_impl ucx_qsort_r
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
46 #define USE_UCX_QSORT_R
348
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
47 #elif /* not (__APPLE || __FreeBSD__) */ defined(__sun)
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
48 #if __STDC_VERSION__ >= 201112L
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
49 #define ucx_array_sort_impl qsort_s
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
50 #endif
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
51 #endif /* __GLIBC__, __APLE__, __FreeBSD__, __sun */
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
52 #endif /* UCX_ARRAY_DISABLE_QSORT */
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
53
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
54 #ifndef ucx_array_sort_impl
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
55 #define ucx_array_sort_impl ucx_mergesort
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
56 #endif
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
57
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
58 static int ucx_array_ensurecap(UcxArray *array, size_t reqcap) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
59 size_t required_capacity = array->capacity;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
60 while (reqcap > required_capacity) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
61 if (required_capacity * 2 < required_capacity)
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
62 return 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
63 required_capacity <<= 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
64 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
65 if (ucx_array_reserve(array, required_capacity)) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
66 return 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
67 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
68 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
69
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
70 UcxArray ucx_array_new(size_t capacity, size_t elemsize) {
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
71 return ucx_array_new_a(capacity, elemsize, ucx_default_allocator());
18
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
72 }
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
73
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
74 UcxArray ucx_array_new_a(size_t capacity, size_t elemsize,
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
75 UcxAllocator* allocator) {
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
76 UcxArray array;
18
69636f81db31 added clone and equals to lists
Mike Becker <universe@uap-core.de>
parents: 13
diff changeset
77
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
78 array.allocator = allocator;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
79 array.elemsize = elemsize;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
80 array.size = 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
81 array.data = alcalloc(allocator, capacity, elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
82
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
83 if (array.data) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
84 array.capacity = capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
85 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
86 array.capacity = 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
87 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
88
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
89 return array;
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
90 }
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
91
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
92 UcxArray ucx_array_clone(UcxArray array) {
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
93 UcxArray clone;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
94
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
95 clone.allocator = array.allocator;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
96 clone.elemsize = array.elemsize;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
97 clone.size = array.size;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
98 clone.data = alcalloc(array.allocator, array.capacity, array.elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
99
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
100 if (clone.data) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
101 clone.capacity = array.capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
102 memcpy(clone.data, array.data, array.size*array.elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
103 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
104 clone.capacity = clone.size = 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
105 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
106
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
107 return clone;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
108 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
109
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
110 int ucx_array_equals(UcxArray array1, UcxArray array2,
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
111 cmp_func cmpfnc, void* data) {
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
112
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
113 if (array1.size != array2.size || array1.elemsize != array2.elemsize) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
114 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
115 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
116 if (array1.size == 0)
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
117 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
118
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
119 if (cmpfnc == NULL) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
120 cmpfnc = ucx_cmp_mem;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
121 data = &array1.elemsize;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
122 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
123
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
124 for (size_t i = 0 ; i < array1.size ; i++) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
125 int r = cmpfnc(
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
126 ucx_array_at(array1, i),
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
127 ucx_array_at(array2, i),
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
128 data);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
129 if (r != 0)
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
130 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
131 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
132 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
133 }
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
134 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
135
353
135ce35d5108 renames ucx_array_free() to ucx_array_destroy()
Mike Becker <universe@uap-core.de>
parents: 348
diff changeset
136 void ucx_array_destroy(UcxArray *array) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
137 alfree(array->allocator, array->data);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
138 array->data = NULL;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
139 array->capacity = array->size = 0;
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
140 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
141
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
142 int ucx_array_append_from(UcxArray *array, void *data, size_t count) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
143 if (ucx_array_ensurecap(array, array->size + count))
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
144 return 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
145
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
146 void* dest = ucx_array_at(*array, array->size);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
147 if (data) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
148 memcpy(dest, data, array->elemsize*count);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
149 } else {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
150 memset(dest, 0, array->elemsize*count);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
151 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
152 array->size += count;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
153
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
154 return 0;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
155 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
156
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
157 int ucx_array_prepend_from(UcxArray *array, void *data, size_t count) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
158 if (ucx_array_ensurecap(array, array->size + count))
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
159 return 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
160
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
161 if (array->size > 0) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
162 void *dest = ucx_array_at(*array, count);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
163 memmove(dest, array->data, array->elemsize*array->size);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
164 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
165
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
166 if (data) {
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
167 memcpy(array->data, data, array->elemsize*count);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
168 } else {
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
169 memset(array->data, 0, array->elemsize*count);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
170 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
171 array->size += count;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
172
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
173 return 0;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
174 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
175
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
176 int ucx_array_set_from(UcxArray *array, size_t index,
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
177 void *data, size_t count) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
178 if (ucx_array_ensurecap(array, index + count))
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
179 return 1;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
180
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
181 if (index+count > array->size) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
182 array->size = index+count;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
183 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
184
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
185 void *dest = ucx_array_at(*array, index);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
186 if (data) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
187 memcpy(dest, data, array->elemsize*count);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
188 } else {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
189 memset(dest, 0, array->elemsize*count);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
190 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
191
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
192 return 0;
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
193 }
8
9cd2b2460db0 completed dlist
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
194
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
195 int ucx_array_appendv(UcxArray *array, ...) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
196 va_list ap;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
197 va_start(ap, array);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
198 int elem = va_arg(ap, int);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
199 int ret = ucx_array_append_from(array, &elem, 1);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
200 va_end(ap);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
201 return ret;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
202 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
203
354
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
204 int ucx_array_prependv(UcxArray *array, ...) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
205 va_list ap;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
206 va_start(ap, array);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
207 int elem = va_arg(ap, int);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
208 int ret = ucx_array_prepend_from(array, &elem, 1);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
209 va_end(ap);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
210 return ret;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
211 }
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
212
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
213 int ucx_array_setv(UcxArray *array, size_t index, ...) {
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
214 va_list ap;
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
215 va_start(ap, index);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
216 int elem = va_arg(ap, int);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
217 int ret = ucx_array_set_from(array, index, &elem, 1);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
218 va_end(ap);
7fd13b9f8f60 improves array append/prepend/set interface
Mike Becker <universe@uap-core.de>
parents: 353
diff changeset
219 return ret;
337
f695ae118460 adds ucx_array_set()
Mike Becker <universe@uap-core.de>
parents: 336
diff changeset
220 }
f695ae118460 adds ucx_array_set()
Mike Becker <universe@uap-core.de>
parents: 336
diff changeset
221
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
222 int ucx_array_concat(UcxArray *array1, const UcxArray *array2) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
223
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
224 if (array1->elemsize != array2->elemsize)
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
225 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
226
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
227 size_t capacity = array1->capacity+array2->capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
228
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
229 if (array1->capacity < capacity) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
230 if (ucx_array_reserve(array1, capacity)) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
231 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
232 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
233 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
234
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
235 void* dest = ucx_array_at(*array1, array1->size);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
236 memcpy(dest, array2->data, array2->size*array2->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
237
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
238 array1->size += array2->size;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
239
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
240 return 0;
123
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
241 }
7fb0f74517c5 changed signature of sstrncat + some documentation for UcxList + new features for UcxList
Mike Becker <universe@uap-core.de>
parents: 122
diff changeset
242
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
243 void *ucx_array_at(UcxArray array, size_t index) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
244 char* memory = array.data;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
245 char* loc = memory + index*array.elemsize;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
246 return loc;
7
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
247 }
68091406d1cf added dlist to makefile, implemented first functions, discarded some fails
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
248
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
249 size_t ucx_array_find(UcxArray array, void *elem, cmp_func cmpfnc, void *data) {
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
250
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
251 if (cmpfnc == NULL) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
252 cmpfnc = ucx_cmp_mem;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
253 data = &array.elemsize;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
254 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
255
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
256 if (array.size > 0) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
257 for (size_t i = 0 ; i < array.size ; i++) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
258 void* ptr = ucx_array_at(array, i);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
259 if (cmpfnc(ptr, elem, data) == 0) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
260 return i;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
261 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
262 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
263 return array.size;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
264 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
265 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
266 }
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
267 }
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
268
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
269 int ucx_array_contains(UcxArray array, void *elem, cmp_func cmpfnc, void *data) {
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
270 return ucx_array_find(array, elem, cmpfnc, data) != array.size;
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
271 }
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
272
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
273 static void ucx_mergesort_merge(void *arrdata,size_t elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
274 cmp_func cmpfnc, void *data,
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
275 size_t start, size_t mid, size_t end) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
276
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
277 char* array = arrdata;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
278
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
279 size_t rightstart = mid + 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
280
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
281 if (cmpfnc(array + mid*elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
282 array + rightstart*elemsize, data) <= 0) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
283 /* already sorted */
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
284 return;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
285 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
286
342
8f0a3c00d1d2 removes cumbersome array accessor macros
Mike Becker <universe@uap-core.de>
parents: 337
diff changeset
287 /* we need memory for one element */
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
288 void *value = malloc(elemsize);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
289
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
290 while (start <= mid && rightstart <= end) {
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
291 if (cmpfnc(array + start*elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
292 array + rightstart*elemsize, data) <= 0) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
293 start++;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
294 } else {
342
8f0a3c00d1d2 removes cumbersome array accessor macros
Mike Becker <universe@uap-core.de>
parents: 337
diff changeset
295 /* save the value from the right */
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
296 memcpy(value, array + rightstart*elemsize, elemsize);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
297
342
8f0a3c00d1d2 removes cumbersome array accessor macros
Mike Becker <universe@uap-core.de>
parents: 337
diff changeset
298 /* shift all left elements one element to the right */
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
299 size_t shiftcount = rightstart-start;
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
300 void *startptr = array + start*elemsize;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
301 void *dest = array + (start+1)*elemsize;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
302 memmove(dest, startptr, shiftcount*elemsize);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
303
342
8f0a3c00d1d2 removes cumbersome array accessor macros
Mike Becker <universe@uap-core.de>
parents: 337
diff changeset
304 /* bring the first value from the right to the left */
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
305 memcpy(startptr, value, elemsize);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
306
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
307 start++;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
308 mid++;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
309 rightstart++;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
310 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
311 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
312
342
8f0a3c00d1d2 removes cumbersome array accessor macros
Mike Becker <universe@uap-core.de>
parents: 337
diff changeset
313 /* free the temporary memory */
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
314 free(value);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
315 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
316
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
317 static void ucx_mergesort_impl(void *arrdata, size_t elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
318 cmp_func cmpfnc, void *data, size_t l, size_t r) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
319 if (l < r) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
320 size_t m = l + (r - l) / 2;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
321
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
322 ucx_mergesort_impl(arrdata, elemsize, cmpfnc, data, l, m);
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
323 ucx_mergesort_impl(arrdata, elemsize, cmpfnc, data, m + 1, r);
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
324 ucx_mergesort_merge(arrdata, elemsize, cmpfnc, data, l, m, r);
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
325 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
326 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
327
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
328 static void ucx_mergesort(void *arrdata, size_t count, size_t elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
329 cmp_func cmpfnc, void *data) {
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
330
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
331 ucx_mergesort_impl(arrdata, elemsize, cmpfnc, data, 0, count-1);
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
332 }
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
333
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
334 #ifdef USE_UCX_QSORT_R
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
335 struct cmpfnc_swapargs_info {
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
336 cmp_func func;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
337 void *data;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
338 };
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
339
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
340 static int cmp_func_swap_args(void *data, const void *x, const void *y) {
348
3b9b4f6e9fd6 use qsort_s on solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 347
diff changeset
341 cmpfnc_swapargs_info* info = data;
345
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
342 return info->func(x, y, info->data);
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
343 }
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
344
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
345 static void ucx_qsort_r(void *array, size_t count, size_t elemsize,
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
346 cmp_func cmpfnc, void *data) {
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
347 struct cmpfnc_swapargs_info info;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
348 info.func = cmpfnc;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
349 info.data = data;
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
350 qsort_r(array, count, elemsize, &info, cmp_func_swap_args);
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
351 }
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
352 #endif /* USE_UCX_QSORT_R */
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
353
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
354 void ucx_array_sort(UcxArray array, cmp_func cmpfnc, void *data) {
6089eb30a51a ucx_array_sort() uses qsort_r(), if available
Mike Becker <universe@uap-core.de>
parents: 342
diff changeset
355 ucx_array_sort_impl(array.data, array.size, array.elemsize, cmpfnc, data);
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
356 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
357
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
358 void ucx_array_remove(UcxArray *array, size_t index) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
359 array->size--;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
360 if (index < array->size) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
361 void* dest = ucx_array_at(*array, index);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
362 void* src = ucx_array_at(*array, index+1);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
363 memmove(dest, src, (array->size - index)*array->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
364 }
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
365 }
37
ec296899d12f replaced qsort with natural merge sort
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
366
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
367 void ucx_array_remove_fast(UcxArray *array, size_t index) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
368 array->size--;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
369 if (index < array->size) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
370 void* dest = ucx_array_at(*array, index);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
371 void* src = ucx_array_at(*array, array->size);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
372 memcpy(dest, src, array->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
373 }
35
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
374 }
fdabd1240b69 added mkdir for build directory to makefile + added qsort for list and dlist
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
375
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
376 int ucx_array_shrink(UcxArray* array) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
377 void* newptr = alrealloc(array->allocator, array->data,
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
378 array->size*array->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
379 if (newptr) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
380 array->data = newptr;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
381 array->capacity = array->size;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
382 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
383 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
384 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
385 }
13
98ac89e3aa37 Added mempool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 8
diff changeset
386 }
22
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
387
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
388 int ucx_array_resize(UcxArray* array, size_t capacity) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
389 if (array->capacity >= capacity) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
390 void* newptr = alrealloc(array->allocator, array->data,
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
391 capacity*array->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
392 if (newptr) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
393 array->data = newptr;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
394 array->capacity = capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
395 if (array->size > array->capacity) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
396 array->size = array->capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
397 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
398 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
399 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
400 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
401 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
402 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
403 return ucx_array_reserve(array, capacity);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
404 }
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
405 }
334
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
406
bc81faa9afda adds array interface and tests
Mike Becker <universe@uap-core.de>
parents: 323
diff changeset
407 int ucx_array_reserve(UcxArray* array, size_t capacity) {
336
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
408 if (array->capacity > capacity) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
409 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
410 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
411 void* newptr = alrealloc(array->allocator, array->data,
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
412 capacity*array->elemsize);
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
413 if (newptr) {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
414 array->data = newptr;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
415 array->capacity = capacity;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
416 return 0;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
417 } else {
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
418 return 1;
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
419 }
6d7aa8a1a3b3 implements ucx_array_sort()
Mike Becker <universe@uap-core.de>
parents: 334
diff changeset
420 }
22
76cdd8209f1f added ucx_dlist_remove and tests + fixed makefile error
Mike Becker <universe@uap-core.de>
parents: 18
diff changeset
421 }

mercurial