Skip to content

Commit d5cdcbd

Browse files
dschoGit for Windows Build Agent
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 a4f8119 commit d5cdcbd

File tree

5 files changed

+52
-1
lines changed

5 files changed

+52
-1
lines changed

Makefile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,6 +2149,44 @@ ifdef USE_NED_ALLOCATOR
21492149
OVERRIDE_STRDUP = YesPlease
21502150
endif
21512151

2152+
ifdef USE_MIMALLOC
2153+
MIMALLOC_OBJS = \
2154+
compat/mimalloc/alloc-aligned.o \
2155+
compat/mimalloc/alloc.o \
2156+
compat/mimalloc/arena.o \
2157+
compat/mimalloc/bitmap.o \
2158+
compat/mimalloc/heap.o \
2159+
compat/mimalloc/init.o \
2160+
compat/mimalloc/libc.o \
2161+
compat/mimalloc/options.o \
2162+
compat/mimalloc/os.o \
2163+
compat/mimalloc/page.o \
2164+
compat/mimalloc/random.o \
2165+
compat/mimalloc/prim/prim.o \
2166+
compat/mimalloc/segment.o \
2167+
compat/mimalloc/segment-map.o \
2168+
compat/mimalloc/stats.o
2169+
2170+
COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2171+
COMPAT_OBJS += $(MIMALLOC_OBJS)
2172+
2173+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
2174+
2175+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2176+
-Wno-attributes \
2177+
-Wno-unknown-pragmas \
2178+
-Wno-array-bounds
2179+
2180+
ifdef DEVELOPER
2181+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2182+
-Wno-pedantic \
2183+
-Wno-declaration-after-statement \
2184+
-Wno-old-style-definition \
2185+
-Wno-missing-prototypes \
2186+
-Wno-implicit-function-declaration
2187+
endif
2188+
endif
2189+
21522190
ifdef OVERRIDE_STRDUP
21532191
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
21542192
COMPAT_OBJS += compat/strdup.o

compat/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/zlib-uncompress2.c whitespace=-indent-with-non-tab,-trailing-space
2+
/mimalloc/**/* whitespace=-trailing-space

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
@@ -505,7 +505,7 @@ endif
505505
CC = compat/vcbuild/scripts/clink.pl
506506
AR = compat/vcbuild/scripts/lib.pl
507507
CFLAGS =
508-
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
508+
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
509509
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
510510
compat/win32/flush.o \
511511
compat/win32/path-utils.o \

git-compat-util.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,16 @@ static inline const char *precompose_string_if_needed(const char *in)
231231
# include <sys/sysinfo.h>
232232
#endif
233233

234+
#ifdef USE_MIMALLOC
235+
#include "mimalloc.h"
236+
#define malloc mi_malloc
237+
#define calloc mi_calloc
238+
#define realloc mi_realloc
239+
#define free mi_free
240+
#define strdup mi_strdup
241+
#define strndup mi_strndup
242+
#endif
243+
234244
#ifndef PATH_SEP
235245
#define PATH_SEP ':'
236246
#endif

0 commit comments

Comments
 (0)