Mon, 27 Dec 2021 14:44:08 +0100
add tests for the new low level functions
391
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved. |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | */ |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | #include "cx/allocator.h" |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | #include <stdlib.h> |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | |
452
a10c3e127050
add __alloc_size__ attribute
Mike Becker <universe@uap-core.de>
parents:
450
diff
changeset
|
33 | __attribute__((__malloc__, __alloc_size__(2))) |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
34 | static void *cx_malloc_stdlib(__attribute__((__unused__)) void *d, size_t n) { |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
35 | return malloc(n); |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
36 | } |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
37 | |
452
a10c3e127050
add __alloc_size__ attribute
Mike Becker <universe@uap-core.de>
parents:
450
diff
changeset
|
38 | __attribute__((__warn_unused_result__, __alloc_size__(3))) |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
39 | static void *cx_realloc_stdlib(__attribute__((__unused__)) void *d, void *mem, size_t n) { |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
40 | return realloc(mem, n); |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
41 | } |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
42 | |
452
a10c3e127050
add __alloc_size__ attribute
Mike Becker <universe@uap-core.de>
parents:
450
diff
changeset
|
43 | __attribute__((__malloc__, __alloc_size__(2, 3))) |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
44 | static void *cx_calloc_stdlib(__attribute__((__unused__)) void *d, size_t nelem, size_t n) { |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
45 | return calloc(nelem, n); |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
46 | } |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
47 | |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
48 | __attribute__((__nonnull__)) |
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
49 | static void cx_free_stdlib(__attribute__((__unused__)) void *d, void *mem) { |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
50 | free(mem); |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
51 | } |
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
52 | |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
53 | static cx_allocator_class cx_default_allocator_class = { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
54 | cx_malloc_stdlib, |
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
55 | cx_realloc_stdlib, |
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
56 | cx_calloc_stdlib, |
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
57 | cx_free_stdlib |
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
58 | }; |
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
59 | |
391
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
60 | struct cx_allocator_s cx_default_allocator = { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
61 | &cx_default_allocator_class, |
391
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
62 | NULL |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
63 | }; |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
64 | CxAllocator cxDefaultAllocator = &cx_default_allocator; |
f094a53c1178
adds allocator interface and default implementation
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
65 | |
434
38ee262e8b94
add attributes to allocator functions
Mike Becker <universe@uap-core.de>
parents:
414
diff
changeset
|
66 | /* IMPLEMENTATION OF HIGH LEVEL API */ |
38ee262e8b94
add attributes to allocator functions
Mike Becker <universe@uap-core.de>
parents:
414
diff
changeset
|
67 | |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
68 | void *cxMalloc(CxAllocator allocator, size_t n) { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
69 | return allocator->cl->malloc(allocator->data, n); |
394
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
70 | } |
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
71 | |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
72 | void *cxRealloc(CxAllocator allocator, void *mem, size_t n) { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
73 | return allocator->cl->realloc(allocator->data, mem, n); |
394
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
74 | } |
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
75 | |
414 | 76 | int cxReallocate(CxAllocator allocator, void **mem, size_t n) { |
450
7960298039cf
improves usage of attributes
Mike Becker <universe@uap-core.de>
parents:
434
diff
changeset
|
77 | void *nmem = allocator->cl->realloc(allocator->data, *mem, n); |
414 | 78 | if (nmem == NULL) { |
79 | return 1; | |
80 | } else { | |
81 | *mem = nmem; | |
82 | return 0; | |
83 | } | |
84 | } | |
85 | ||
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
86 | void *cxCalloc(CxAllocator allocator, size_t nelem, size_t n) { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
87 | return allocator->cl->calloc(allocator->data, nelem, n); |
394
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
88 | } |
80c31ebd66c1
high level allocator functions should be real functions, not macros
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
89 | |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
90 | void cxFree(CxAllocator allocator, void *mem) { |
396
3539dd99ab92
make cx_allocator_class shared
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
91 | allocator->cl->free(allocator->data, mem); |
397
cfc1193b1e65
removes unnecessary cx_allocator typedef
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
92 | } |