Rebase heaptrack-d onto upstream master

.gitignore

@@ -16,6 +16,12 @@ perf.data.*
 callgrind.out.*
 .*kate-swp
 
+# IDEs/clangd
+.clangd
+.cache
+compile_commands.json
+.idea
+
 # from kdiff3
 *.BACKUP.*
 *.BASE.*

.gitlab-ci.yml

@@ -0,0 +1,2 @@
+include:
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml

.kde-ci.yml

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+  'require':
+    'frameworks/extra-cmake-modules': '@stable'
+    'frameworks/kcoreaddons': '@stable'
+    'frameworks/ki18n': '@stable'
+    'frameworks/kitemmodels': '@stable'
+    'frameworks/kconfigwidgets': '@stable'
+    'frameworks/kio': '@stable'
+    'frameworks/kiconthemes': '@stable'
+    'frameworks/threadweaver': '@stable'
+    'graphics/kdiagram': '@stable'

.reuse/dep5

@@ -0,0 +1,17 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: heaptrack
+Upstream-Contact: Milian Wolff <mail@milianw.de>
+Source: https://invent.kde.org/sdk/heaptrack
+
+Files: 3rdparty/robin-map/*
+Copyright: 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
+License: MIT
+
+Files: 3rdparty/boost-zstd/*
+Copyright: Boost developers <http://www.boost.org/libs/iostreams>
+License: BSL-1.0
+
+Files: 3rdparty/doctest.h
+Copyright: Copyright (c) 2016-2023 Viktor Kirilov
+License: MIT
+

.travis.yml

@@ -1,66 +1,17 @@
 language: cpp
 compiler: gcc
-sudo: require
-dist: trusty
+os: linux
+dist: xenial
 
-before_install:
-  - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y
-  - sudo apt-get update -qq
+services:
+  - docker
 
 install:
-  - sudo apt-get -y install qt510base qt510svg qt510x11extras libdwarf-dev libboost-iostreams-dev libboost-program-options-dev
-  - source /opt/qt*/bin/qt*-env.sh
-  - # ecm
-  - git clone git://anongit.kde.org/extra-cmake-modules
-  - cd extra-cmake-modules && mkdir build && cd build && cmake .. && make -j$(nproc) && sudo make install && cd ../..
-  - # zstd
-  - git clone https://github.com/facebook/zstd.git
-  - cd zstd && make -j$(nproc) && sudo make install && cd ..
-  - # Precompiled KF5
-  - wget -nv -c "https://github.com/chigraph/precompiled-kf5-linux/releases/download/precompiled/kf5-gcc6-linux64-release.tar.xz"
-  - tar xf kf5-gcc6-linux64-release.tar.xz
-  - sudo cp -Rf root/kf5-release/* /opt/qt*/
-  - # kdiagram
-  - git clone git://anongit.kde.org/kdiagram
-  - cd kdiagram && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/qt510 -DBUILD_KGantt=OFF -DBUILD_TESTING=OFF .. && make -j$(nproc) && sudo make install && cd ../../
-  - # Precompiled version of libunwind in newer version (1.)2
-  - wget -nv -c "https://swanson.kdab.com/owncloud/index.php/s/ZETvRRZ7J5Nllo5/download" -O libunwind.tar.bz2
-  - tar xf libunwind.tar.bz2
-  - sudo cp -Rf libunwind-*/usr/* /usr/
-  - # Get AppImage tools
-  - wget -nv -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-  - chmod a+x linuxdeployqt*.AppImage
-  - sudo mv linuxdeployqt*.AppImage /usr/bin/linuxdeployqt
-  - wget -nv -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-  - chmod a+x appimagetool-*.AppImage
-  - sudo mv appimagetool-*.AppImage /usr/bin/appimagetool
   - wget -nv -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
   - chmod a+x upload.sh
   - sudo mv upload.sh /usr/bin/github-upload
 
 script:
   - set -e # Exit immediately if anything fails
-  - mkdir build
-  - cd build
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DAPPIMAGE_BUILD=ON
-  - make -j$(nproc)
-  - make DESTDIR=appdir install
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - export LD_LIBRARY_PATH=/opt/qt510/lib/x86_64-linux-gnu # make sure this path is known so all Qt/KF5 libs are found
-  - linuxdeployqt ./appdir/usr/share/applications/org.kde.heaptrack.desktop -executable=./appdir/usr/lib/heaptrack/libexec/heaptrack_interpret -executable=./appdir/usr/lib/heaptrack/libheaptrack_preload.so -executable=./appdir/usr/lib/heaptrack/libheaptrack_inject.so -bundle-non-qt-libs
-  - # Ensure we prefer the bundled libs also when calling dlopen, cf.: https://github.com/KDAB/hotspot/issues/89
-  - mv ./appdir/usr/bin/heaptrack_gui{,_bin}
-  - echo -e '#!/bin/bash\nf="$(readlink -f "${0}")"\nd="$(dirname "$f")"\nLD_LIBRARY_PATH="$d/../lib:$LD_LIBRARY_PATH" "$d/heaptrack_gui_bin" "$@"' > ./appdir/usr/bin/heaptrack_gui
-  - chmod +x ./appdir/usr/bin/heaptrack_gui
-  - # include breeze icons
-  - cp -a /opt/qt*/share/icons/breeze ./appdir/usr/share/icons/
-  - # include zstd binary
-  - cp $(which zstd) ./appdir/usr/bin/zstd
-  - # use the shell script as AppRun entry point
-  - rm ./appdir/AppRun
-  - ln -sr ./appdir/usr/bin/heaptrack ./appdir/AppRun
-  - # Actually create the final image
-  - appimagetool ./appdir/
-  - # upload the appimage to GitHub
-  - mv Heaptrack-*.AppImage heaptrack-git.$(git rev-parse --short HEAD)-x86_64.AppImage
-  - github-upload ./heaptrack-git.*-x86_64.AppImage
+  - ./tools/build_appimage_in_docker.sh
+  - github-upload ./heaptrack-*.AppImage

3rdparty/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: false

3rdparty/CMakeLists.txt

@@ -2,10 +2,22 @@ if (ECM_FOUND)
     include(ECMEnableSanitizers)
 endif()
 
-if (HEAPTRACK_BUILD_BACKTRACE)
-    add_subdirectory(libbacktrace)
-endif()
+# Mark the specified target's include directories as INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
+function(mark_as_system_target target)
+    # see also: https://gitlab.kitware.com/cmake/cmake/-/issues/21211
+    get_property(
+        include_dirs
+        TARGET ${target}
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    )
+    set_property(TARGET ${target} PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${include_dirs}")
+endfunction()
 
-if (ZSTD_FOUND)
+if (ZSTD_FOUND AND NOT BOOST_IOSTREAMS_HAS_ZSTD)
     add_subdirectory(boost-zstd)
+    mark_as_system_target(boost-zstd)
 endif()
+
+add_subdirectory(robin-map)
+
+mark_as_system_target(robin_map)