Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: optimize mimalloc dependency management #62

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: optimize mimalloc dependency management #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "vendor/mimalloc"]
path = vendor/mimalloc
url = https://github.com/microsoft/mimalloc
branch = v1.8.2
branch = master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to master branch?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the master branch is the stable branch, master: latest stable release (based on dev-slice).

  1. Execute git submodule update --remote --recursive and push the vendor/mimalloc folder changes when a submodule needs to be updated.
  2. Executing git submodule update --init --recursive will not update the master branch's latest commit, It will pull the commit from step 1.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in addition, .gitmodules does not support tag or commit

2 changes: 1 addition & 1 deletion vendor/mimalloc
Open in desktop
Submodule mimalloc updated 87 files
+2 −0 .gitignore
+180 −70 CMakeLists.txt
+45 −0 SECURITY.md
+17 −1 azure-pipelines.yml
+ − bin/mimalloc-redirect.dll
+ − bin/mimalloc-redirect.lib
+ − bin/mimalloc-redirect32.dll
+ − bin/mimalloc-redirect32.lib
+ − bin/minject.exe
+ − bin/minject32.exe
+71 −0 bin/readme.md
+2 −2 cmake/mimalloc-config-version.cmake
+2 −2 doc/doxyfile
+13 −13 doc/mimalloc-doc.h
+28 −0 docker/alpine-arm32v7/Dockerfile
+23 −0 docker/alpine/Dockerfile
+23 −0 docker/manylinux-x64/Dockerfile
+10 −0 docker/readme.md
+1 −1 docs/bench.html
+1 −1 docs/build.html
+2 −2 ide/vs2017/mimalloc-override-test.vcxproj
+9 −5 ide/vs2017/mimalloc-override.vcxproj
+21 −6 ide/vs2017/mimalloc-override.vcxproj.filters
+2 −2 ide/vs2017/mimalloc-test-stress.vcxproj
+3 −3 ide/vs2017/mimalloc-test.vcxproj
+71 −71 ide/vs2017/mimalloc.sln
+11 −13 ide/vs2017/mimalloc.vcxproj
+21 −12 ide/vs2017/mimalloc.vcxproj.filters
+8 −4 ide/vs2019/mimalloc-override.vcxproj
+21 −6 ide/vs2019/mimalloc-override.vcxproj.filters
+15 −11 ide/vs2019/mimalloc.vcxproj
+25 −10 ide/vs2019/mimalloc.vcxproj.filters
+19 −5 ide/vs2022/mimalloc-override.vcxproj
+110 −0 ide/vs2022/mimalloc-override.vcxproj.filters
+7 −0 ide/vs2022/mimalloc-test-api.vcxproj
+2 −2 ide/vs2022/mimalloc-test-stress.vcxproj
+26 −17 ide/vs2022/mimalloc.vcxproj
+102 −0 ide/vs2022/mimalloc.vcxproj.filters
+2 −1 include/mimalloc-override.h
+0 −62 include/mimalloc-track.h
+55 −43 include/mimalloc.h
+67 −12 include/mimalloc/atomic.h
+153 −251 include/mimalloc/internal.h
+373 −0 include/mimalloc/prim.h
+149 −0 include/mimalloc/track.h
+172 −76 include/mimalloc/types.h
+209 −111 readme.md
+106 −100 src/alloc-aligned.c
+26 −7 src/alloc-override.c
+4 −3 src/alloc-posix.c
+128 −561 src/alloc.c
+751 −179 src/arena.c
+69 −47 src/bitmap.c
+7 −3 src/bitmap.h
+530 −0 src/free.c
+96 −45 src/heap.c
+126 −128 src/init.c
+273 −0 src/libc.c
+94 −210 src/options.c
+267 −1,068 src/os.c
+33 −22 src/page-queue.c
+86 −69 src/page.c
+244 −0 src/prim/emscripten/prim.c
+7 −4 src/prim/osx/alloc-override-zone.c
+9 −0 src/prim/osx/prim.c
+27 −0 src/prim/prim.c
+9 −0 src/prim/readme.md
+878 −0 src/prim/unix/prim.c
+280 −0 src/prim/wasi/prim.c
+61 −0 src/prim/windows/etw-mimalloc.wprp
+905 −0 src/prim/windows/etw.h
+ − src/prim/windows/etw.man
+663 −0 src/prim/windows/prim.c
+17 −0 src/prim/windows/readme.md
+6 −156 src/random.c
+0 −516 src/region.c
+0 −409 src/segment-cache.c
+155 −0 src/segment-map.c
+369 −468 src/segment.c
+16 −14 src/static.c
+80 −231 src/stats.c
+9 −0 test/main-override-static.c
+64 −7 test/main-override.cpp
+6 −5 test/test-api-fill.c
+134 −13 test/test-api.c
+34 −15 test/test-stress.c
+24 −2 test/test-wrong.c