Skip to content

Commit 554b9ca

Browse files
dschomjcheetham
authored andcommitted
mimalloc: offer a build-time option to enable it
By defining `USE_MIMALLOC`, Git can now be compiled with that nicely-fast and small allocator. Note that we have to disable a couple `DEVELOPER` options to build mimalloc's source code, as it makes heavy use of declarations after statements, among other things that disagree with Git's conventions. We even have to silence some GCC warnings in non-DEVELOPER mode. For example, the `-Wno-array-bounds` flag is needed because in `-O2` builds, trying to call `NtCurrentTeb()` (which `_mi_thread_id()` does on Windows) causes the bogus warning about a system header, likely related to https://sourceforge.net/p/mingw-w64/mailman/message/37674519/ and to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578: C:/git-sdk-64-minimal/mingw64/include/psdk_inc/intrin-impl.h:838:1: error: array subscript 0 is outside array bounds of 'long long unsigned int[0]' [-Werror=array-bounds] 838 | __buildreadseg(__readgsqword, unsigned __int64, "gs", "q") | ^~~~~~~~~~~~~~ Also: The `mimalloc` library uses C11-style atomics, therefore we must require that standard when compiling with GCC if we want to use `mimalloc` (instead of requiring "only" C99). This is what we do in the CMake definition already, therefore this commit does not need to touch `contrib/buildsystems/`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 3c9efc4 commit 554b9ca

File tree

4 files changed

+48
-1
lines changed

4 files changed

+48
-1
lines changed

Makefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2053,6 +2053,41 @@ ifdef USE_NED_ALLOCATOR
20532053
OVERRIDE_STRDUP = YesPlease
20542054
endif
20552055

2056+
ifdef USE_MIMALLOC
2057+
MIMALLOC_OBJS = \
2058+
compat/mimalloc/alloc-aligned.o \
2059+
compat/mimalloc/alloc.o \
2060+
compat/mimalloc/arena.o \
2061+
compat/mimalloc/bitmap.o \
2062+
compat/mimalloc/heap.o \
2063+
compat/mimalloc/init.o \
2064+
compat/mimalloc/options.o \
2065+
compat/mimalloc/os.o \
2066+
compat/mimalloc/page.o \
2067+
compat/mimalloc/random.o \
2068+
compat/mimalloc/segment.o \
2069+
compat/mimalloc/segment-cache.o \
2070+
compat/mimalloc/stats.o
2071+
2072+
COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2073+
COMPAT_OBJS += $(MIMALLOC_OBJS)
2074+
2075+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
2076+
2077+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2078+
-Wno-attributes \
2079+
-Wno-unknown-pragmas \
2080+
-Wno-array-bounds
2081+
2082+
ifdef DEVELOPER
2083+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2084+
-Wno-pedantic \
2085+
-Wno-declaration-after-statement \
2086+
-Wno-old-style-definition \
2087+
-Wno-missing-prototypes
2088+
endif
2089+
endif
2090+
20562091
ifdef OVERRIDE_STRDUP
20572092
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
20582093
COMPAT_OBJS += compat/strdup.o

config.mak.dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ endif
2222

2323
ifneq ($(uname_S),FreeBSD)
2424
ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
25+
ifndef USE_MIMALLOC
2526
DEVELOPER_CFLAGS += -std=gnu99
2627
endif
28+
endif
2729
else
2830
# FreeBSD cannot limit to C99 because its system headers unconditionally
2931
# rely on C11 features.

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ endif
481481
CC = compat/vcbuild/scripts/clink.pl
482482
AR = compat/vcbuild/scripts/lib.pl
483483
CFLAGS =
484-
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
484+
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -MP -std:c11
485485
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
486486
compat/win32/flush.o \
487487
compat/win32/path-utils.o \

git-compat-util.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,16 @@ char *gitdirname(char *);
406406
# include <sys/sysinfo.h>
407407
#endif
408408

409+
#ifdef USE_MIMALLOC
410+
#include "mimalloc.h"
411+
#define malloc mi_malloc
412+
#define calloc mi_calloc
413+
#define realloc mi_realloc
414+
#define free mi_free
415+
#define strdup mi_strdup
416+
#define strndup mi_strndup
417+
#endif
418+
409419
/* On most systems <netdb.h> would have given us this, but
410420
* not on some systems (e.g. z/OS).
411421
*/

0 commit comments

Comments
 (0)