mirror of
https://github.com/neovim/neovim.git
synced 2025-09-27 21:48:35 +00:00
Remove support for using jemalloc instead of the system allocator
There was never any investigation done to determine whether using jemalloc was actually a net benefit for nvim. It has been a portability limitation and adds another factor to consider when triaging issues.
This commit is contained in:
@@ -34,32 +34,6 @@ int uv_pipe_open(struct uv_pipe_s *handle, int fd)
|
||||
return result;
|
||||
}
|
||||
|
||||
// Issue 2422
|
||||
//
|
||||
// Teach coverity about jemalloc functions, so that it understands
|
||||
// they are equivalent to malloc ones.
|
||||
|
||||
void *je_malloc(size_t size)
|
||||
{
|
||||
return __coverity_alloc__(size);
|
||||
}
|
||||
|
||||
void je_free(void *ptr)
|
||||
{
|
||||
__coverity_free__(ptr);
|
||||
}
|
||||
|
||||
void *je_calloc(size_t count, size_t size)
|
||||
{
|
||||
return je_malloc(count * size);
|
||||
}
|
||||
|
||||
void *je_realloc(void *ptr, size_t size)
|
||||
{
|
||||
je_free(ptr);
|
||||
return je_malloc(size);
|
||||
}
|
||||
|
||||
// Hint Coverity that adding item to d avoids losing track
|
||||
// of the memory allocated for item.
|
||||
typedef struct {} dictitem_T;
|
||||
|
@@ -397,11 +397,6 @@ endif()
|
||||
|
||||
set(NVIM_EXEC_LINK_LIBRARIES ${NVIM_LINK_LIBRARIES} ${LUA_PREFERRED_LIBRARIES})
|
||||
|
||||
# Don't use jemalloc in the unit test library.
|
||||
if(JEMALLOC_FOUND)
|
||||
list(APPEND NVIM_EXEC_LINK_LIBRARIES ${JEMALLOC_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(POLICY CMP0069)
|
||||
cmake_policy(SET CMP0069 NEW)
|
||||
endif()
|
||||
|
@@ -18,35 +18,15 @@
|
||||
#include "nvim/ui.h"
|
||||
#include "nvim/api/vim.h"
|
||||
|
||||
#ifdef HAVE_JEMALLOC
|
||||
// Force je_ prefix on jemalloc functions.
|
||||
# define JEMALLOC_NO_DEMANGLE
|
||||
# include <jemalloc/jemalloc.h>
|
||||
#endif
|
||||
|
||||
#ifdef UNIT_TESTING
|
||||
# define malloc(size) mem_malloc(size)
|
||||
# define calloc(count, size) mem_calloc(count, size)
|
||||
# define realloc(ptr, size) mem_realloc(ptr, size)
|
||||
# define free(ptr) mem_free(ptr)
|
||||
# ifdef HAVE_JEMALLOC
|
||||
MemMalloc mem_malloc = &je_malloc;
|
||||
MemFree mem_free = &je_free;
|
||||
MemCalloc mem_calloc = &je_calloc;
|
||||
MemRealloc mem_realloc = &je_realloc;
|
||||
# else
|
||||
MemMalloc mem_malloc = &malloc;
|
||||
MemFree mem_free = &free;
|
||||
MemCalloc mem_calloc = &calloc;
|
||||
MemRealloc mem_realloc = &realloc;
|
||||
# endif
|
||||
#else
|
||||
# ifdef HAVE_JEMALLOC
|
||||
# define malloc(size) je_malloc(size)
|
||||
# define calloc(count, size) je_calloc(count, size)
|
||||
# define realloc(ptr, size) je_realloc(ptr, size)
|
||||
# define free(ptr) je_free(ptr)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
|
@@ -62,12 +62,6 @@ static char *features[] = {
|
||||
"-iconv",
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_JEMALLOC
|
||||
"+jemalloc",
|
||||
#else
|
||||
"-jemalloc",
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_TUI
|
||||
"+tui",
|
||||
#else
|
||||
|
Reference in New Issue
Block a user