From ccf117c43d11bce115c9672d50c370c7d35739a7 Mon Sep 17 00:00:00 2001
From: daan <daan@effp.org>
Date: Wed, 23 Feb 2022 10:04:25 -0800
Subject: [PATCH 1/6] update minject to use mimalloc.dll by default (issue
 #542)

---
 bin/minject.exe   | Bin 20992 -> 20992 bytes
 bin/minject32.exe | Bin 17920 -> 18432 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/minject.exe b/bin/minject.exe
index e5f87800d34eb1e04614a9e642eece2018b6cdf5..625816f1f7774c1f57b70033ea4fbb5e7a14e270 100644
GIT binary patch
delta 8637
zcmeHMdw3Mp*`L|XCL2hyo6ABZ3E98~A_*ZRsJY@UZg5sN7$G2F5V=KCBBW#&gHks%
z8=HN``5HX>mG7(i@KLq+RNL54L279rkOYVnK@m!&h)M?n8ZDRLZNA?-GfN2lzkhX~
z=bYbrJMVeVW!`gUw&@kV=@q`Mc|~^r_lb?+a<-+Z@pJI+v?i>VRUEbc8x=>dKdYj3
z{dr*f3kfRrf1l8}1^n#Rl=T->yx6E=yvElqTS>k*Wh6hxn<Hxdqn5H5K9zr$-OjJ%
z=dtJbanaK_j*EGK<LWnMq>O3;QOH9Q{y90W(Xc6FOmwbqMWYYWH(0!3qM<dN6&qgW
zr*)h(@CJSoI~B1o<u7?0Cy2d*WP5Ka$H~cxqP$~33&r*aR%sf;k727!rTikc%~U_S
zIv2JroxV|mB=EaR$f`@R&16#|ZA;onC;p}2l2;s1Y!{}eUZuGu0<npz@&vWb_lQ3T
z;^A&1de}!+p(sIW(7Xv!zzm(TU$K2MnH*3H|NA7eZDy}VmKy#!nSC1hv$(TpD8KZ*
zqVx$;?0(i5l^-ZCPz3R>Uhyk$XoI7$T>R2oRBQ<rM{=A;**~kO^n(9dMav~iFbfjd
zhEbC1+oVb}+1oK5#rBUJj`NCV&cA_yxx~K<QhiL(Sl?(t?5?q-2O*^K3X(I)T~z45
zA}s6QWrj!y)j8}!fm8txuW24yPCdQcBPy13C+87oT3zBtZgFgd*kjo--%xVQBFQF>
zs}N_gMdoz2D=8)*G<PQn#$Jyx&J&9HPEdM;lJ7VCN)TUkY(oe4NimnGBgHnE+=t$E
zw5#2^9eEzHM+mtcStQ&Ep*q4$c=w7vM_x^vAWrKNdb%)L1mi}mN|(E^bgciHM=W)C
z#4m*w#dmj2pytN-ykeIiexy$LRIC7|D9Q46M0&8(68tkZSZS^$xC7`BH(WFe%6_!>
z_X*-@%kGhi?F^!O2Mf)KgNp4Kn36$D@J(1--ZrA+V5k3t(6fhP5tKa$BhG(KXx?K|
zY=MWeX|a!Z#ZDpnxaIA*)|h-jTE_<u_`k+ZQ{08?c|r2<{;Q&C03CS5fe>$b+a!Z-
zbwvo`aqNOm!N@Ov3+LkV+647<QeU3XwBv%ZR|x4+r4wC8`mcG#pgLt9r8D3)c6vh^
zD~OoR@XQNJr#ii!lKqyScKo0yUU9o)3r&8@QA@DXNKv~Tc8^pa<q=og$=tYC5DyA_
zJ~35@e-Wh8CPCaIye|vV0!7&K4})ODkk1VY#%=-q(c;qnFk5z18fx4n->~0~m=Ktk
zTyWGaF0#7C3Uj$Q!(Jh+R4R=99!!Ks-0v|S@LU^!S8w)(f}=!cAM}*GXKBeqH2wE!
zbJ2>WlN-Jnnv3vY&wr0WxOPU+5F}fR`ivb?Y+0E97A!G?HUmp_-U33L8{-mZ6ncyw
z3MEG@Ehmu_3Xa|{MP#wIk)r~R6mRxH1YkVi4Lz$)Bx0%%uOp(0>~AS3ah_QSc^yuV
z@uPRJ39x;OZm02%Di`-r!l8XD*N>qmVWwF;1Vu$Q6xEI_kMRS+ct|j6eq}FgJmO(F
zffg4TBv%l<Oo+*x`kow5&H1O1G`c+5ksf|#GKv+&j_#AaSRAJ(G**yOv7}gE_F7C<
zV5YUEq|(rEzxH&_vJ1w8qAS%?vTt3a%h(fgrHZbkAudUDB@c1Q>f?-MZr+<^*&!I*
zC3`mf5wjr9OcqzgxQv%VjT=HM8;Ngjtm7@uEXK&)Vr64_%Td4CBgT2fw4?oV$%|V&
z=%##7-g3$koCz~TY;R*v#M=2ZwmCL?_Qw@1S1rL;XsN_!)xF}DVsf(&dz$xJ#ghVN
zo%T=m#~ykx>DN@#CPhps58XH53eEV=qiz2gQbe>XWT1VT$Kv9$0)@yfx<5P?Vz<jU
z*xYRuLRF4JcutxXDosY4k*?-FR-!#6$Jaj7&i5PgG3b5sU5j0hxE8sp7eBJ-;jRjC
zKOVeSCsDS1U%qq|>DY}&Sc*Lhk^C|7U~E`*`H0R8nzO)lfn$G)OUVfiDoVj6%ET^d
zF1AaZBMW&{yrS4<Pr$gbMeKq&D2RvTg@Y`@azB5iqtbF4A5#FWc$o6c?Gu>aYBx-r
zz<y!PjZ(;a!WGtMof!EQ(VwyF))|HcHdYp&Vkot-h4DhvQc~P;nY|uAEAkGa&#>>~
z#{`HJ#AEWG{z(a{ODH+L_VfN23?PSWehsNttaCi-vb^1mnOI3Pq0Ry<7G}aC6Bd2+
zbIzIfkkEWFPY|yQ;`>maB6SVayJ)4P`z9*3&T)8}PI)EM1JF^%4SA~_^99L^iVn=T
z#*>)1mIIbxsru~E^i;Z~dkl*0U|6l#7Kh35g3f}Y!ZKO0y)mAhO&CA<Ui9H5AJQCN
zec&R!B2LykYJh~+@+qQG`%r9E<5_;<#*)`*=tu-DEfnV*v)C`)k5lc*4E0<rOq=WC
zIKR0tZ5Gg1E{Gpua4%pf<h-xg7m2r}zC_D%Opg0XpTUpUo`VG=i*MNYB!NH4>XM$S
zNkas3+W@9Z>{V=E+O-*wVn0^{?v(wcqDhfr6UcOh%1g0j#LU;3He&AAnFh3!r|Zm2
z(o7v-6}CJ1^(<(cVpx#Q{$R_<UYAbe*iShU`A0mV*!rk%>3*d<BAaVk&x6)ZneB`p
zm6tR)9n&C4re+7uu!pd*%R&xTK5AlM=UDY<TwET!>T?#F+F|FPO-H8`I~TSHU6#JU
z&OV^nK1QFroT?wMqY@{aV%rOm<!!g4GH1cIzx&2Cm95tLiCsc%E#;@N3(sFc6U8<f
zrbyIvs?$R~kdYLlx;V-nsD#o}a<AFaav5Sld{410B6}jLL1+OzsRwlSlA<(~oiBr_
zCHPa+O=TYw<Dagb8DuB_2}TrkESldE_175lP}I@52F13bNq>PLRnb$5D_U!sIxW#E
zBZ5(98t2OspqmF3pAQrCD>a_u@|;WT(CCZ+2e+bGu?@gP3wRcm&r9p`k=%fA`V`yW
zpd*{U8#W7vY#z{TcIr0URGV&ebS`XjOwJ~op`Q?{cBsk5DzH__ae<8&?RXTLuk+qz
zpLoR!F3Zb31xk6r)q+c&=I?mRe_ergHwsd8^%btEWU}Ad^c26&KceX=117TzD!M+S
zKgv|cVztBc4T#A$2DUZ+NV4^n794<O2P`e=n9YchxCs?M;2xp)6NKjLX8)ybQ)Vg0
z@#mk=8{dw`>-`DT*dNnvGONmkH+inpJx@?QFNNnC_Rwu(3%YPS=g*JUEh*mGaJ*k*
zB#0tYk9VXV?<uzJwn>4jc#?*$gW(V<!Z<`2<-g?G!Jq#nJh*lmG(UZ4fpIIgo>X=D
zBL!)dq5mn@&S*{F9@hU_(<7GXGE2)mgyxkRM)W`E+8L!;9v;U9G*>^lVHyR~BACLd
zxql+&(-ORw*cQdol1qg6ZNIhK^j0y3+aJ|!dW{G{>GqUdwmfUaHKshM_~Nl0#$mYf
zPcA6R`CZf-+6Uv%zNyTQ7Mw2@?=JGo*8<S1qkD&g68U*MBEjiKnc1$`x>LY~Rc{Sb
z9fJxdwy)6DG<~u!<%ZQShFQIN!-47%o-4#|#rEG2tAc<W(~smyFFu!ixYoQUe}|Ci
zVk{n`2*0=vPI}Qn8@8a+BR-5*fK`PavBBvPKfQ4{QzG(aV7y<Rr%Wov{*0KjDg!@K
z?3ctJ9pZNozZZM~S^sDvxId8AIR^)sUA?}^g(Dz+%!Eg=SFR@d0isXHO{^j%$Dl;B
zr&3ZgPhrtzI}~yXRbND?=80q;2|=*aXOg?vyD1)i4~tAKoPF>v^}(|Q$Me`c2mJT-
zm^vT=LtC_T3_)xfK+b|^T>eJvRG>S5QZxAWHr3!WfXu_7$K+>isZPF$y`P#<*lUJZ
zLWMho{JM(C@-Km2yf%r)M6>(~?#LK|OABqTGkDc+l3UoMwDJ67Y*yOj=+Ch=+wf2)
zvS6As*Lx@O<rnHrD60#XqHF4DPg8`qk-MO5Iq*jc-Qw<QHBDq+rxhD6-obLmrp`Kk
z2SRCvGhB777}9Ct8&uwxo8Q@AP-9tRT9AxTn|qaiS^}n5VIYJ|zXcFW2zCdc+q98w
z9y>81`a?zWHww#QOF>|=u7AMZAG;~>xA-!E`-%PGE^YCe%6`TC={adnLynDg(jO(~
zM<Q=qXh%u0D<PIs*zWY{hRX%)hxF9!(}{2(mM06Lax3yOIPAWuM1P>sQiWaPgRI<M
zZ2fTo*;hLR;o1>|xRCwaZlC`;36;zrp+#R`JKxo}7X*&d|AV{>6P6`kJBz5B%?|k-
zy%08=4G21`tFNH5$aE$jQ}}!*cCqPyRC~!3B5cmAWl<U94d)VAPDVy%EH;-QRp7R?
zK7m4bNme(-3nxe}9>RS{u|3AtW;pp=){!xlU&lVr$S|CZXXbI~F(>1xF<ws;+iq4c
z?hd|_)sCCX&tQKZckkT-QkxJ;7R1G7d4@*I2Z4Qk>d`^BJG&sI{f3S*sq7U%e}W(y
z>E$F+vBj|R@s8wxrfj@Ld4z2o-(dK33cEVK*j9;eFRtcZ-W@WPgY1uTi>6Xm?#R!L
z2HRtL0G~N%Ke<D(UXYeu|46blZ_)&JLGVW`Bo|7{W3M_U=Ncer?lt$AzQUWZkrbvc
zLAkDW*?oo0z4ji{39#7dP#n*FE;BW-1H3bo_9j4m?<(jN=(7P9!n(K%TbtHmCzO^K
zI*IL5G7~J=M41t4eKn3~S*<UqlIPWWwOY?t>*v%usMe3D^`mONl<K9Ke^Z$s)Vf}+
z*Q&Kot=Fk_qgsEXcJrB9cdL>nwf?DEYaKkJ$yJ*fYCVnd6I^^k$2}7yJ}}`C3?080
zb!^x1ppK_?{94C49pe^j?VLKFqx180{uvzwU9MT<NYVMh1*#;#&0nagigk487^9;>
z#~<C|sPtj2UA~SV=yu_b+I0RIUEf<B)@b;9l@AOFf3F*cC0ljgpf_~rn5Sc#u0Nw=
zw~kf1eyNW2IzFjmFwB!Z_5X<8(5FW%>jn{vv{39i=IS_I*M|e$ptt)*#}m4KrjBcM
z|0}}*>iEB~SI0j|7i`rXY}awOj;D1DcX&?cdvzSpF-i9`R>%8v4C?x)Z&||2Iowny
zJ;@+ctjyQ2{uT^(?8xGr?5#VKVyY)<hDn-W8XK6D%m${|kny;Z$7>&7QdhTT8EAaU
z>4?hS$al2mJZfagdByJfH4VO++D6@@Z{-U6<jK0Mth9c*eNDZucFk)0ipKgC%X|&?
zC3anDU$XWw|KlrG`*3KpS$X@d)HK|aeR*A7$E2x0=L2@_H{7ScVTGN1FS*&DZ;ky{
z7bEo6!(m14W4U&6G30d3x)p2J)-GRRhm*S6)vN4J)cRIZGzsd!Cx`X9h>PvafAL>~
zT~)Brzy|K9TtuJIX)=(<xj87w526&2gyX`x7|=;5b<ow_qQf<r3!-robWOMD;x=U@
zvi3XcV;W~@%hd|R`q`N4u6pBx+FHgp>B=@8H?xy>O=MPM-gAXHyopUNe0YI#9LK5O
z>>ZD<Mt__WM<MPNH)M{yJZ{}E85Y<{U;ANGyL^dni33*z@H03ri`wPoEvtEq<F>F*
z3KKK8L5k}SmwV6bD#!eLTrSY<!(|IO<|<00Q-bScQ;QPIdWY#fu6v+4GF+x^`V+%s
zmE@W`!!{Nr7R$plRjOtHGAk^!NUF5QhFl|W=dPu3fPRo2E*c%cbPpK9Qpb}|KDm4;
z2E>`G^s%h<EpvF(p>Wn=vW2SG<eOzxnw@=^OtZ^^>{;rkQR{vCJdWFrev0&I#iVoG
z%7?ILfVvEq66^)YZkqmSB%_?)#$GBu5f85!5Y)$W-18{&tJpIo6T{LokSHjvRcv?3
z^y!sjaB8Gr+NhD)z?t_Ysr)9$F6)j+e=|SSh835N3(#xyy<_pAelGQkwZ0s|ai3v1
z_hD;Sjo^msG2DNVVYY|)(A(c)$ES?sQkExkDOIDnlxd^56h47V8c4`IW39)PB|Vl)
zU!KFIS7meQ(<X80yn{;~7<DG;NJ1y+*>|PM6-`sMN3j;$boK3=x~mDdqHMp3=OYbV
zWWJ#?I)djS#$meAj>nAlPr_Xs->sj=!uZ*evU>s~r61t{7A5>!ihWS;<hafA!xD}w
z#tD<`!lQ$Q3jeAh>x8WRCfNqa@@8P&Zfg57WG9^X$L%KB?nT_)+)fBvZxVh6Lo*yU
z-Xx2_ZDA00v}?k@YC0{P_`B{uca-pyaR0fZ{JZZcPOgFVJ3}KSuEDo<^|B?t#SN^%
zRW!0q<LlQiZs_<8zWT7&-Q(CY_sot%?pVX`g=j+nsp(N9^H)&{LAL`<$ZBrTR^S?x
zO3*_&P|JlMK>jG?gnvb81U-}ywanO;09(ijKSyZ?JpkO8h-Vda8!#|y49E3?8OnuP
z9u4P7!eAPnMI=SSzoVprCcKD}1N!EqM+x-9bi5QnPWWRxGCyd-jVP_4316f#7dJ~H
zx>4SMg76p$H6T2r%L(a|<UYs;fVkLkXFwAsAP3TDaLMCv^W!+2J%nXC?F7DyoM?ue
z@GuJ5905j83TR9W65?DGax@?KsZM_e+(3V@q5<I+6tW>apwoT8Nc>|<ax*X;g*vbU
z`%vmZ(-kuXh2&14m<xZPpRWaR4uuqhz&TTJl7g-Rw&^rspH34#J{9>GHn<0Kvr)Ez
z#$8xF1=>N=9fvZz6Exu)C@bf6Ocl299dWa+^0{{O*SNK5YwOmwt(&)Q+uFIcck7AY
d4g7BKcTiMnx45P)o40J)vTaNI7BoD}|38+mq|*QZ

delta 8363
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

diff --git a/bin/minject32.exe b/bin/minject32.exe
index d0181028259e768db2eb6a706c2ed6d4ecba34ee..6857ad0ce1ccd014ed02c99d2c13feb5783fddb9 100644
GIT binary patch
delta 6984
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
Ov?E%Qf^Wp_%zp#Ta=ym^

delta 6598
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


From 73012bf654cfa23be6ef3c00648e203480b065ab Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Sat, 2 Apr 2022 09:29:09 -0700
Subject: [PATCH 2/6] add thread id to trace, warning, and error messages

---
 src/options.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/options.c b/src/options.c
index c4ed91cb..4a433353 100644
--- a/src/options.c
+++ b/src/options.c
@@ -322,11 +322,22 @@ void _mi_fprintf( mi_output_fun* out, void* arg, const char* fmt, ... ) {
   va_end(args);
 }
 
+static void mi_vfprintf_thread(mi_output_fun* out, void* arg, const char* prefix, const char* fmt, va_list args) {
+  if (prefix != NULL && strlen(prefix) <= 32 && !_mi_is_main_thread()) {
+    char tprefix[64];
+    snprintf(tprefix, sizeof(tprefix), "%sthread 0x%zx: ", prefix, _mi_thread_id());
+    mi_vfprintf(out, arg, tprefix, fmt, args);
+  }
+  else {
+    mi_vfprintf(out, arg, prefix, fmt, args);
+  }
+}
+
 void _mi_trace_message(const char* fmt, ...) {
   if (mi_option_get(mi_option_verbose) <= 1) return;  // only with verbose level 2 or higher
   va_list args;
   va_start(args, fmt);
-  mi_vfprintf(NULL, NULL, "mimalloc: ", fmt, args);
+  mi_vfprintf_thread(NULL, NULL, "mimalloc: ", fmt, args);
   va_end(args);
 }
 
@@ -341,7 +352,7 @@ void _mi_verbose_message(const char* fmt, ...) {
 static void mi_show_error_message(const char* fmt, va_list args) {
   if (!mi_option_is_enabled(mi_option_show_errors) && !mi_option_is_enabled(mi_option_verbose)) return;
   if (mi_atomic_increment_acq_rel(&error_count) > mi_max_error_count) return;
-  mi_vfprintf(NULL, NULL, "mimalloc: error: ", fmt, args);
+  mi_vfprintf_thread(NULL, NULL, "mimalloc: error: ", fmt, args);
 }
 
 void _mi_warning_message(const char* fmt, ...) {
@@ -349,7 +360,7 @@ void _mi_warning_message(const char* fmt, ...) {
   if (mi_atomic_increment_acq_rel(&warning_count) > mi_max_warning_count) return;
   va_list args;
   va_start(args,fmt);
-  mi_vfprintf(NULL, NULL, "mimalloc: warning: ", fmt, args);
+  mi_vfprintf_thread(NULL, NULL, "mimalloc: warning: ", fmt, args);
   va_end(args);
 }
 

From b2598e7ee44899cdef53c772698ddeed92c5aea5 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Sat, 2 Apr 2022 09:46:25 -0700
Subject: [PATCH 3/6] allow setting MIMALLOC_MAX_ERRORS/WARNINGS to -1 to get
 unlimited error/warning messages

---
 src/options.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/options.c b/src/options.c
index 4a433353..5c388ea2 100644
--- a/src/options.c
+++ b/src/options.c
@@ -19,8 +19,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #endif
 
 
-static size_t mi_max_error_count   = 16; // stop outputting errors after this
-static size_t mi_max_warning_count = 16; // stop outputting warnings after this
+static long mi_max_error_count   = 16; // stop outputting errors after this (use < 0 for no limit)
+static long mi_max_warning_count = 16; // stop outputting warnings after this (use < 0 for no limit)
 
 static void mi_add_stderr_output(void);
 
@@ -351,13 +351,13 @@ void _mi_verbose_message(const char* fmt, ...) {
 
 static void mi_show_error_message(const char* fmt, va_list args) {
   if (!mi_option_is_enabled(mi_option_show_errors) && !mi_option_is_enabled(mi_option_verbose)) return;
-  if (mi_atomic_increment_acq_rel(&error_count) > mi_max_error_count) return;
+  if (mi_max_error_count >= 0 && (long)mi_atomic_increment_acq_rel(&error_count) > mi_max_error_count) return;
   mi_vfprintf_thread(NULL, NULL, "mimalloc: error: ", fmt, args);
 }
 
 void _mi_warning_message(const char* fmt, ...) {
   if (!mi_option_is_enabled(mi_option_show_errors) && !mi_option_is_enabled(mi_option_verbose)) return;
-  if (mi_atomic_increment_acq_rel(&warning_count) > mi_max_warning_count) return;
+  if (mi_max_warning_count >= 0 && (long)mi_atomic_increment_acq_rel(&warning_count) > mi_max_warning_count) return;
   va_list args;
   va_start(args,fmt);
   mi_vfprintf_thread(NULL, NULL, "mimalloc: warning: ", fmt, args);

From 3fa53244c29048fd3b934be7505b4b73475dc6eb Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Sat, 2 Apr 2022 10:11:36 -0700
Subject: [PATCH 4/6] add better warning messages if aligning or freeing OS
 memory fails

---
 src/os.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/os.c b/src/os.c
index 757e8cab..288cbae4 100644
--- a/src/os.c
+++ b/src/os.c
@@ -295,20 +295,20 @@ static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats
   bool err = false;
 #if defined(_WIN32)
   err = (VirtualFree(addr, 0, MEM_RELEASE) == 0);
+  if (err) {
+    _mi_warning_message("unable to release OS memory: error code 0x%x, addr: %p, size: %zu\n", GetLastError(), addr, size);
+  }
 #elif defined(MI_USE_SBRK) || defined(__wasi__)
-  err = 0; // sbrk heap cannot be shrunk
+  err = false; // sbrk heap cannot be shrunk
 #else
   err = (munmap(addr, size) == -1);
-#endif
-  if (was_committed) _mi_stat_decrease(&stats->committed, size);
-  _mi_stat_decrease(&stats->reserved, size);
   if (err) {
-    _mi_warning_message("munmap failed: %s, addr 0x%8li, size %lu\n", strerror(errno), (size_t)addr, size);
-    return false;
-  }
-  else {
-    return true;
+    _mi_warning_message("unable to release OS memory: %s, addr: %p, size: %zu\n", strerror(errno), addr, size);
   }
+#endif
+  if (was_committed) { _mi_stat_decrease(&stats->committed, size); }
+  _mi_stat_decrease(&stats->reserved, size);
+  return !err;  
 }
 
 #if !(defined(__wasi__) || defined(MI_USE_SBRK) || defined(MAP_ALIGNED))
@@ -336,7 +336,7 @@ static void* mi_win_virtual_allocx(void* addr, size_t size, size_t try_alignment
         return NULL;
       }
       */
-      _mi_warning_message("unable to allocate hinted aligned OS memory (%zu bytes, error code: %x, address: %p, alignment: %d, flags: %x)\n", size, GetLastError(), hint, try_alignment, flags);
+      _mi_warning_message("unable to allocate hinted aligned OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %d, flags: 0x%x)\n", size, GetLastError(), hint, try_alignment, flags);
     }
   } 
 #endif
@@ -350,7 +350,7 @@ static void* mi_win_virtual_allocx(void* addr, size_t size, size_t try_alignment
     param.Pointer = &reqs;
     void* p = (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, &param, 1);
     if (p != NULL) return p;
-    _mi_warning_message("unable to allocate aligned OS memory (%zu bytes, error code: %x, address: %p, alignment: %d, flags: %x)\n", size, GetLastError(), addr, try_alignment, flags);
+    _mi_warning_message("unable to allocate aligned OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %d, flags: 0x%x)\n", size, GetLastError(), addr, try_alignment, flags);
     // fall through on error
   }
 #endif
@@ -362,6 +362,7 @@ static void* mi_win_virtual_alloc(void* addr, size_t size, size_t try_alignment,
   mi_assert_internal(!(large_only && !allow_large));
   static _Atomic(size_t) large_page_try_ok; // = 0;
   void* p = NULL;
+  // Try to allocate large OS pages (2MiB) if allowed or required.
   if ((large_only || use_large_os_page(size, try_alignment))
       && allow_large && (flags&MEM_COMMIT)!=0 && (flags&MEM_RESERVE)!=0) {
     size_t try_ok = mi_atomic_load_acquire(&large_page_try_ok);
@@ -381,12 +382,13 @@ static void* mi_win_virtual_alloc(void* addr, size_t size, size_t try_alignment,
       }
     }
   }
+  // Fall back to regular page allocation
   if (p == NULL) {
     *is_large = ((flags&MEM_LARGE_PAGES) != 0);
     p = mi_win_virtual_allocx(addr, size, try_alignment, flags);
   }
   if (p == NULL) {
-    _mi_warning_message("unable to allocate OS memory (%zu bytes, error code: %i, address: %p, large only: %d, allow large: %d)\n", size, GetLastError(), addr, large_only, allow_large);
+    _mi_warning_message("unable to allocate OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %d, flags: 0x%x, large only: %d, allow large: %d)\n", size, GetLastError(), addr, try_alignment, flags, large_only, allow_large);
   }
   return p;
 }
@@ -695,7 +697,7 @@ static void* mi_os_mem_alloc(size_t size, size_t try_alignment, bool commit, boo
 
   #if defined(_WIN32)
     int flags = MEM_RESERVE;
-    if (commit) flags |= MEM_COMMIT;
+    if (commit) { flags |= MEM_COMMIT; }
     p = mi_win_virtual_alloc(NULL, size, try_alignment, flags, false, allow_large, is_large);
   #elif defined(MI_USE_SBRK) || defined(__wasi__)
     MI_UNUSED(allow_large);
@@ -729,9 +731,10 @@ static void* mi_os_mem_alloc_aligned(size_t size, size_t alignment, bool commit,
 
   // if not aligned, free it, overallocate, and unmap around it
   if (((uintptr_t)p % alignment != 0)) {
+    _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (%zu bytes, address: %p, commit: %d, is_large: %d)\n", size, p, commit, *is_large);
     mi_os_mem_free(p, size, commit, stats);
     if (size >= (SIZE_MAX - alignment)) return NULL; // overflow
-    size_t over_size = size + alignment;
+    const size_t over_size = size + alignment;
 
 #if _WIN32
     // over-allocate and than re-allocate exactly at an aligned address in there.

From d1db0ffb72d9e89e3d3c31b9115129c91dc7ced5 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Sat, 2 Apr 2022 11:26:56 -0700
Subject: [PATCH 5/6] when MIMALLOC_VERBOSE is set, the all errors/warnings are
 shown

---
 src/options.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/options.c b/src/options.c
index 5c388ea2..2022d964 100644
--- a/src/options.c
+++ b/src/options.c
@@ -350,14 +350,18 @@ void _mi_verbose_message(const char* fmt, ...) {
 }
 
 static void mi_show_error_message(const char* fmt, va_list args) {
-  if (!mi_option_is_enabled(mi_option_show_errors) && !mi_option_is_enabled(mi_option_verbose)) return;
-  if (mi_max_error_count >= 0 && (long)mi_atomic_increment_acq_rel(&error_count) > mi_max_error_count) return;
+  if (!mi_option_is_enabled(mi_option_verbose)) {
+    if (!mi_option_is_enabled(mi_option_show_errors)) return;
+    if (mi_max_error_count >= 0 && (long)mi_atomic_increment_acq_rel(&error_count) > mi_max_error_count) return;
+  }
   mi_vfprintf_thread(NULL, NULL, "mimalloc: error: ", fmt, args);
 }
 
 void _mi_warning_message(const char* fmt, ...) {
-  if (!mi_option_is_enabled(mi_option_show_errors) && !mi_option_is_enabled(mi_option_verbose)) return;
-  if (mi_max_warning_count >= 0 && (long)mi_atomic_increment_acq_rel(&warning_count) > mi_max_warning_count) return;
+  if (!mi_option_is_enabled(mi_option_verbose)) {
+    if (!mi_option_is_enabled(mi_option_show_errors)) return;
+    if (mi_max_warning_count >= 0 && (long)mi_atomic_increment_acq_rel(&warning_count) > mi_max_warning_count) return;
+  }
   va_list args;
   va_start(args,fmt);
   mi_vfprintf_thread(NULL, NULL, "mimalloc: warning: ", fmt, args);

From 72ab945e285e41427222ef4c3cc82ac1ba5ffb84 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Sat, 2 Apr 2022 11:38:07 -0700
Subject: [PATCH 6/6] improve fallback code for aligned allocation on Windows

---
 src/os.c | 68 ++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/os.c b/src/os.c
index 288cbae4..bedf44cf 100644
--- a/src/os.c
+++ b/src/os.c
@@ -67,7 +67,8 @@ terms of the MIT license. A copy of the license can be found in the file
   On windows initializes support for aligned allocation and
   large OS pages (if MIMALLOC_LARGE_OS_PAGES is true).
 ----------------------------------------------------------- */
-bool    _mi_os_decommit(void* addr, size_t size, mi_stats_t* stats);
+bool _mi_os_decommit(void* addr, size_t size, mi_stats_t* stats);
+bool _mi_os_commit(void* addr, size_t size, bool* is_zero, mi_stats_t* tld_stats);
 
 static void* mi_align_up_ptr(void* p, size_t alignment) {
   return (void*)_mi_align_up((uintptr_t)p, alignment);
@@ -294,9 +295,23 @@ static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats
   if (addr == NULL || size == 0) return true; // || _mi_os_is_huge_reserved(addr)
   bool err = false;
 #if defined(_WIN32)
+  DWORD errcode = 0;
   err = (VirtualFree(addr, 0, MEM_RELEASE) == 0);
-  if (err) {
-    _mi_warning_message("unable to release OS memory: error code 0x%x, addr: %p, size: %zu\n", GetLastError(), addr, size);
+  if (err) { errcode = GetLastError(); }
+  if (errcode == ERROR_INVALID_ADDRESS) {
+    // In mi_os_mem_alloc_aligned the fallback path may have returned a pointer inside
+    // the memory region returned by VirtualAlloc; in that case we need to free using
+    // the start of the region.
+    MEMORY_BASIC_INFORMATION info = { 0, 0 };
+    VirtualQuery(addr, &info, sizeof(info));
+    if (info.AllocationBase < addr) {
+      errcode = 0;
+      err = (VirtualFree(info.AllocationBase, 0, MEM_RELEASE) == 0);
+      if (err) { errcode = GetLastError(); }
+    }
+  }
+  if (errcode != 0) {
+    _mi_warning_message("unable to release OS memory: error code 0x%x, addr: %p, size: %zu\n", errcode, addr, size);
   }
 #elif defined(MI_USE_SBRK) || defined(__wasi__)
   err = false; // sbrk heap cannot be shrunk
@@ -728,46 +743,27 @@ static void* mi_os_mem_alloc_aligned(size_t size, size_t alignment, bool commit,
   // try first with a hint (this will be aligned directly on Win 10+ or BSD)
   void* p = mi_os_mem_alloc(size, alignment, commit, allow_large, is_large, stats);
   if (p == NULL) return NULL;
-
+  
   // if not aligned, free it, overallocate, and unmap around it
   if (((uintptr_t)p % alignment != 0)) {
-    _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (%zu bytes, address: %p, commit: %d, is_large: %d)\n", size, p, commit, *is_large);
     mi_os_mem_free(p, size, commit, stats);
+    _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (%zu bytes, address: %p, commit: %d, is_large: %d)\n", size, p, commit, *is_large);
     if (size >= (SIZE_MAX - alignment)) return NULL; // overflow
     const size_t over_size = size + alignment;
 
 #if _WIN32
-    // over-allocate and than re-allocate exactly at an aligned address in there.
-    // this may fail due to threads allocating at the same time so we
-    // retry this at most 3 times before giving up.
-    // (we can not decommit around the overallocation on Windows, because we can only
-    //  free the original pointer, not one pointing inside the area)
-    int flags = MEM_RESERVE;
-    if (commit) flags |= MEM_COMMIT;
-    for (int tries = 0; tries < 3; tries++) {
-      // over-allocate to determine a virtual memory range
-      p = mi_os_mem_alloc(over_size, alignment, commit, false, is_large, stats);
-      if (p == NULL) return NULL; // error
-      if (((uintptr_t)p % alignment) == 0) {
-        // if p happens to be aligned, just decommit the left-over area
-        _mi_os_decommit((uint8_t*)p + size, over_size - size, stats);
-        break;
-      }
-      else {
-        // otherwise free and allocate at an aligned address in there
-        mi_os_mem_free(p, over_size, commit, stats);
-        void* aligned_p = mi_align_up_ptr(p, alignment);
-        p = mi_win_virtual_alloc(aligned_p, size, alignment, flags, false, allow_large, is_large);
-        if (p != NULL) {
-          _mi_stat_increase(&stats->reserved, size);
-          if (commit) { _mi_stat_increase(&stats->committed, size); }
-        }
-        if (p == aligned_p) break; // success!
-        if (p != NULL) { // should not happen?
-          mi_os_mem_free(p, size, commit, stats);
-          p = NULL;
-        }
-      }
+    // over-allocate uncommitted (virtual) memory
+    p = mi_os_mem_alloc(over_size, 0 /*alignment*/, false /* commit? */, false /* allow_large */, is_large, stats);
+    if (p == NULL) return NULL;
+    
+    // set p to the aligned part in the full region
+    // note: this is dangerous on Windows as VirtualFree needs the actual region pointer
+    // but in mi_os_mem_free we handle this (hopefully exceptional) situation.
+    p = mi_align_up_ptr(p, alignment);
+
+    // explicitly commit only the aligned part
+    if (commit) {
+      _mi_os_commit(p, size, NULL, stats);
     }
 #else
     // overallocate...