kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 23:39:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev

Browse source
This commit is contained in:
daanx 2023-04-17 10:18:46 -07:00
commit c3200d1623
9 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ide/vs2017/mimalloc-override.vcxproj
View file

@ -249,7 +249,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\page.c" /> <ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" /> <ClCompile Include="..\..\src\random.c" />
<ClCompile Include="..\..\src\segment-cache.c" /> <ClCompile Include="..\..\src\segment-map.c" />
<ClCompile Include="..\..\src\segment.c" /> <ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\stats.c" /> <ClCompile Include="..\..\src\stats.c" />
</ItemGroup> </ItemGroup>

3
ide/vs2017/mimalloc-override.vcxproj.filters
View file

@ -91,5 +91,8 @@
<ClCompile Include="..\..\src\prim\prim.c"> <ClCompile Include="..\..\src\prim\prim.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\segment-map.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
ide/vs2017/mimalloc.vcxproj
View file

@ -237,7 +237,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\page.c" /> <ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" /> <ClCompile Include="..\..\src\random.c" />
<ClCompile Include="..\..\src\segment-cache.c" /> <ClCompile Include="..\..\src\segment-map.c" />
<ClCompile Include="..\..\src\segment.c" /> <ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\os.c" /> <ClCompile Include="..\..\src\os.c" />
<ClCompile Include="..\..\src\stats.c" /> <ClCompile Include="..\..\src\stats.c" />

6
ide/vs2017/mimalloc.vcxproj.filters
View file

@ -50,9 +50,6 @@
<ClCompile Include="..\..\src\arena.c"> <ClCompile Include="..\..\src\arena.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\arena.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\random.c"> <ClCompile Include="..\..\src\random.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -65,6 +62,9 @@
<ClCompile Include="..\..\src\prim\prim.c"> <ClCompile Include="..\..\src\prim\prim.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\segment-map.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

2
ide/vs2019/mimalloc-override.vcxproj
View file

@ -249,7 +249,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\page.c" /> <ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" /> <ClCompile Include="..\..\src\random.c" />
<ClCompile Include="..\..\src\segment-cache.c" /> <ClCompile Include="..\..\src\segment-map.c" />
<ClCompile Include="..\..\src\segment.c" /> <ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\stats.c" /> <ClCompile Include="..\..\src\stats.c" />
</ItemGroup> </ItemGroup>

3
ide/vs2019/mimalloc-override.vcxproj.filters
View file

@ -52,6 +52,9 @@
<ClCompile Include="..\..\src\prim\prim.c" /> <ClCompile Include="..\..\src\prim\prim.c" />
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\segment-map.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

2
ide/vs2019/mimalloc.vcxproj
View file

@ -235,7 +235,7 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\page.c" /> <ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" /> <ClCompile Include="..\..\src\random.c" />
<ClCompile Include="..\..\src\segment-cache.c" /> <ClCompile Include="..\..\src\segment-map.c" />
<ClCompile Include="..\..\src\segment.c" /> <ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\os.c" /> <ClCompile Include="..\..\src\os.c" />
<ClCompile Include="..\..\src\stats.c" /> <ClCompile Include="..\..\src\stats.c" />

3
ide/vs2019/mimalloc.vcxproj.filters
View file

@ -55,6 +55,9 @@
<ClCompile Include="..\..\src\prim\windows\prim.c"> <ClCompile Include="..\..\src\prim\windows\prim.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\segment-map.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">

3
src/init.c
View file

@ -559,6 +559,9 @@ static void mi_detect_cpu_features(void) {
void mi_process_init(void) mi_attr_noexcept { void mi_process_init(void) mi_attr_noexcept {
// ensure we are called once // ensure we are called once
static mi_atomic_once_t process_init; static mi_atomic_once_t process_init;
#if _MSC_VER < 1920
mi_heap_main_init(); // vs2017 can dynamically re-initialize _mi_heap_main
#endif
if (!mi_atomic_once(&process_init)) return; if (!mi_atomic_once(&process_init)) return;
_mi_process_is_initialized = true; _mi_process_is_initialized = true;
_mi_verbose_message("process init: 0x%zx\n", _mi_thread_id()); _mi_verbose_message("process init: 0x%zx\n", _mi_thread_id());