From 3d9d70bce09c7fdae64eee070ab87e493722de52 Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Sat, 10 Aug 2019 09:39:36 -0700
Subject: [PATCH] add new redirection module; fix environment reading at
 preloading

---
 bin/mimalloc-redirect.dll                    | Bin 35840 -> 46080 bytes
 bin/mimalloc-redirect.lib                    | Bin 3050 -> 3050 bytes
 bin/mimalloc-redirect32.dll                  | Bin 0 -> 28672 bytes
 bin/mimalloc-redirect32.lib                  | Bin 0 -> 3126 bytes
 ide/vs2017/mimalloc-override-test.vcxproj    |  12 ++++--
 ide/vs2017/mimalloc-override.vcxproj         |  29 +++++++++------
 ide/vs2017/mimalloc-override.vcxproj.filters |   3 --
 src/init.c                                   |   6 +--
 src/options.c                                |  37 +++++++++++++++----
 test/main-override.cpp                       |   5 ++-
 10 files changed, 61 insertions(+), 31 deletions(-)
 create mode 100644 bin/mimalloc-redirect32.dll
 create mode 100644 bin/mimalloc-redirect32.lib

diff --git a/bin/mimalloc-redirect.dll b/bin/mimalloc-redirect.dll
index 14ed46ec2c3aebed56614e50a464803f4644b397..aaecc653b849bea38fcace1c2b12a0842d41fc28 100644
GIT binary patch
delta 6299
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
Ezi8}CX#fBK

delta 5219
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
WY3lRz#rqOS$lLEjIw*@%@?Qano+8cw

