Commit graph

3224 commits

Author SHA1 Message Date
Daan
891f9f4cf6 fix conflict marker (issue #1038) 2025-03-19 20:38:19 -07:00
Daan
e112300059 Merge branch 'master' of https://github.com/microsoft/mimalloc 2025-03-06 20:59:26 -08:00
Daan
a62932135a merge from dev2: v2.2.2 2025-03-06 20:59:12 -08:00
Daan
f81bf1b31a Merge branch 'dev' into dev2 2025-03-06 20:56:33 -08:00
Daan
21f6edf9c6 update readme 2025-03-06 20:54:44 -08:00
Daan
2697d55fa5 Merge branch 'dev' into dev2 2025-03-06 20:41:05 -08:00
Daan
783c3ba486 improve QNX support 2025-03-06 20:40:52 -08:00
Daan
97d440b51d
Merge pull request #1019 from tkielan/dev
support building for QNX
2025-03-06 20:35:11 -08:00
Daan
26aade92cf merge from dev 2025-03-06 20:15:32 -08:00
Daan
9eac969ea5 improve atomic stat merging 2025-03-06 20:14:33 -08:00
Daan
a085c30555 update readme 2025-03-06 19:59:37 -08:00
Daan
bd4ee09dc6 Merge branch 'dev' into dev2 2025-03-06 19:52:19 -08:00
Daan
71c61c4b91 fix multi-threaded access in stats merging 2025-03-06 19:52:06 -08:00
Daan
0f60b12769 prepare readme for new release 2025-03-06 19:40:40 -08:00
Daan
a3bbb32ab1 Merge branch 'dev' into dev2 2025-03-06 19:21:45 -08:00
Daan
e1fde6b5ce update vcpkg file 2025-03-06 19:21:30 -08:00
Daan
ddff485628 Merge branch 'dev' into dev2 2025-03-06 19:11:32 -08:00
Daan
7d6304347e revert back to _WIN32_WINNT=x0600 as we dynamically check for GetPhysicalInstalledMemory now (issue #976) 2025-03-06 19:09:51 -08:00
daanx
5bed67cda9 Merge branch 'dev' into dev2 2025-03-05 16:09:43 -08:00
daanx
8f40bed086 fix erms detection 2025-03-05 15:48:57 -08:00
Daan Leijen
3e69b5323a Merge branch 'dev' into dev2 2025-03-05 15:37:54 -08:00
Daan Leijen
5c6ab532d9 make MI_OPT_ARCH by default OFF except for arm64 where we assume v8.1-a for fast atomics 2025-03-05 15:37:37 -08:00
Daan
2b9385911b Merge branch 'dev' into dev2 2025-03-05 09:59:45 -08:00
Daan
438903421a fix verbosity condition for printing options 2025-03-05 09:57:51 -08:00
Daan
346a5cb3ee Merge branch 'dev' into dev2 2025-03-05 09:56:17 -08:00
Daan
db831d4cf4 make mi_options_print, mi_arenas_print, and mi_stats_print independent of the vebosity setting 2025-03-03 16:23:28 -08:00
Daan
a7a3d317ef Merge branch 'dev' into dev2 2025-03-02 17:41:30 -08:00
Daan
b54a7d836c fix compilation error with MI_GUARDED 2025-03-02 17:41:13 -08:00
Daan Leijen
a24d71f374 fix compile warning 2025-03-02 17:10:24 -08:00
Daan Leijen
2d81b6fee9 Merge branch 'dev' into dev2 2025-03-02 17:06:35 -08:00
Daan Leijen
58d13f6a4f collect every N generic calls 2025-03-02 17:06:25 -08:00
Daan Leijen
4f1edad4fe add arena_purges stat 2025-03-02 16:36:16 -08:00
Daan Leijen
fcc2b561e9 merge new statistics from dev 2025-03-02 15:52:52 -08:00
Daan Leijen
c910750bbe fix mi_stat_get_json signature 2025-03-02 15:39:08 -08:00
Daan Leijen
b319156c4f fix test stress 2025-03-02 15:35:35 -08:00
Daan Leijen
5b685ef183 fix test stress 2025-03-02 15:35:12 -08:00
Daan Leijen
09ad6d2819 initial statistics api 2025-03-02 15:34:37 -08:00
Daan Leijen
1b749ea7d8 clean up statistics 2025-03-01 20:51:44 -08:00
Daan Leijen
cd6737a1ee merge from dev 2025-03-01 19:58:44 -08:00
Daan Leijen
bc5f636c5e nicer stats 2025-03-01 19:46:01 -08:00
daanx
4d727ee6e6 avoid pthread allocation size in mstress bench 2025-03-01 18:30:24 -08:00
Daan Leijen
18174400b2 fix stats_add condition 2025-03-01 18:04:34 -08:00
Daan Leijen
7758bb1067 merge from dev 2025-03-01 16:58:57 -08:00
Daan Leijen
56aba086ea remove superfluous stat fields (count and freed) 2025-03-01 16:52:48 -08:00
Daan Leijen
2e52ef2f69 Merge branch 'dev' into dev2 2025-03-01 16:29:45 -08:00
Daan Leijen
bdaeb1d469 remove stat_adjust 2025-03-01 16:29:28 -08:00
Daan Leijen
113800d1f0 remove status message 2025-03-01 14:52:37 -08:00
Daan Leijen
b0b9d9c22b add note that git rev dependency doesnt work 2025-03-01 14:51:27 -08:00
Daan Leijen
c2ae1c3539 fix git rev dependency in cmake configure 2025-03-01 14:31:24 -08:00
Daan Leijen
527cd05fec add git hash to compile defines 2025-03-01 14:29:23 -08:00