Mon, 14 May 2018 18:12:14 +0200
renames ucx_strcmp() to ucx_cmp_str()
13 | 1 | /* |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
13 | 3 | * |
259 | 4 | * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved. |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
5 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
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:
95
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:
95
diff
changeset
|
8 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
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:
95
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:
95
diff
changeset
|
11 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
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:
95
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:
95
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:
95
diff
changeset
|
15 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
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:
95
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:
95
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:
95
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:
95
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:
95
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:
95
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:
95
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:
95
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:
95
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:
95
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
13 | 27 | */ |
28 | ||
251
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
29 | #include "ucx/mempool.h" |
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
30 | |
13 | 31 | #include <stdlib.h> |
32 | #include <string.h> | |
33 | #include <stdio.h> | |
95 | 34 | #ifdef __cplusplus |
35 | #define __STDC_FORMAT_MACROS | |
36 | #endif | |
75
990734f548ef
fixed some compiler warnings
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
37 | #include <inttypes.h> |
13 | 38 | |
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
39 | /** Capsule for destructible memory chunks. */ |
13 | 40 | typedef struct { |
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
41 | /** The destructor for the memory chunk. */ |
13 | 42 | ucx_destructor destructor; |
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
43 | /** |
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
44 | * First byte of the memory chunk. |
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
45 | * Note, that the address <code>&c</code> is also the address |
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
46 | * of the whole memory chunk. |
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
47 | */ |
13 | 48 | char c; |
49 | } ucx_memchunk; | |
50 | ||
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
51 | /** Capsule for data and its destructor. */ |
13 | 52 | typedef struct { |
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
53 | /** The destructor for the data. */ |
13 | 54 | ucx_destructor destructor; |
138
7800811078b8
documented map.h + changed return value of ucx_map_iter_next()
Mike Becker <universe@uap-core.de>
parents:
135
diff
changeset
|
55 | /** A pointer to the data. */ |
13 | 56 | void *ptr; |
57 | } ucx_regdestr; | |
58 | ||
253
e19825a1430a
removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents:
251
diff
changeset
|
59 | #ifdef __cplusplus |
e19825a1430a
removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents:
251
diff
changeset
|
60 | extern "C" |
e19825a1430a
removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents:
251
diff
changeset
|
61 | #endif |
e19825a1430a
removes unnecessary macros from ucx.h + removes the usage of restrict and _Bool completely, instead of defining macros
Mike Becker <universe@uap-core.de>
parents:
251
diff
changeset
|
62 | void ucx_mempool_shared_destr(void* ptr) { |
13 | 63 | ucx_regdestr *rd = (ucx_regdestr*)ptr; |
64 | rd->destructor(rd->ptr); | |
65 | } | |
66 | ||
67 | UcxMempool *ucx_mempool_new(size_t n) { | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
68 | size_t poolsz; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
69 | if(ucx_szmul(n, sizeof(void*), &poolsz)) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
70 | return NULL; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
71 | } |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
72 | |
14 | 73 | UcxMempool *pool = (UcxMempool*)malloc(sizeof(UcxMempool)); |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
74 | if (!pool) { |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
75 | return NULL; |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
76 | } |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
77 | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
78 | pool->data = (void**) malloc(poolsz); |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
79 | if (pool->data == NULL) { |
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
80 | free(pool); |
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
81 | return NULL; |
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
82 | } |
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
83 | |
13 | 84 | pool->ndata = 0; |
85 | pool->size = n; | |
158
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
86 | |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
87 | UcxAllocator *allocator = (UcxAllocator*)malloc(sizeof(UcxAllocator)); |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
88 | if(!allocator) { |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
89 | free(pool->data); |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
90 | free(pool); |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
91 | return NULL; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
92 | } |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
93 | allocator->malloc = (ucx_allocator_malloc)ucx_mempool_malloc; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
94 | allocator->calloc = (ucx_allocator_calloc)ucx_mempool_calloc; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
95 | allocator->realloc = (ucx_allocator_realloc)ucx_mempool_realloc; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
96 | allocator->free = (ucx_allocator_free)ucx_mempool_free; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
97 | allocator->pool = pool; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
98 | pool->allocator = allocator; |
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
99 | |
13 | 100 | return pool; |
101 | } | |
102 | ||
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
103 | int ucx_mempool_chcap(UcxMempool *pool, size_t newcap) { |
241
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
104 | if (newcap < pool->ndata) { |
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
105 | return 1; |
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
106 | } |
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
107 | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
108 | size_t newcapsz; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
109 | if(ucx_szmul(newcap, sizeof(void*), &newcapsz)) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
110 | return 1; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
111 | } |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
112 | |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
113 | void **data = (void**) realloc(pool->data, newcapsz); |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
114 | if (data) { |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
115 | pool->data = data; |
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
116 | pool->size = newcap; |
241
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
117 | return 0; |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
118 | } else { |
241
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
119 | return 1; |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
120 | } |
13 | 121 | } |
122 | ||
123 | void *ucx_mempool_malloc(UcxMempool *pool, size_t n) { | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
124 | if(((size_t)-1) - sizeof(ucx_destructor) < n) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
125 | return NULL; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
126 | } |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
127 | |
141
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
128 | if (pool->ndata >= pool->size) { |
242
a3597d704421
safe one multiplication in overflow check for mempool_chcap()
Mike Becker <universe@uap-core.de>
parents:
241
diff
changeset
|
129 | size_t newcap = pool->size*2; |
a3597d704421
safe one multiplication in overflow check for mempool_chcap()
Mike Becker <universe@uap-core.de>
parents:
241
diff
changeset
|
130 | if (newcap < pool->size || ucx_mempool_chcap(pool, newcap)) { |
141
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
131 | return NULL; |
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
132 | } |
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
133 | } |
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
134 | |
248
dff45a2234ce
explicit cast from (void*) for (ucx_memchunk*) to silence a warning
Mike Becker <universe@uap-core.de>
parents:
242
diff
changeset
|
135 | void *p = malloc(sizeof(ucx_destructor) + n); |
dff45a2234ce
explicit cast from (void*) for (ucx_memchunk*) to silence a warning
Mike Becker <universe@uap-core.de>
parents:
242
diff
changeset
|
136 | ucx_memchunk *mem = (ucx_memchunk*)p; |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
137 | if (!mem) { |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
138 | return NULL; |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
139 | } |
13 | 140 | |
141 | mem->destructor = NULL; | |
142 | pool->data[pool->ndata] = mem; | |
143 | pool->ndata++; | |
144 | ||
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
145 | return &(mem->c); |
13 | 146 | } |
147 | ||
148 | void *ucx_mempool_calloc(UcxMempool *pool, size_t nelem, size_t elsize) { | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
149 | size_t msz; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
150 | if(ucx_szmul(nelem, elsize, &msz)) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
151 | return NULL; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
152 | } |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
153 | |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
154 | void *ptr = ucx_mempool_malloc(pool, msz); |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
155 | if (!ptr) { |
13 | 156 | return NULL; |
157 | } | |
158 | memset(ptr, 0, nelem * elsize); | |
159 | return ptr; | |
160 | } | |
161 | ||
162 | void *ucx_mempool_realloc(UcxMempool *pool, void *ptr, size_t n) { | |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
163 | if(((size_t)-1) - sizeof(ucx_destructor) < n) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
164 | return NULL; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
165 | } |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
166 | |
28 | 167 | char *mem = ((char*)ptr) - sizeof(ucx_destructor); |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
168 | char *newm = (char*) realloc(mem, n + sizeof(ucx_destructor)); |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
169 | if (!newm) { |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
170 | return NULL; |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
171 | } |
15
2dc4c688c262
fixed mpool compiler warnings
Mike Becker <universe@uap-core.de>
parents:
14
diff
changeset
|
172 | if (mem != newm) { |
95 | 173 | for(size_t i=0 ; i < pool->ndata ; i++) { |
14 | 174 | if(pool->data[i] == mem) { |
175 | pool->data[i] = newm; | |
28 | 176 | return newm + sizeof(ucx_destructor); |
14 | 177 | } |
13 | 178 | } |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
113
diff
changeset
|
179 | fprintf(stderr, "FATAL: 0x%08" PRIxPTR" not in mpool 0x%08" PRIxPTR"\n", |
75
990734f548ef
fixed some compiler warnings
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
180 | (intptr_t)ptr, (intptr_t)pool); |
241
661f33ef20d8
removes unused ucx_mempool_clamp() and changes storage behavior of mempool to increase the capacity by a factor of two
Mike Becker <universe@uap-core.de>
parents:
240
diff
changeset
|
181 | abort(); |
16
b4769e4eb4d1
fixed ultra fail + renamed files from mpool to mempool
Mike Becker <universe@uap-core.de>
parents:
15
diff
changeset
|
182 | } else { |
28 | 183 | return newm + sizeof(ucx_destructor); |
13 | 184 | } |
185 | } | |
186 | ||
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
187 | void ucx_mempool_free(UcxMempool *pool, void *ptr) { |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
188 | ucx_memchunk *chunk = (ucx_memchunk*)((char*)ptr-sizeof(ucx_destructor)); |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
189 | for(size_t i=0 ; i<pool->ndata ; i++) { |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
190 | if(chunk == pool->data[i]) { |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
191 | if(chunk->destructor != NULL) { |
141
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
192 | chunk->destructor(&(chunk->c)); |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
193 | } |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
194 | free(chunk); |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
195 | size_t last_index = pool->ndata - 1; |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
196 | if(i != last_index) { |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
197 | pool->data[i] = pool->data[last_index]; |
141
c466e2a6cbd0
added mempool clamp + some minor fixes
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
198 | pool->data[last_index] = NULL; |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
199 | } |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
200 | pool->ndata--; |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
201 | return; |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
202 | } |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
203 | } |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
113
diff
changeset
|
204 | fprintf(stderr, "FATAL: 0x%08" PRIxPTR" not in mpool 0x%08" PRIxPTR"\n", |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
205 | (intptr_t)ptr, (intptr_t)pool); |
240
8f937a3a6d11
ucx_mempool_free() aborts execution instead of just exiting on failure
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
206 | abort(); |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
207 | } |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
208 | |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
209 | void ucx_mempool_destroy(UcxMempool *pool) { |
13 | 210 | ucx_memchunk *chunk; |
95 | 211 | for(size_t i=0 ; i<pool->ndata ; i++) { |
13 | 212 | chunk = (ucx_memchunk*) pool->data[i]; |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
213 | if(chunk) { |
135
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
214 | if(chunk->destructor) { |
a0aa1c15f46b
documented mempool + some fixes
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
215 | chunk->destructor(&(chunk->c)); |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
216 | } |
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
217 | free(chunk); |
13 | 218 | } |
219 | } | |
220 | free(pool->data); | |
158
81d580042da1
Added allocator to mempool struct + fixed suncc.mk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
141
diff
changeset
|
221 | free(pool->allocator); |
13 | 222 | free(pool); |
223 | } | |
224 | ||
225 | void ucx_mempool_set_destr(void *ptr, ucx_destructor func) { | |
226 | *(ucx_destructor*)((char*)ptr-sizeof(ucx_destructor)) = func; | |
227 | } | |
228 | ||
229 | void ucx_mempool_reg_destr(UcxMempool *pool, void *ptr, ucx_destructor destr) { | |
230 | ucx_regdestr *rd = (ucx_regdestr*)ucx_mempool_malloc( | |
231 | pool, | |
232 | sizeof(ucx_regdestr)); | |
233 | rd->destructor = destr; | |
14 | 234 | rd->ptr = ptr; |
13 | 235 | ucx_mempool_set_destr(rd, ucx_mempool_shared_destr); |
236 | } | |
113
8693d7874773
added mempool allocator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
237 |