* [PATCH olang v2] cli: replace memory allocation malloc -> arena
@ 2024-02-28 12:37 Johnny Richard
2024-02-28 11:39 ` [olang/patches/.build.yml] build success builds.sr.ht
2024-02-28 21:56 ` [PATCH olang v2] cli: replace memory allocation malloc -> arena Carlos Maniero
0 siblings, 2 replies; 3+ messages in thread
From: Johnny Richard @ 2024-02-28 12:37 UTC (permalink / raw)
To: ~johnnyrichard/olang-devel; +Cc: Johnny Richard
This code assumes that 1MB will be enough space to accommodate the
entire source code and the AST. If the source code is greater than half
of the arena capacity, the program will crash.
Signed-off-by: Johnny Richard <johnny@johnnyrichard.com>
---
v2: add TODO comment to ajust the arena capacity in the furure
src/main.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
index 978b770..2b2f12a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,15 +14,20 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "arena.h"
#include "lexer.h"
#include "string_view.h"
+// TODO: find a better solution to define the arena capacity
+#define ARENA_CAPACITY (1024 * 1024)
+
typedef struct cli_args
{
int argc;
@@ -45,7 +50,7 @@ static void
print_token(char *file_path, token_t *token);
string_view_t
-read_entire_file(char *file_path);
+read_entire_file(char *file_path, arena_t *arena);
int
main(int argc, char **argv)
@@ -73,7 +78,8 @@ main(int argc, char **argv)
return EXIT_FAILURE;
}
- string_view_t file_content = read_entire_file(opts.file_path);
+ arena_t arena = arena_new(ARENA_CAPACITY);
+ string_view_t file_content = read_entire_file(opts.file_path, &arena);
lexer_t lexer = { 0 };
lexer_init(&lexer, file_content);
@@ -107,7 +113,7 @@ print_usage(FILE *stream, char *prog)
}
string_view_t
-read_entire_file(char *file_path)
+read_entire_file(char *file_path, arena_t *arena)
{
FILE *stream = fopen(file_path, "rb");
@@ -122,7 +128,9 @@ read_entire_file(char *file_path)
file_content.size = ftell(stream);
fseek(stream, 0, SEEK_SET);
- file_content.chars = (char *)malloc(file_content.size);
+ assert(file_content.size * 2 < ARENA_CAPACITY);
+
+ file_content.chars = (char *)arena_alloc(arena, (size_t)file_content.size);
if (file_content.chars == NULL) {
fprintf(stderr, "Could not read file %s: %s\n", file_path, strerror(errno));
--
2.43.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-28 21:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-28 12:37 [PATCH olang v2] cli: replace memory allocation malloc -> arena Johnny Richard
2024-02-28 11:39 ` [olang/patches/.build.yml] build success builds.sr.ht
2024-02-28 21:56 ` [PATCH olang v2] cli: replace memory allocation malloc -> arena Carlos Maniero
Code repositories for project(s) associated with this public inbox
https://git.johnnyrichard.com/olang.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox