Thu, 11 Sep 2025 20:09:33 +0200
kv-list: fix support for CX_STORE_POINTERS when using the map interface
relates to #461
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2025 Mike Becker, Olaf Wintermann All rights reserved. |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
a1da355ed3b8
roll out the function stubs for the kv-list
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 |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | */ |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | #include "cx/kv_list.h" |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
30 | #include "cx/hash_map.h" |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
31 | #include "cx/linked_list.h" |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
32 | |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
33 | #include <string.h> |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
34 | |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
35 | typedef struct cx_kv_list_s cx_kv_list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
36 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
37 | struct cx_kv_list_map_s { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
38 | struct cx_hash_map_s map_base; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
39 | /** Back-reference to the list. */ |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
40 | cx_kv_list *list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
41 | }; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
42 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
43 | struct cx_kv_list_s { |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
44 | struct cx_linked_list_s list; |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
45 | /** The lookup map - stores pointers to the nodes. */ |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
46 | struct cx_kv_list_map_s *map; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
47 | const cx_list_class *list_methods; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
48 | const cx_map_class *map_methods; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
49 | cx_destructor_func list_destr; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
50 | cx_destructor_func2 list_destr2; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
51 | void *list_destr_data; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
52 | cx_destructor_func map_destr; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
53 | cx_destructor_func2 map_destr2; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
54 | void *map_destr_data; |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
55 | }; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
56 | |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
57 | static void cx_kv_list_destructor_wrapper_list(void *list_ptr, void *elem) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
58 | const cx_kv_list *kv_list = list_ptr; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
59 | // list destructor is already called with proper deref of the elem |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
60 | if (kv_list->list_destr) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
61 | kv_list->list_destr(elem); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
62 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
63 | if (kv_list->list_destr2) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
64 | kv_list->list_destr2(kv_list->list_destr_data, elem); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
65 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
66 | if (kv_list->map_destr) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
67 | kv_list->map_destr(elem); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
68 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
69 | if (kv_list->map_destr2) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
70 | kv_list->map_destr2(kv_list->map_destr_data, elem); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
71 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
72 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
73 | |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
74 | static void cx_kv_list_update_destructors(cx_kv_list *list) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
75 | // we copy the destructors to our custom fields and register |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
76 | // an own destructor function which invokes all these |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
77 | if (list->list.base.collection.simple_destructor != NULL) { |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
78 | list->list_destr = list->list.base.collection.simple_destructor; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
79 | list->list.base.collection.simple_destructor = NULL; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
80 | } |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
81 | if (list->list.base.collection.advanced_destructor != cx_kv_list_destructor_wrapper_list) { |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
82 | list->list_destr2 = list->list.base.collection.advanced_destructor; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
83 | list->list_destr_data = list->list.base.collection.destructor_data; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
84 | list->list.base.collection.advanced_destructor = cx_kv_list_destructor_wrapper_list; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
85 | list->list.base.collection.destructor_data = list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
86 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
87 | if (list->map->map_base.base.collection.simple_destructor != NULL) { |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
88 | list->map_destr = list->map->map_base.base.collection.simple_destructor; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
89 | list->map->map_base.base.collection.simple_destructor = NULL; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
90 | } |
1368
19025ca34caa
change kv-list destructor strategy to only use the list destructors
Mike Becker <universe@uap-core.de>
parents:
1367
diff
changeset
|
91 | if (list->map->map_base.base.collection.advanced_destructor != NULL) { |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
92 | list->map_destr2 = list->map->map_base.base.collection.advanced_destructor; |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
93 | list->map_destr_data = list->map->map_base.base.collection.destructor_data; |
1368
19025ca34caa
change kv-list destructor strategy to only use the list destructors
Mike Becker <universe@uap-core.de>
parents:
1367
diff
changeset
|
94 | list->map->map_base.base.collection.advanced_destructor = NULL; |
19025ca34caa
change kv-list destructor strategy to only use the list destructors
Mike Becker <universe@uap-core.de>
parents:
1367
diff
changeset
|
95 | list->map->map_base.base.collection.destructor_data = NULL; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
96 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
97 | } |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
98 | |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
99 | static void cx_kvl_deallocate(struct cx_list_s *list) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
100 | cx_kv_list *kv_list = (cx_kv_list*)list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
101 | // patch the destructors |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
102 | cx_kv_list_update_destructors(kv_list); |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
103 | kv_list->map_methods->deallocate(&kv_list->map->map_base.base); |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
104 | // then free the list, now the destructors may be called |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
105 | kv_list->list_methods->deallocate(list); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
106 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
107 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
108 | static void *cx_kvl_insert_element( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
109 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
110 | size_t index, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
111 | const void *data |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
112 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
113 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
114 | // TODO: trick the base method by adding the required space for the key to the elem_size |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
115 | return kv_list->list_methods->insert_element(list, index, data); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
116 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
117 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
118 | static size_t cx_kvl_insert_array( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
119 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
120 | size_t index, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
121 | const void *data, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
122 | size_t n |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
123 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
124 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
125 | // TODO: trick the base method by adding the required space for the key to the elem_size |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
126 | return kv_list->list_methods->insert_array(list, index, data, n); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
127 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
128 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
129 | static size_t cx_kvl_insert_sorted( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
130 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
131 | const void *sorted_data, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
132 | size_t n |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
133 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
134 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
135 | // TODO: trick the base method by adding the required space for the key to the elem_size |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
136 | return kv_list->list_methods->insert_sorted(list, sorted_data, n); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
137 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
138 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
139 | static int cx_kvl_insert_iter( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
140 | struct cx_iterator_s *iter, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
141 | const void *elem, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
142 | int prepend |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
143 | ) { |
1362
d886626a9526
add several fixme and todo comments regarding invoking destructors
Mike Becker <universe@uap-core.de>
parents:
1361
diff
changeset
|
144 | cx_kv_list *kv_list = iter->src_handle.m; |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
145 | // TODO: trick the base method by adding the required space for the key to the elem_size |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
146 | return kv_list->list_methods->insert_iter(iter, elem, prepend); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
147 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
148 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
149 | static size_t cx_kvl_remove( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
150 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
151 | size_t index, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
152 | size_t num, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
153 | void *targetbuf |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
154 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
155 | cx_kv_list *kv_list = (cx_kv_list*)list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
156 | // patch the destructors |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
157 | cx_kv_list_update_destructors(kv_list); |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
158 | // TODO: always use the target buffer to get the element first, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
159 | // then obtain the key, remove it from the map, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
160 | // and finally call any destructors manually |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
161 | return kv_list->list_methods->remove(list, index, num, targetbuf); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
162 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
163 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
164 | static void cx_kvl_clear(struct cx_list_s *list) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
165 | cx_kv_list *kv_list = (cx_kv_list*)list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
166 | // patch the destructors |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
167 | cx_kv_list_update_destructors(kv_list); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
168 | // clear the list |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
169 | kv_list->list_methods->clear(list); |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
170 | // then clear the map |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
171 | kv_list->map_methods->clear(&kv_list->map->map_base.base); |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
172 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
173 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
174 | static int cx_kvl_swap( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
175 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
176 | size_t i, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
177 | size_t j |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
178 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
179 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
180 | return kv_list->list_methods->swap(list, i, j); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
181 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
182 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
183 | static void *cx_kvl_at( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
184 | const struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
185 | size_t index |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
186 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
187 | const cx_kv_list *kv_list = (const cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
188 | return kv_list->list_methods->at(list, index); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
189 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
190 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
191 | static size_t cx_kvl_find_remove( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
192 | struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
193 | const void *elem, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
194 | bool remove |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
195 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
196 | cx_kv_list *kv_list = (cx_kv_list*)list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
197 | cx_kv_list_update_destructors(kv_list); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
198 | // TODO: implement removal of the key in the map |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
199 | return kv_list->list_methods->find_remove(list, elem, remove); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
200 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
201 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
202 | static void cx_kvl_sort(struct cx_list_s *list) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
203 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
204 | kv_list->list_methods->sort(list); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
205 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
206 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
207 | static void cx_kvl_reverse(struct cx_list_s *list) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
208 | cx_kv_list *kv_list = (cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
209 | kv_list->list_methods->reverse(list); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
210 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
211 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
212 | static struct cx_iterator_s cx_kvl_iterator( |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
213 | const struct cx_list_s *list, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
214 | size_t index, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
215 | bool backward |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
216 | ) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
217 | const cx_kv_list *kv_list = (const cx_kv_list*)list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
218 | // TODO: cannot really forward, because mutating iterators must be able to remove the element |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
219 | return kv_list->list_methods->iterator(list, index, backward); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
220 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
221 | |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
222 | static void cx_kvl_map_deallocate(struct cx_map_s *map) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
223 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
224 | kv_list->map_methods->deallocate(map); |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
225 | kv_list->list_methods->deallocate(&kv_list->list.base); |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
226 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
227 | |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
228 | static void cx_kvl_map_clear(struct cx_map_s *map) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
229 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
230 | cx_kv_list_update_destructors(kv_list); |
1368
19025ca34caa
change kv-list destructor strategy to only use the list destructors
Mike Becker <universe@uap-core.de>
parents:
1367
diff
changeset
|
231 | kv_list->list_methods->clear(&kv_list->list.base); |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
232 | kv_list->map_methods->clear(map); |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
233 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
234 | |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
235 | static void *cx_kvl_map_put(CxMap *map, CxHashKey key, void *value) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
236 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
237 | // insert the data into the list first (assume that insertion destroys the sorted property) |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
238 | kv_list->list.base.collection.sorted = false; |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
239 | // TODO: use the same trick as above to increase the element size temporarily to add the key to the data |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
240 | void *node_data = kv_list->list_methods->insert_element( |
1370
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
241 | &kv_list->list.base, kv_list->list.base.collection.size, |
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
242 | kv_list->list.base.collection.store_pointer ? &value : value); |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
243 | if (node_data == NULL) return NULL; // LCOV_EXCL_LINE |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
244 | // then insert the key into the map, referring to the node data |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
245 | return kv_list->map_methods->put(map, key, node_data); |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
246 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
247 | |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
248 | void *cx_kvl_map_get(const CxMap *map, CxHashKey key) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
249 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
1370
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
250 | void *node_data = kv_list->map_methods->get(map, key); |
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
251 | if (node_data == NULL) return NULL; // LCOV_EXCL_LINE |
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
252 | // return the node data |
607f822c79fe
kv-list: fix support for CX_STORE_POINTERS when using the map interface
Mike Becker <universe@uap-core.de>
parents:
1369
diff
changeset
|
253 | return kv_list->list.base.collection.store_pointer ? *(void**)node_data : node_data; |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
254 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
255 | |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
256 | int cx_kvl_map_remove(CxMap *map, CxHashKey key, void *targetbuf) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
257 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
258 | |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
259 | void *node_data; |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
260 | if (kv_list->map_methods->remove(map, key, &node_data)) { |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
261 | return 1; |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
262 | } |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
263 | // we cannot just call a list method (because we don't have the index) |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
264 | // and tbh. we also don't want to (because it's not performant when we |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
265 | // can have the node ptr directly instead) |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
266 | // therefore, we re-implement the logic ourselves |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
267 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
268 | // check if the outside caller want's us to return or to destroy the element |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
269 | if (targetbuf == NULL) { |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
270 | // patch the destructors and invoke them through the wrapper |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
271 | cx_kv_list_update_destructors(kv_list); |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
272 | cx_invoke_advanced_destructor(&kv_list->list.base, node_data); |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
273 | } else { |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
274 | // copy the element to the target buffer |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
275 | memcpy(targetbuf, node_data, kv_list->list.base.collection.elem_size); |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
276 | } |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
277 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
278 | // calculate the address of the node |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
279 | void *node_ptr = (char*)node_data - kv_list->list.loc_data; |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
280 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
281 | // unlink the node |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
282 | cx_linked_list_remove( |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
283 | &kv_list->list.begin, |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
284 | &kv_list->list.end, |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
285 | kv_list->list.loc_prev, |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
286 | kv_list->list.loc_next, |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
287 | node_ptr |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
288 | ); |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
289 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
290 | // decrement the list's size |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
291 | kv_list->list.base.collection.size--; |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
292 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
293 | // deallocate the node |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
294 | cxFree(kv_list->list.base.collection.allocator, node_ptr); |
1360
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
295 | |
8b29d732f97b
implement cx_kvl_map_remove()
Mike Becker <universe@uap-core.de>
parents:
1358
diff
changeset
|
296 | return 0; |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
297 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
298 | |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
299 | CxMapIterator cx_kvl_map_iterator(const CxMap *map, enum cx_map_iterator_type type) { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
300 | cx_kv_list *kv_list = ((struct cx_kv_list_map_s*)map)->list; |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
301 | return kv_list->map_methods->iterator(map, type); |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
302 | } |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
303 | |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
304 | static cx_list_class cx_kv_list_class = { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
305 | cx_kvl_deallocate, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
306 | cx_kvl_insert_element, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
307 | cx_kvl_insert_array, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
308 | cx_kvl_insert_sorted, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
309 | cx_kvl_insert_iter, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
310 | cx_kvl_remove, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
311 | cx_kvl_clear, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
312 | cx_kvl_swap, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
313 | cx_kvl_at, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
314 | cx_kvl_find_remove, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
315 | cx_kvl_sort, |
1352
8428516137dd
make comparisons between kv_list and linked_list optimizable
Mike Becker <universe@uap-core.de>
parents:
1350
diff
changeset
|
316 | NULL, |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
317 | cx_kvl_reverse, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
318 | cx_kvl_iterator, |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
319 | }; |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
320 | |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
321 | static cx_map_class cx_kv_map_class = { |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
322 | cx_kvl_map_deallocate, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
323 | cx_kvl_map_clear, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
324 | cx_kvl_map_put, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
325 | cx_kvl_map_get, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
326 | cx_kvl_map_remove, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
327 | cx_kvl_map_iterator, |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
328 | }; |
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
329 | |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
330 | CxList *cxKvListCreate( |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
331 | const CxAllocator *allocator, |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
332 | cx_compare_func comparator, |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
333 | size_t elem_size |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
334 | ) { |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
335 | if (allocator == NULL) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
336 | allocator = cxDefaultAllocator; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
337 | } |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
338 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
339 | // create a normal linked list and a normal hash map, first |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
340 | CxList *list = cxLinkedListCreate(allocator, comparator, elem_size); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
341 | if (list == NULL) return NULL; // LCOV_EXCL_LINE |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
342 | cx_linked_list *ll = (cx_linked_list*)list; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
343 | ll->extra_data_len = sizeof(CxHashKey); |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
344 | CxMap *map = cxHashMapCreate(allocator, CX_STORE_POINTERS, 0); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
345 | if (map == NULL) { // LCOV_EXCL_START |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
346 | cxListFree(list); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
347 | return NULL; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
348 | } // LCOV_EXCL_STOP |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
349 | |
1352
8428516137dd
make comparisons between kv_list and linked_list optimizable
Mike Becker <universe@uap-core.de>
parents:
1350
diff
changeset
|
350 | // patch the kv-list class with the compare function of the linked list |
8428516137dd
make comparisons between kv_list and linked_list optimizable
Mike Becker <universe@uap-core.de>
parents:
1350
diff
changeset
|
351 | // this allows cxListCompare() to optimize comparisons between linked lists and kv-list |
8428516137dd
make comparisons between kv_list and linked_list optimizable
Mike Becker <universe@uap-core.de>
parents:
1350
diff
changeset
|
352 | cx_kv_list_class.compare = list->cl->compare; |
8428516137dd
make comparisons between kv_list and linked_list optimizable
Mike Becker <universe@uap-core.de>
parents:
1350
diff
changeset
|
353 | |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
354 | // reallocate the map to add memory for the list back-reference |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
355 | struct cx_kv_list_map_s *kv_map = cxRealloc(allocator, map, sizeof(struct cx_kv_list_map_s)); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
356 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
357 | // reallocate the list to add memory for storing the metadata |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
358 | cx_kv_list *kv_list = cxRealloc(allocator, list, sizeof(struct cx_kv_list_s)); |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
359 | |
1365
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
360 | // zero the custom destructor information |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
361 | memset((char*)kv_list + offsetof(cx_kv_list, list_destr), 0, sizeof(void*)*6); |
e4135791687e
implement a patch function that results in (almost) always calling the correct destructors
Mike Becker <universe@uap-core.de>
parents:
1362
diff
changeset
|
362 | |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
363 | // if any of the reallocations failed, we bail out |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
364 | if (kv_map != NULL && kv_list != NULL) { |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
365 | map = (CxMap*) kv_map; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
366 | list = (CxList*) kv_list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
367 | } else { // LCOV_EXCL_START |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
368 | cxListFree(list); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
369 | cxMapFree(map); |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
370 | return NULL; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
371 | } // LCOV_EXCL_STOP |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
372 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
373 | // combine the list and the map aspect |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
374 | kv_list->map = kv_map; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
375 | kv_map->list = kv_list; |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
376 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
377 | // remember the base methods and override them |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
378 | kv_list->map_methods = map->cl; |
1358
dda9c330e3e5
make test_kv_list_map_put() pass
Mike Becker <universe@uap-core.de>
parents:
1353
diff
changeset
|
379 | map->cl = &cx_kv_map_class; |
1353
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
380 | if (list->climpl == NULL) { |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
381 | kv_list->list_methods = list->cl; |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
382 | list->cl = &cx_kv_list_class; |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
383 | } else { |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
384 | kv_list->list_methods = list->climpl; |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
385 | list->climpl = &cx_kv_list_class; |
5a13b9c1c57b
fix that the wrong vtable is patched when CX_STORE_POINTERS is used
Mike Becker <universe@uap-core.de>
parents:
1352
diff
changeset
|
386 | } |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
387 | |
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
388 | return list; |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
389 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
390 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
391 | CxMap *cxKvListCreateAsMap( |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
392 | const CxAllocator *allocator, |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
393 | cx_compare_func comparator, |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
394 | size_t elem_size |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
395 | ) { |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
396 | CxList *list = cxKvListCreate(allocator, comparator, elem_size); |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
397 | return list == NULL ? NULL : cxKvListAsMap(list); |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
398 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
399 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
400 | CxList *cxKvListAsList(CxMap *map) { |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
401 | return &((struct cx_kv_list_map_s*)map)->list->list.base; |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
402 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
403 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
404 | CxMap *cxKvListAsMap(CxList *list) { |
1350
189756516eaa
implement kv-list to a point where it correctly behaves like a list
Mike Becker <universe@uap-core.de>
parents:
1348
diff
changeset
|
405 | return &((cx_kv_list*)list)->map->map_base.base; |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
406 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
407 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
408 | int cx_kv_list_set_key(CxList *list, size_t index, CxHashKey key) { |
1367
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
409 | cx_kv_list *kv_list = (cx_kv_list*)list; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
410 | char *node_data = kv_list->list_methods->at(list, index); |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
411 | char *loc_key = node_data + list->collection.elem_size; |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
412 | memcpy(loc_key, &key, sizeof(key)); |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
413 | |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
414 | // TODO: what happens when we are _replacing_ an existing key? |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
415 | kv_list->map_methods->put(&kv_list->map->map_base.base, key, node_data); |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
416 | // TODO: what happens if the map cocks up and returns NULL? |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
417 | |
6b3d52dd176e
change linked_list.c to allow custom data in nodes + implement cx_kv_list_set_key()
Mike Becker <universe@uap-core.de>
parents:
1365
diff
changeset
|
418 | return 0; |
1348
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
419 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
420 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
421 | int cx_kv_list_remove_key(CxList *list, size_t index, CxHashKey key) { |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
422 | return -1; |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
423 | } |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
424 | |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
425 | int cx_kv_list_insert(CxList *list, size_t index, CxHashKey key, void *value) { |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
426 | return -1; |
a1da355ed3b8
roll out the function stubs for the kv-list
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
427 | } |