raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update...

Browse source
This commit is contained in:
Maix0 2024-05-08 23:27:43 +02:00
parent 314a5d4c71
commit 746a1ad2ad
5 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stdme/src/alloc/get_arena.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/07 09:47:50 by maiboyer #+# #+# */
/* Updated: 2024/05/08 19:24:47 by maiboyer ### ########.fr */
/* Updated: 2024/05/08 22:05:36 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -41,7 +41,7 @@ t_error alloc_arena_page(t_usize min_size, t_arena_page **out)
{
t_arena_block *block;
printf("Allocating page with size %zu", min_size);
printf("Allocating page with size %zu\n", min_size);
min_size = usize_round_up_to(min_size, ARENA_SIZE_DEFAULT);
if (out == NULL)
return (ERROR);

58
stdme/src/os/abort.c
View file

@ -6,57 +6,67 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/07 11:08:03 by maiboyer #+# #+# */
/* Updated: 2024/05/08 19:39:37 by maiboyer ### ########.fr */
/* Updated: 2024/05/08 23:26:22 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/putstr_fd.h"
#define _GNU_SOURCE
#include "me/alloc/alloc_internal.h"
#include "me/fs/putendl_fd.h"
#include "me/fs/putstr_fd.h"
#include "me/types.h"
#include <dlfcn.h>
#include <execinfo.h>
#include <link.h>
#include <stdio.h>
#include <stdlib.h>
#include "me/alloc/alloc_internal.h"
#ifndef BASE_PATH
# define BASE_PATH "/no_base_path_defined/"
#endif
#if defined(PRINT_BACKTRACE) || defined(BACKTRACE_DEEP)
#if defined(PRINT_BACKTRACE) || defined(BACKTRACE_DEEP) || true
# ifndef BACKTRACE_DEEP
# define BACKTRACE_DEEP 256
# endif
static void print_trace_inner(void **trace, t_str *messages, t_usize i)
static size_t convert_to_vma(t_usize addr)
{
char syscom[1024];
t_i32 p;
Dl_info info;
struct link_map *link_map;
dladdr1((void *)addr, &info, (void **)&link_map, RTLD_DL_LINKMAP);
return (addr - link_map->l_addr);
}
static void print_trace_inner(void **trace, t_str *messages, t_usize i)
{
char syscom[1024];
t_i32 p;
p = 0;
fprintf(stderr, "[bt] #%-4zu\t", i);
while (messages[i][p] != '(' && messages[i][p] != ' '
&& messages[i][p] != 0)
while (messages[i][p] != '(' && messages[i][p] != ' ' &&
messages[i][p] != 0)
++p;
fflush(stderr);
snprintf(syscom, \
1024, \
"addr2line %p -e %.*s -ipf | 1>&2 rg \"^(.*) at %s(.*)\"'$' " \
"--replace '$1 at $2' --color never", \
trace[i], \
p, \
messages[i], \
BASE_PATH);
snprintf(
syscom, sizeof(syscom) / sizeof(syscom[0]),
"addr2line %#x -e %.*s -ipfa"
"| 1>&2 rg \"^(.*) at %s(.*)\"'$' --replace '$1 at $2' --color never",
(t_u32)(convert_to_vma((t_usize)trace[i])), p, messages[i], BASE_PATH);
if (system(syscom))
fprintf(stderr, "%s\n", messages[i]);
}
void print_trace(void)
void print_trace(void)
{
void *trace[BACKTRACE_DEEP];
t_str *messages;
t_i32 size;
t_i32 i;
void *trace[BACKTRACE_DEEP];
t_str *messages;
t_i32 size;
t_i32 i;
size = backtrace(trace, BACKTRACE_DEEP);
messages = backtrace_symbols(trace, size);
@ -70,13 +80,13 @@ void print_trace(void)
}
#else
void print_trace(void)
void print_trace(void)
{
}
#endif
void me_abort(t_str msg)
void me_abort(t_str msg)
{
if (msg == NULL)
msg = "No message (msg was NULL)";