From c200dd832789afa298ba45e0b9efdec96c0e92cc Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Sun, 5 Dec 2021 11:55:10 -0800
Subject: Chore: simplified allocator interfaces.

I was never happy with the allocator/reallocator split.
It was originally designed to accomodate things like arenas that don't
free. But the majority of the time you don't care about this.
---
 src/base/fmt/buffer.c    |  6 +++---
 src/base/fmt/open.c      |  2 +-
 src/base/fs/walk.c       |  2 +-
 src/base/fs/walker.c     |  2 +-
 src/base/mem/arena.c     | 12 ++++++++++--
 src/base/mem/interface.c |  7 +------
 6 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/base/fmt/buffer.c b/src/base/fmt/buffer.c
index 0099e72..e039577 100644
--- a/src/base/fmt/buffer.c
+++ b/src/base/fmt/buffer.c
@@ -7,7 +7,7 @@ flush(fmt·State *io)
     char *s;
 
     void *heap = io->heap;
-    mem·Reallocator mem = io->mem;
+    mem·Allocator mem = io->mem;
 
     if(!io->buffer.beg)
         return 0;
@@ -29,7 +29,7 @@ flush(fmt·State *io)
 }
 
 int
-fmt·make(mem·Reallocator mem, void *heap, fmt·State *io)
+fmt·make(mem·Allocator mem, void *heap, fmt·State *io)
 {
     int n;
 
@@ -53,7 +53,7 @@ void
 fmt·free(fmt·State *io)
 {
     void *heap = io->heap;
-    mem·Reallocator mem = io->mem;
+    mem·Allocator mem = io->mem;
 
     mem.free(heap, io->buffer.beg);
     io->buffer.beg = io->buffer.cur = io->buffer.end = nil;
diff --git a/src/base/fmt/open.c b/src/base/fmt/open.c
index b6829bb..2020a2a 100644
--- a/src/base/fmt/open.c
+++ b/src/base/fmt/open.c
@@ -27,7 +27,7 @@ fmt·open(int fd, int len, char *buf, fmt·State *io)
     io->n     = 0;
     /* no heap needed */
     io->heap = nil;
-    io->mem  = (mem·Reallocator){ 0 };
+    io->mem  = (mem·Allocator){ 0 };
 
     fmt·setlocale(io, nil, nil, nil);
 
diff --git a/src/base/fs/walk.c b/src/base/fs/walk.c
index 4b0d0aa..612aca8 100644
--- a/src/base/fs/walk.c
+++ b/src/base/fs/walk.c
@@ -6,7 +6,7 @@
 static int
 morehistory(fs·History *h, int n)
 {
-    SET_GROW(h, struct Key, n, hash, sys·Memory, nil);
+    SET_GROW(h, struct Key, n, hash, base·Memory, nil);
 }
 
 static int
diff --git a/src/base/fs/walker.c b/src/base/fs/walker.c
index d988d13..0a0f61e 100644
--- a/src/base/fs/walker.c
+++ b/src/base/fs/walker.c
@@ -3,7 +3,7 @@
 static void
 delete(fs·History *h)
 {
-    SET_FREE(h, sys·Memory, nil);
+    SET_FREE(h, base·Memory, nil);
 }
 
 int
diff --git a/src/base/mem/arena.c b/src/base/mem/arena.c
index 37e7b56..7fe036a 100644
--- a/src/base/mem/arena.c
+++ b/src/base/mem/arena.c
@@ -31,6 +31,13 @@ static void*
     return mem·arenaalloc(heap, n, size);
 }
 
+static void*
+·arenarealloc(void *heap, void *old, uint n, ulong size)
+{
+    /* does not free */
+    return mem·arenaalloc(heap, n, size);
+}
+
 static void
 ·arenafree(void *heap, void *ptr)
 {
@@ -38,8 +45,9 @@ static void
 }
 
 mem·Allocator mem·ArenaAllocator = {
-    .alloc = ·arenaalloc,
-    .free  = ·arenafree,
+    .alloc   = ·arenaalloc,
+    .realloc = ·arenarealloc,
+    .free    = ·arenafree,
 };
 
 
diff --git a/src/base/mem/interface.c b/src/base/mem/interface.c
index e128bb9..99cb774 100644
--- a/src/base/mem/interface.c
+++ b/src/base/mem/interface.c
@@ -20,12 +20,7 @@ static void *
     return realloc(ptr, n*size);
 }
 
-mem·Allocator sys·Memory = {
-    .alloc   = ·calloc,
-    .free    = ·free
-};
-
-mem·Reallocator sys·FullMemory = {
+mem·Allocator base·Memory = {
     .alloc   = ·calloc,
     .realloc = ·realloc,
     .free    = ·free
-- 
cgit v1.2.1