Skip to content

Commit 73bb991

Browse files
committed
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 5d9ba62 commit 73bb991

File tree

4 files changed

+50
-1
lines changed

4 files changed

+50
-1
lines changed

Makefile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,6 +2120,43 @@ ifdef USE_NED_ALLOCATOR
21202120
OVERRIDE_STRDUP = YesPlease
21212121
endif
21222122

2123+
ifdef USE_MIMALLOC
2124+
MIMALLOC_OBJS = \
2125+
compat/mimalloc/alloc-aligned.o \
2126+
compat/mimalloc/alloc.o \
2127+
compat/mimalloc/arena.o \
2128+
compat/mimalloc/bitmap.o \
2129+
compat/mimalloc/heap.o \
2130+
compat/mimalloc/init.o \
2131+
compat/mimalloc/options.o \
2132+
compat/mimalloc/os.o \
2133+
compat/mimalloc/page.o \
2134+
compat/mimalloc/random.o \
2135+
compat/mimalloc/prim/windows/prim.o \
2136+
compat/mimalloc/segment.o \
2137+
compat/mimalloc/segment-cache.o \
2138+
compat/mimalloc/segment-map.o \
2139+
compat/mimalloc/stats.o
2140+
2141+
COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2142+
COMPAT_OBJS += $(MIMALLOC_OBJS)
2143+
2144+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
2145+
2146+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2147+
-Wno-attributes \
2148+
-Wno-unknown-pragmas \
2149+
-Wno-array-bounds
2150+
2151+
ifdef DEVELOPER
2152+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2153+
-Wno-pedantic \
2154+
-Wno-declaration-after-statement \
2155+
-Wno-old-style-definition \
2156+
-Wno-missing-prototypes
2157+
endif
2158+
endif
2159+
21232160
ifdef OVERRIDE_STRDUP
21242161
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
21252162
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
@@ -494,7 +494,7 @@ endif
494494
CC = compat/vcbuild/scripts/clink.pl
495495
AR = compat/vcbuild/scripts/lib.pl
496496
CFLAGS =
497-
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
497+
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
498498
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
499499
compat/win32/flush.o \
500500
compat/win32/path-utils.o \

git-compat-util.h

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

436+
#ifdef USE_MIMALLOC
437+
#include "mimalloc.h"
438+
#define malloc mi_malloc
439+
#define calloc mi_calloc
440+
#define realloc mi_realloc
441+
#define free mi_free
442+
#define strdup mi_strdup
443+
#define strndup mi_strndup
444+
#endif
445+
436446
/* On most systems <netdb.h> would have given us this, but
437447
* not on some systems (e.g. z/OS).
438448
*/

0 commit comments

Comments
 (0)