Use proper tracy alloc wrappers in libbacktrace.

This commit is contained in:
Bartosz Taudul 2020-10-22 22:26:55 +02:00
parent 01e5c289b7
commit 7e18540f9c

View File

@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE. */
#include "backtrace.hpp" #include "backtrace.hpp"
#include "internal.hpp" #include "internal.hpp"
#include "../client/tracy_rpmalloc.hpp" #include "../common/TracyAlloc.hpp"
namespace tracy namespace tracy
{ {
@ -59,7 +59,7 @@ backtrace_alloc (struct backtrace_state *state ATTRIBUTE_UNUSED,
{ {
void *ret; void *ret;
ret = rpmalloc (size); ret = tracy_malloc (size);
if (ret == NULL) if (ret == NULL)
{ {
if (error_callback) if (error_callback)
@ -76,7 +76,7 @@ backtrace_free (struct backtrace_state *state ATTRIBUTE_UNUSED,
backtrace_error_callback error_callback ATTRIBUTE_UNUSED, backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
void *data ATTRIBUTE_UNUSED) void *data ATTRIBUTE_UNUSED)
{ {
rpfree (p); tracy_free (p);
} }
/* Grow VEC by SIZE bytes. */ /* Grow VEC by SIZE bytes. */
@ -103,7 +103,7 @@ backtrace_vector_grow (struct backtrace_state *state ATTRIBUTE_UNUSED,
if (alc < vec->size + size) if (alc < vec->size + size)
alc = vec->size + size; alc = vec->size + size;
base = rprealloc (vec->base, alc); base = tracy_realloc (vec->base, alc);
if (base == NULL) if (base == NULL)
{ {
error_callback (data, "realloc", errno); error_callback (data, "realloc", errno);
@ -156,12 +156,12 @@ backtrace_vector_release (struct backtrace_state *state ATTRIBUTE_UNUSED,
{ {
/* As of C17, realloc with size 0 is marked as an obsolescent feature, use /* As of C17, realloc with size 0 is marked as an obsolescent feature, use
free instead. */ free instead. */
rpfree (vec->base); tracy_free (vec->base);
vec->base = NULL; vec->base = NULL;
return 1; return 1;
} }
vec->base = rprealloc (vec->base, vec->size); vec->base = tracy_realloc (vec->base, vec->size);
if (vec->base == NULL) if (vec->base == NULL)
{ {
error_callback (data, "realloc", errno); error_callback (data, "realloc", errno);