From: Johnny Richard <johnny@johnnyrichard.com>
To: ~johnnyrichard/olang-devel@lists.sr.ht
Cc: Johnny Richard <johnny@johnnyrichard.com>
Subject: [PATCH olang v2] cli: replace memory allocation malloc -> arena
Date: Wed, 28 Feb 2024 13:37:22 +0100 [thread overview]
Message-ID: <20240228123810.44195-1-johnny@johnnyrichard.com> (raw)
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
next reply other threads:[~2024-02-28 11:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 12:37 Johnny Richard [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240228123810.44195-1-johnny@johnnyrichard.com \
--to=johnny@johnnyrichard.com \
--cc=~johnnyrichard/olang-devel@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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