diff --git a/bin/mimalloc-redirect.lib b/bin/mimalloc-redirect.lib
index cf2f95e45cd7c00414296f75284e5cb82c3db91e..0e9ca3c3a32de283a7b49422087df92eaff73d28 100644
GIT binary patch
delta 99
zcmaDQ{z`m8m>72s0|N+ieS+c&AYCyrr)P2&BhTbGM#ah6%>0ve7}X~8Fmg;{l${*R
rB{+Ek<2<e$ZU%-=Tnr2qT$3%B<oMYbSQ%ItI2hO&z^u)wOs$*%zt9yf

delta 99
zcmaDQ{z`m8m>5?D0|OX;0@6Utodd!Xb9yF6F{)11X6B#V#VkD8ol$tQ9wXbtf9jKi
qxdbOqV4TNQ!NtJv35avJCtEPd@v|_nGO#glFt9U#S({UtS~&p$7#4*9

diff --git a/bin/mimalloc-redirect32.dll b/bin/mimalloc-redirect32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..89b9625d107ccc203d64447d44852fd3fe1be166
GIT binary patch
literal 28672
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

literal 0
HcmV?d00001

diff --git a/bin/mimalloc-redirect32.lib b/bin/mimalloc-redirect32.lib
new file mode 100644
index 0000000000000000000000000000000000000000..aed3b67fb2fb832cd97d8f35a76ae692ef7ede33
GIT binary patch
literal 3126
zcmcgu-A)rh6#lj?AdAsPP4q@nBSww#*FP~aq$m&x%TG$VUP`yhnr%y#^};J(z$>1B
zS1{p<D?;K!c;SWI`waEW?9A@AorN}llg!_lGxN<k^PQP_{I=@WcIWh|OlO*y>Fmqi
zv}ojWMbX;U0o(>sOTh3UFmeWr9f>?kHD&!+<T<J-kDiKbP;Hpz^6JKVxneFXZoV%s
zZ&cRHX2Wh&9j8^BaO;-s)@xoa3)5WNGK^kjd{b!qx|I)GYb)l$d}W?y+l@Vw7B=OQ
zX1!V6aq6a5cN>Twh?}RHqC&CkeFoF19teZgxw%!Z<(hWW_PBPpNTF-Bn*Pe6t}j|}
zoW-W+el5)~$8po6qJhslAD;Ip9r#iTI2;DfMu4L+V3zVRF=3AKDJd9~i4+)xh6I&2
zFoIzWAr)yQVMe!fX&NZZ3=h5AKMG&^eh&r$n)IGkFyu2xI`}+pb>ow6C<;zISUAA!
zU9*!&Q4aSN2UA@~e^I1o^D_3gbw!*_T8@J$c`XRli`FdU<@K_y8(I==N>4NpH+a$}
zt@_TFPve_@7g(jnci9nj3F&u}wpI12<5@X$j~c%y{}qBH)g?@y2)&{Z;{i3s2v6!U
zc?p@51l5m-tt{P-G4>hmrit`mYqN9<X&l&hR_&VG+HZaIGSAB|GRE@Sia*?0-lQ&@
z$QGb0lef}T4)InDB1*MZV~=b&ur;mSme6cAOKj5#NLQ2qZpN;ZaHAP!QcChnhXe?8
z3ZaC_U$H_YwmPsVdaO#|GnJQ)*1pK956Y};F&n%~hL+&W`pGxVwhkq;EIt$#5oYD2
zlrigv?1-8%>)IL9&)Gku4aGi=gL*JG9rd6en|}zvCxY68=fq|~I*rkl#bz``Vlyx0
zOz*esi2B+*-H&%)&?fpK>!6-4ybf<x5L4;Zr0{OHpK_~Hov&lu-7s*36mx3SmxQX(
z4a`15;mgE76aNJ}(Syxj#jC?EsO_F0yORRD=lQ)l^vEk3J!^K=vOf{?dVnr|6>;E$
V@~rqqZTSpg52>;JKXKd!^naKH*GK>W

literal 0
HcmV?d00001

diff --git a/ide/vs2017/mimalloc-override-test.vcxproj b/ide/vs2017/mimalloc-override-test.vcxproj
index 7df1e79a..b8e2648b 100644
--- a/ide/vs2017/mimalloc-override-test.vcxproj
+++ b/ide/vs2017/mimalloc-override-test.vcxproj
@@ -100,7 +100,8 @@
     </Link>
     <PostBuildEvent />
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -123,7 +124,8 @@
     </Link>
     <PostBuildEvent />
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -145,7 +147,8 @@
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -169,7 +172,8 @@
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/ide/vs2017/mimalloc-override.vcxproj b/ide/vs2017/mimalloc-override.vcxproj
index 7d452b55..6847e388 100644
--- a/ide/vs2017/mimalloc-override.vcxproj
+++ b/ide/vs2017/mimalloc-override.vcxproj
@@ -101,15 +101,20 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <EntryPointSymbol>DllEntry</EntryPointSymbol>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -124,17 +129,16 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <EntryPointSymbol>DllEntry</EntryPointSymbol>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
+      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>copy mimalloc-redirect.dll to the output directory</Message>
@@ -159,13 +163,18 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <EntryPointSymbol>DllEntry</EntryPointSymbol>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -186,15 +195,14 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <EntryPointSymbol>DllEntry</EntryPointSymbol>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>COPY /Y $(SolutionDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
+      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>copy mimalloc-redirect.dll to the output directory</Message>
@@ -214,7 +222,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-win.c" />
     <ClCompile Include="..\..\src\alloc-override.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/ide/vs2017/mimalloc-override.vcxproj.filters b/ide/vs2017/mimalloc-override.vcxproj.filters
index df0bf5ed..ffabddac 100644
--- a/ide/vs2017/mimalloc-override.vcxproj.filters
+++ b/ide/vs2017/mimalloc-override.vcxproj.filters
@@ -67,8 +67,5 @@
     <ClCompile Include="..\..\src\alloc-posix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-win.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/init.c b/src/init.c
index f807d74a..7215e4fb 100644
--- a/src/init.c
+++ b/src/init.c
@@ -388,7 +388,7 @@ bool _mi_preloading() {
 }
 
 // Communicate with the redirection module on Windows
-#if 0
+#if defined(_WIN32) && defined(MI_SHARED_LIB) 
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -475,9 +475,7 @@ static void mi_process_done(void) {
 
 
 #if defined(_WIN32) && defined(MI_SHARED_LIB)
-  // Windows DLL: easy to hook into process_init and thread_done
-  #include <windows.h>
-
+  // Windows DLL: easy to hook into process_init and thread_done  
   __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
     UNUSED(reserved);
     UNUSED(inst);
diff --git a/src/options.c b/src/options.c
index 01620e75..9f045905 100644
--- a/src/options.c
+++ b/src/options.c
@@ -208,8 +208,25 @@ static void mi_strlcat(char* dest, const char* src, size_t dest_size) {
   dest[dest_size - 1] = 0;
 }
 
-static const char* mi_getenv(const char* name) {
-  if (_mi_preloading()) return NULL;  // don't call getenv too early
+#if defined _WIN32
+#include <windows.h>
+static bool mi_getenv(const char* name, char* result, size_t result_size) {
+  result[0] = 0;
+  bool ok = (GetEnvironmentVariableA(name, result, (DWORD)result_size) > 0);
+  if (!ok) {
+    char buf[64+1];
+    size_t len = strlen(name);
+    if (len >= sizeof(buf)) len = sizeof(buf) - 1;
+    for (size_t i = 0; i < len; i++) {
+      buf[i] = toupper(name[i]);
+    }
+    buf[len] = 0;
+    ok = (GetEnvironmentVariableA(name, result, (DWORD)result_size) > 0);
+  }
+  return ok;
+}
+#else
+static bool mi_getenv(const char* name, char* result, size_t result_size) {
   #pragma warning(suppress:4996)
   const char* s = getenv(name);
   if (s == NULL) {
@@ -223,17 +240,23 @@ static const char* mi_getenv(const char* name) {
     #pragma warning(suppress:4996)
     s = getenv(buf);
   }
-  return s;
+  if (s != NULL && strlen(s) < result_size) {
+    mi_strlcpy(result,s,result_size);
+    return true;
+  }
+  else {
+    return false;
+  }
 }
-
+#endif
 static void mi_option_init(mi_option_desc_t* desc) {
-  if (!_mi_preloading()) desc->init = DEFAULTED;
+  desc->init = DEFAULTED;
   // Read option value from the environment
   char buf[64+1];
   mi_strlcpy(buf, "mimalloc_", sizeof(buf));
   mi_strlcat(buf, desc->name, sizeof(buf));
-  const char* s = mi_getenv(buf);
-  if (s != NULL) {
+  char s[64+1];
+  if (mi_getenv(buf, s, sizeof(s))) {
     size_t len = strlen(s);
     if (len >= sizeof(buf)) len = sizeof(buf) - 1;
     for (size_t i = 0; i < len; i++) {
diff --git a/test/main-override.cpp b/test/main-override.cpp
index 58d06c6a..385778c7 100644
--- a/test/main-override.cpp
+++ b/test/main-override.cpp
@@ -23,11 +23,11 @@ public:
 
 
 int main() {
-  mi_stats_reset();  // ignore earlier allocations
+  //mi_stats_reset();  // ignore earlier allocations
   atexit(free_p);
   void* p1 = malloc(78);
   void* p2 = mi_malloc_aligned(16,24);
-  free(p1);
+  free(p1);  
   p1 = malloc(8);
   char* s = mi_strdup("hello\n");
   mi_free(p2);
@@ -40,6 +40,7 @@ int main() {
   delete t;
   t = new (std::nothrow) Test(42);
   delete t;  
+  mi_stats_print(NULL);
   return 0;
 }