mirror/libbacktrace
1
0
Fork 0
mirror of https://github.com/ianlancetaylor/libbacktrace.git synced 2026-03-29 13:39:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* backtrace.c: Revert last change. Don't call mmap

Browse Source 
directly.

Updates #13
This commit is contained in:
Ian Lance Taylor
2018-04-17 10:59:18 -07:00
parent 012b950b37
commit 1b8128cf56
1 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backtrace.c
View File

@@ -32,26 +32,12 @@ POSSIBILITY OF SUCH DAMAGE. */
#include "config.h" #include "config.h"
#include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#if !BACKTRACE_USES_MALLOC
#include <sys/mman.h>
#endif
#include "unwind.h" #include "unwind.h"
#include "backtrace.h" #include "backtrace.h"
#include "backtrace-supported.h"
#include "internal.h" #include "internal.h"
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
#ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1)
#endif
/* The main backtrace_full routine. */ /* The main backtrace_full routine. */
/* Data passed through _Unwind_Backtrace. */ /* Data passed through _Unwind_Backtrace. */
@@ -118,6 +104,7 @@ backtrace_full (struct backtrace_state *state, int skip,
backtrace_error_callback error_callback, void *data) backtrace_error_callback error_callback, void *data)
{ {
struct backtrace_data bdata; struct backtrace_data bdata;
void *p;
bdata.skip = skip + 1; bdata.skip = skip + 1;
bdata.state = state; bdata.state = state;
@@ -126,25 +113,16 @@ backtrace_full (struct backtrace_state *state, int skip,
bdata.data = data; bdata.data = data;
bdata.ret = 0; bdata.ret = 0;
#if !BACKTRACE_USES_MALLOC /* If we can't allocate any memory at all, don't try to produce
{ file/line information. */
size_t pagesize; p = backtrace_alloc (state, 4096, NULL, NULL);
void *page; if (p == NULL)
bdata.can_alloc = 0;
/* If we can't allocate any memory at all, don't try to produce else
file/line information. */ {
pagesize = getpagesize (); backtrace_free (state, p, 4096, NULL, NULL);
page = mmap (NULL, pagesize, PROT_READ | PROT_WRITE, bdata.can_alloc = 1;
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); }
if (page == MAP_FAILED)
bdata.can_alloc = 0;
else
{
munmap (page, pagesize);
bdata.can_alloc = 1;
}
}
#endif
_Unwind_Backtrace (unwind, &bdata); _Unwind_Backtrace (unwind, &bdata);
return bdata.ret; return bdata.ret;