Skip to content

Commit

Permalink
Replace tbb malloc with mimalloc
Browse files Browse the repository at this point in the history
  • Loading branch information
variar committed May 15, 2021
1 parent c03488b commit 8de8cda
Show file tree
Hide file tree
Showing 97 changed files with 42,269 additions and 33 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ jobs:
run: |
cd $KLOGG_BUILD_ROOT
DESTDIR=$(readlink -f appdir) ninja install
mv appdir/usr/lib/x86_64-linux-gnu/* appdir/usr/lib
rm -rf appdir/usr/lib/x86_64-linux-gnu/
wget -c -q "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
VERSION=$KLOGG_VERSION ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -qmake=$Qt5_Dir/bin/qmake -bundle-non-qt-libs
Expand Down
13 changes: 12 additions & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ add_subdirectory(whereami)
add_subdirectory(kdab)
add_subdirectory(roaring) #0.3.1

if(KLOGG_USE_MIMALLOC)
set(MI_INSTALL_TOPLEVEL ON)
if (NOT WIN32)
set(MI_BUILD_SHARED OFF)
set(MI_BUILD_STATIC OFF)
if (APPLE)
set(MI_OSX_ZONE ON)
endif()
endif()
add_subdirectory(mimalloc) #-1.7.1
endif()

if(KLOGG_USE_SENTRY)
set(SENTRY_BACKEND "crashpad" CACHE INTERNAL "" FORCE)
set(SENTRY_TRANSPORT "none" CACHE INTERNAL "" FORCE)
Expand Down Expand Up @@ -107,7 +119,6 @@ if(KF5Archive_FOUND)
target_link_libraries(klogg_karchive INTERFACE KF5::Archive)
else()
message("Using bundled KArchive")

add_subdirectory(cmzlib)
add_subdirectory(cmbzip2)
add_subdirectory(cmliblzma)
Expand Down
11 changes: 11 additions & 0 deletions 3rdparty/mimalloc/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# default behavior is to always use unix style line endings
* text eol=lf
*.png binary
*.pdn binary
*.jpg binary
*.sln binary
*.suo binary
*.vcproj binary
*.patch binary
*.dll binary
*.lib binary
8 changes: 8 additions & 0 deletions 3rdparty/mimalloc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ide/vs20??/*.db
ide/vs20??/*.opendb
ide/vs20??/*.user
ide/vs20??/*.vcxproj.filters
ide/vs20??/.vs
out/
docs/
*.zip
Loading

0 comments on commit 8de8cda

Please sign in to comment.