wash/ec3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add node and entry size as parameters to b_tree_init

Browse Source
This commit is contained in:
max 🍓
2025-02-01 22:12:31 +00:00
parent 8e7995a2da
commit 4f3fe09440
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/b-tree.c
View File

@@ -1,5 +1,6 @@
#include <blue/core/queue.h>
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include "b-tree.h"
@@ -18,7 +19,7 @@ struct cache_entry {
};
#define GET_ENTRY(tree, entries, index) \
(b_tree_node_entry *)((unsigned char *)(entries) + ((index) * (tree)->tree_ops->entry_size));
(b_tree_node_entry *)((unsigned char *)(entries) + ((index) * (tree)->tree_entry_size));
static b_tree_node *cache_alloc_node(struct b_tree *tree)
@@ -32,7 +33,7 @@ static b_tree_node *cache_alloc_node(struct b_tree *tree)
}
}
struct cache_entry *e = malloc(sizeof *e + tree->tree_ops->node_size);
struct cache_entry *e = malloc(sizeof *e + tree->tree_node_size);
if (!e) {
return NULL;
}
@@ -52,10 +53,13 @@ static void cache_free_node(struct b_tree *tree, b_tree_node *node)
e->c_allocated = 0;
}
void b_tree_init(struct b_tree *tree, const struct b_tree_ops *ops, unsigned int order)
void b_tree_init(struct b_tree *tree, const struct b_tree_ops *ops, unsigned int node_size, unsigned int entry_size, unsigned int order)
{
memset(tree, 0x0, sizeof *tree);
assert((order % 2) == 0);
tree->tree_ops = ops;
tree->tree_node_size = node_size;
tree->tree_entry_size = entry_size;
tree->tree_order = order;
}
@@ -114,14 +118,14 @@ static void node_set_entry(struct b_tree *tree, b_tree_node *node, unsigned long
{
b_tree_node_entry *entries = tree->tree_ops->node_get_entries(node);
b_tree_node_entry *dest = GET_ENTRY(tree, entries, index);
memcpy(dest, entry, tree->tree_ops->entry_size);
memcpy(dest, entry, tree->tree_entry_size);
}
static void node_kill_entry(struct b_tree *tree, b_tree_node *node, unsigned long index)
{
b_tree_node_entry *entries = tree->tree_ops->node_get_entries(node);
b_tree_node_entry *dest = GET_ENTRY(tree, entries, index);
memset(dest, 0x0, tree->tree_ops->entry_size);
memset(dest, 0x0, tree->tree_entry_size);
}
static void node_shift_entries(struct b_tree *tree, b_tree_node *node, unsigned long shift_from, long shift_by)
@@ -137,7 +141,7 @@ static void node_shift_entries(struct b_tree *tree, b_tree_node *node, unsigned
b_tree_node_entry *dest = GET_ENTRY(tree, entries, shift_from + shift_by);
unsigned int count = nr_entries - shift_from;
memmove(dest, src, tree->tree_ops->entry_size * count);
memmove(dest, src, tree->tree_entry_size * count);
if (shift_by < 0) {
dest = GET_ENTRY(tree, entries, nr_entries + shift_by);
count = abs(shift_by);
@@ -147,8 +151,8 @@ static void node_shift_entries(struct b_tree *tree, b_tree_node *node, unsigned
count = shift_by;
}
memset(dest, 0x0, count * tree->tree_ops->entry_size);
return 0;
memset(dest, 0x0, count * tree->tree_entry_size);
return;
}
static void node_shift_children(struct b_tree *tree, b_tree_node *node, unsigned long shift_from, long shift_by)
@@ -195,9 +199,9 @@ static void node_move_entries(struct b_tree *tree, b_tree_node *from, b_tree_nod
b_tree_node_entry *src = GET_ENTRY(tree, from_entries, src_index);
b_tree_node_entry *dest = GET_ENTRY(tree, to_entries, dest_index);
memmove(dest, src, count * tree->tree_ops->entry_size);
memmove(dest, src, count * tree->tree_entry_size);
if (src_index + count >= from_nr_entries) {
memset(src, 0x0, count * tree->tree_ops->entry_size);
memset(src, 0x0, count * tree->tree_entry_size);
} else {
node_shift_entries(tree, from, src_index + count, (int)count * -1);
}
@@ -268,7 +272,7 @@ static int node_is_leaf(struct b_tree *tree, b_tree_node *node)
static void node_init(struct b_tree *tree, b_tree_node *out)
{
memset(out, 0x0, tree->tree_ops->node_size);
memset(out, 0x0, tree->tree_node_size);
for (unsigned int i = 0; i < tree->tree_order; i++) {
node_set_child(tree, out, i, B_TREE_INVALID_PTR);
}