summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2022-10-28 21:27:20 -0400
committerTavian Barnes <tavianator@tavianator.com>2023-06-20 14:26:09 -0400
commit1649d37f7c88f8a5930fdd4c1ff1b59212da90ee (patch)
tree98de81da5d8c890f6fd0539a7746a69dd93d1fba /src
parentcbe2c473c9aee71f5f770dc7f41973d2ef4c273c (diff)
downloadbfs-1649d37f7c88f8a5930fdd4c1ff1b59212da90ee.tar.xz
bftw: Arena-allocate struct bftw_file
Diffstat (limited to 'src')
-rw-r--r--src/bftw.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/bftw.c b/src/bftw.c
index 7ab14c7..d0491e0 100644
--- a/src/bftw.c
+++ b/src/bftw.c
@@ -100,6 +100,9 @@ struct bftw_cache {
struct bftw_file *target;
/** The remaining capacity of the LRU list. */
size_t capacity;
+
+ /** bftw_file arena. */
+ struct varena files;
};
/** Initialize a cache. */
@@ -107,6 +110,7 @@ static void bftw_cache_init(struct bftw_cache *cache, size_t capacity) {
LIST_INIT(cache);
cache->target = NULL;
cache->capacity = capacity;
+ VARENA_INIT(&cache->files, struct bftw_file, name);
}
/** Remove a bftw_file from the LRU list. */
@@ -237,12 +241,14 @@ static void bftw_cache_destroy(struct bftw_cache *cache) {
bfs_assert(!cache->head);
bfs_assert(!cache->tail);
bfs_assert(!cache->target);
+
+ varena_destroy(&cache->files);
}
/** Create a new bftw_file. */
-static struct bftw_file *bftw_file_new(struct bftw_file *parent, const char *name) {
+static struct bftw_file *bftw_file_new(struct bftw_cache *cache, struct bftw_file *parent, const char *name) {
size_t namelen = strlen(name);
- struct bftw_file *file = ALLOC_FLEX(struct bftw_file, name, namelen + 1);
+ struct bftw_file *file = varena_alloc(&cache->files, namelen + 1);
if (!file) {
return NULL;
}
@@ -419,7 +425,7 @@ static void bftw_file_free(struct bftw_cache *cache, struct bftw_file *file) {
bftw_file_close(cache, file);
}
- free(file);
+ varena_free(&cache->files, file, file->namelen + 1);
}
/**
@@ -1212,7 +1218,7 @@ static int bftw_visit(struct bftw_state *state, const char *name) {
struct bftw_file *file = state->file;
if (name && (state->flags & BFTW_BUFFER)) {
- file = bftw_file_new(file, name);
+ file = bftw_file_new(&state->cache, file, name);
if (!file) {
state->error = errno;
return -1;
@@ -1229,7 +1235,7 @@ static int bftw_visit(struct bftw_state *state, const char *name) {
switch (bftw_call_back(state, name, BFTW_PRE)) {
case BFTW_CONTINUE:
if (name) {
- file = bftw_file_new(state->file, name);
+ file = bftw_file_new(&state->cache, state->file, name);
} else {
state->file = NULL;
}