Restructure source code directory layout

Everything that's not 3rdparty or tests is now moved into the src
subfolder. That one in turn contains the following folders:

- util: shared helper functionality
- track: core functionality of heaptrack, i.e. the stuff that
  gets injected into the client code
- interpret: does the first-level aggregation and DWARF translations
  on the raw instruction pointers returned by tracking code
- analyze: high-level analyzers, i.e.:
  print: the ASCII dumper
  gui: the Qt/KDE GUI

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6983031..6b323bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ include(FeatureSummary)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-
 option(
   HEAPTRACK_BUILD_GUI
   "Disable this option to skip building the Qt5 / KF5 based GUI for heaptrack."
@@ -28,16 +27,13 @@ option(
 )
 
 if(HEAPTRACK_BUILD_GUI)
-find_package(Qt5 5.2.0 NO_MODULE OPTIONAL_COMPONENTS Widgets)
-find_package(ECM 1.0.0 NO_MODULE)
-if(Qt5_FOUND AND ECM_FOUND)
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-        find_package(KF5 OPTIONAL_COMPONENTS CoreAddons I18n ItemModels ThreadWeaver ConfigWidgets KIO)
-        find_package(KChart "2.6.0")
-        set_package_properties(KChart PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
-        if (KF5_FOUND)
-            add_subdirectory(gui)
-        endif()
+    find_package(Qt5 5.2.0 NO_MODULE OPTIONAL_COMPONENTS Widgets)
+    find_package(ECM 1.0.0 NO_MODULE)
+    if(Qt5_FOUND AND ECM_FOUND)
+        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+            find_package(KF5 OPTIONAL_COMPONENTS CoreAddons I18n ItemModels ThreadWeaver ConfigWidgets KIO)
+            find_package(KChart "2.6.0")
+            set_package_properties(KChart PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
     endif()
 endif()
 
@@ -45,8 +41,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wpedantic")
 
-add_subdirectory(3rdparty)
-
 check_library_exists (${LIBUNWIND_LIBRARY} unw_backtrace "" HAVE_UNW_BACKTRACE)
 if (NOT HAVE_UNW_BACKTRACE)
     message(FATAL_ERROR "Your libunwind version is apparently too old and does not have the unw_backtrace function.")
@@ -78,39 +72,6 @@ if (NOT HAVE_LINUX_HEADERS)
     message(FATAL_ERROR "You are missing some Linux headers required to compile heaptrack.")
 endif()
 
-add_subdirectory(tests)
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${Boost_INCLUDE_DIRS}
-    3rdparty/
-    ${LIBUNWIND_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIRS}
-)
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(HEAPTRACK_DEBUG_BUILD 1)
-else()
-    set(HEAPTRACK_DEBUG_BUILD 0)
-endif()
-
-configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
-add_library(heaptrack_preload MODULE heaptrack_preload.cpp libheaptrack.cpp)
-target_link_libraries(heaptrack_preload LINK_PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${LIBUNWIND_LIBRARY} rt)
-set_target_properties(heaptrack_preload PROPERTIES VERSION ${HEAPTRACK_LIB_VERSION} SOVERSION ${HEAPTRACK_LIB_SOVERSION})
-add_library(heaptrack_inject MODULE heaptrack_inject.cpp libheaptrack.cpp)
-target_link_libraries(heaptrack_inject LINK_PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${LIBUNWIND_LIBRARY} rt)
-set_target_properties(heaptrack_inject PROPERTIES VERSION ${HEAPTRACK_LIB_VERSION} SOVERSION ${HEAPTRACK_LIB_SOVERSION})
-
-add_executable(heaptrack_interpret heaptrack_interpret.cpp)
-target_link_libraries(heaptrack_interpret backtrace)
-
-add_library(sharedprint STATIC accumulatedtracedata.cpp)
-target_link_libraries(sharedprint LINK_PUBLIC ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
-add_executable(heaptrack_print heaptrack_print.cpp)
-target_link_libraries(heaptrack_print LINK_PRIVATE sharedprint ${CMAKE_THREAD_LIBS_INIT})
-
 set(BIN_INSTALL_DIR "bin")
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
 set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
@@ -124,13 +85,8 @@ file(RELATIVE_PATH LIB_REL_PATH
     "${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}"
     "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/heaptrack")
 
-configure_file(heaptrack.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/heaptrack @ONLY)
-
-install(TARGETS heaptrack_print RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/heaptrack DESTINATION ${BIN_INSTALL_DIR})
-install(TARGETS heaptrack_interpret RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(TARGETS heaptrack_inject LIBRARY DESTINATION ${LIB_INSTALL_DIR}/heaptrack/)
-install(TARGETS heaptrack_preload LIBRARY DESTINATION ${LIB_INSTALL_DIR}/heaptrack/)
-install(FILES heaptrack_api.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+add_subdirectory(3rdparty)
+add_subdirectory(src)
+add_subdirectory(tests)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f29097a
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,9 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_subdirectory(util)
+add_subdirectory(track)
+add_subdirectory(interpret)
+add_subdirectory(analyze)

diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8a33d47
--- /dev/null
+++ b/src/analyze/CMakeLists.txt
@@ -0,0 +1,19 @@
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
+)
+
+add_library(sharedprint STATIC
+    accumulatedtracedata.cpp
+)
+
+target_link_libraries(sharedprint LINK_PUBLIC
+    ${Boost_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+)
+
+add_subdirectory(print)
+
+if (KF5_FOUND)
+    add_subdirectory(gui)
+endif()

diff --git a/accumulatedtracedata.cpp b/src/analyze/accumulatedtracedata.cpp
similarity index 99%
rename from accumulatedtracedata.cpp
rename to src/analyze/accumulatedtracedata.cpp
index 538d803..c58148b 100644 (file)
--- a/accumulatedtracedata.cpp
+++ b/src/analyze/accumulatedtracedata.cpp
@@ -28,9 +28,9 @@
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include "linereader.h"
-#include "config.h"
-#include "pointermap.h"
+#include "util/linereader.h"
+#include "util/config.h"
+#include "util/pointermap.h"
 
 #ifdef __GNUC__
 #define POTENTIALLY_UNUSED __attribute__ ((unused))

diff --git a/accumulatedtracedata.h b/src/analyze/accumulatedtracedata.h
similarity index 99%
rename from accumulatedtracedata.h
rename to src/analyze/accumulatedtracedata.h
index 885af1d..e8748b1 100644 (file)
--- a/accumulatedtracedata.h
+++ b/src/analyze/accumulatedtracedata.h
@@ -30,7 +30,7 @@
 #include <map>
 #include <boost/functional/hash.hpp>
 
-#include "indices.h"
+#include "util/indices.h"
 #include "allocationdata.h"
 
 struct InstructionPointer

diff --git a/allocationdata.h b/src/analyze/allocationdata.h
similarity index 100%
rename from allocationdata.h
rename to src/analyze/allocationdata.h

diff --git a/gui/CMakeLists.txt b/src/analyze/gui/CMakeLists.txt
similarity index 94%
rename from gui/CMakeLists.txt
rename to src/analyze/gui/CMakeLists.txt
index 6b4d636..faa53e4 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/src/analyze/gui/CMakeLists.txt
@@ -4,6 +4,10 @@ ki18n_wrap_ui(UIFILES
     mainwindow.ui
 )
 
+unset(BIN_INSTALL_DIR)
+unset(LIB_INSTALL_DIR)
+unset(LIBEXEC_INSTALL_DIR)
+
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)

diff --git a/gui/callercalleemodel.cpp b/src/analyze/gui/callercalleemodel.cpp
similarity index 100%
rename from gui/callercalleemodel.cpp
rename to src/analyze/gui/callercalleemodel.cpp

diff --git a/gui/callercalleemodel.h b/src/analyze/gui/callercalleemodel.h
similarity index 100%
rename from gui/callercalleemodel.h
rename to src/analyze/gui/callercalleemodel.h

diff --git a/gui/chartmodel.cpp b/src/analyze/gui/chartmodel.cpp
similarity index 100%
rename from gui/chartmodel.cpp
rename to src/analyze/gui/chartmodel.cpp

diff --git a/gui/chartmodel.h b/src/analyze/gui/chartmodel.h
similarity index 100%
rename from gui/chartmodel.h
rename to src/analyze/gui/chartmodel.h

diff --git a/gui/chartproxy.cpp b/src/analyze/gui/chartproxy.cpp
similarity index 100%
rename from gui/chartproxy.cpp
rename to src/analyze/gui/chartproxy.cpp

diff --git a/gui/chartproxy.h b/src/analyze/gui/chartproxy.h
similarity index 100%
rename from gui/chartproxy.h
rename to src/analyze/gui/chartproxy.h

diff --git a/gui/chartwidget.cpp b/src/analyze/gui/chartwidget.cpp
similarity index 100%
rename from gui/chartwidget.cpp
rename to src/analyze/gui/chartwidget.cpp

diff --git a/gui/chartwidget.h b/src/analyze/gui/chartwidget.h
similarity index 100%
rename from gui/chartwidget.h
rename to src/analyze/gui/chartwidget.h

diff --git a/gui/costdelegate.cpp b/src/analyze/gui/costdelegate.cpp
similarity index 100%
rename from gui/costdelegate.cpp
rename to src/analyze/gui/costdelegate.cpp

diff --git a/gui/costdelegate.h b/src/analyze/gui/costdelegate.h
similarity index 100%
rename from gui/costdelegate.h
rename to src/analyze/gui/costdelegate.h

diff --git a/gui/flamegraph.cpp b/src/analyze/gui/flamegraph.cpp
similarity index 100%
rename from gui/flamegraph.cpp
rename to src/analyze/gui/flamegraph.cpp

diff --git a/gui/flamegraph.h b/src/analyze/gui/flamegraph.h
similarity index 100%
rename from gui/flamegraph.h
rename to src/analyze/gui/flamegraph.h

diff --git a/gui/gui.cpp b/src/analyze/gui/gui.cpp
similarity index 100%
rename from gui/gui.cpp
rename to src/analyze/gui/gui.cpp

diff --git a/gui/gui_config.h.cmake b/src/analyze/gui/gui_config.h.cmake
similarity index 100%
rename from gui/gui_config.h.cmake
rename to src/analyze/gui/gui_config.h.cmake

diff --git a/gui/histogrammodel.cpp b/src/analyze/gui/histogrammodel.cpp
similarity index 100%
rename from gui/histogrammodel.cpp
rename to src/analyze/gui/histogrammodel.cpp

diff --git a/gui/histogrammodel.h b/src/analyze/gui/histogrammodel.h
similarity index 100%
rename from gui/histogrammodel.h
rename to src/analyze/gui/histogrammodel.h

diff --git a/gui/histogramwidget.cpp b/src/analyze/gui/histogramwidget.cpp
similarity index 100%
rename from gui/histogramwidget.cpp
rename to src/analyze/gui/histogramwidget.cpp

diff --git a/gui/histogramwidget.h b/src/analyze/gui/histogramwidget.h
similarity index 100%
rename from gui/histogramwidget.h
rename to src/analyze/gui/histogramwidget.h

diff --git a/gui/locationdata.h b/src/analyze/gui/locationdata.h
similarity index 100%
rename from gui/locationdata.h
rename to src/analyze/gui/locationdata.h

diff --git a/gui/mainwindow.cpp b/src/analyze/gui/mainwindow.cpp
similarity index 100%
rename from gui/mainwindow.cpp
rename to src/analyze/gui/mainwindow.cpp

diff --git a/gui/mainwindow.h b/src/analyze/gui/mainwindow.h
similarity index 100%
rename from gui/mainwindow.h
rename to src/analyze/gui/mainwindow.h

diff --git a/gui/mainwindow.ui b/src/analyze/gui/mainwindow.ui
similarity index 100%
rename from gui/mainwindow.ui
rename to src/analyze/gui/mainwindow.ui

diff --git a/gui/modeltest.cpp b/src/analyze/gui/modeltest.cpp
similarity index 100%
rename from gui/modeltest.cpp
rename to src/analyze/gui/modeltest.cpp

diff --git a/gui/modeltest.h b/src/analyze/gui/modeltest.h
similarity index 100%
rename from gui/modeltest.h
rename to src/analyze/gui/modeltest.h

diff --git a/gui/parser.cpp b/src/analyze/gui/parser.cpp
similarity index 99%
rename from gui/parser.cpp
rename to src/analyze/gui/parser.cpp
index fabfe99..2d0c8ff 100644 (file)
--- a/gui/parser.cpp
+++ b/src/analyze/gui/parser.cpp
@@ -24,7 +24,7 @@
 
 #include <QDebug>
 
-#include "../accumulatedtracedata.h"
+#include "analyze/accumulatedtracedata.h"
 
 #include <vector>
 #include <tuple>

diff --git a/gui/parser.h b/src/analyze/gui/parser.h
similarity index 100%
rename from gui/parser.h
rename to src/analyze/gui/parser.h

diff --git a/gui/stacksmodel.cpp b/src/analyze/gui/stacksmodel.cpp
similarity index 100%
rename from gui/stacksmodel.cpp
rename to src/analyze/gui/stacksmodel.cpp

diff --git a/gui/stacksmodel.h b/src/analyze/gui/stacksmodel.h
similarity index 100%
rename from gui/stacksmodel.h
rename to src/analyze/gui/stacksmodel.h

diff --git a/gui/summarydata.h b/src/analyze/gui/summarydata.h
similarity index 100%
rename from gui/summarydata.h
rename to src/analyze/gui/summarydata.h

diff --git a/gui/topproxy.cpp b/src/analyze/gui/topproxy.cpp
similarity index 100%
rename from gui/topproxy.cpp
rename to src/analyze/gui/topproxy.cpp

diff --git a/gui/topproxy.h b/src/analyze/gui/topproxy.h
similarity index 100%
rename from gui/topproxy.h
rename to src/analyze/gui/topproxy.h

diff --git a/gui/treemodel.cpp b/src/analyze/gui/treemodel.cpp
similarity index 100%
rename from gui/treemodel.cpp
rename to src/analyze/gui/treemodel.cpp

diff --git a/gui/treemodel.h b/src/analyze/gui/treemodel.h
similarity index 100%
rename from gui/treemodel.h
rename to src/analyze/gui/treemodel.h

diff --git a/gui/treeproxy.cpp b/src/analyze/gui/treeproxy.cpp
similarity index 100%
rename from gui/treeproxy.cpp
rename to src/analyze/gui/treeproxy.cpp

diff --git a/gui/treeproxy.h b/src/analyze/gui/treeproxy.h
similarity index 100%
rename from gui/treeproxy.h
rename to src/analyze/gui/treeproxy.h

diff --git a/src/analyze/print/CMakeLists.txt b/src/analyze/print/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d8b7b71
--- /dev/null
+++ b/src/analyze/print/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_executable(heaptrack_print
+    heaptrack_print.cpp
+)
+
+target_link_libraries(heaptrack_print LINK_PRIVATE
+    sharedprint
+    ${CMAKE_THREAD_LIBS_INIT}
+)
+
+install(TARGETS heaptrack_print
+    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+)

diff --git a/heaptrack_print.cpp b/src/analyze/print/heaptrack_print.cpp
similarity index 99%
rename from heaptrack_print.cpp
rename to src/analyze/print/heaptrack_print.cpp
index 364a790..cb9ce2d 100644 (file)
--- a/heaptrack_print.cpp
+++ b/src/analyze/print/heaptrack_print.cpp
@@ -25,13 +25,13 @@
 
 #include <boost/program_options.hpp>
 
-#include "accumulatedtracedata.h"
+#include "analyze/accumulatedtracedata.h"
 
 #include <iostream>
 #include <iomanip>
 #include <future>
 
-#include "config.h"
+#include "util/config.h"
 
 using namespace std;
 namespace po = boost::program_options;

diff --git a/src/interpret/CMakeLists.txt b/src/interpret/CMakeLists.txt
new file mode 100644 (file)
index 0000000..549d1b6
--- /dev/null
+++ b/src/interpret/CMakeLists.txt
@@ -0,0 +1,17 @@
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${PROJECT_SOURCE_DIR}/3rdparty/
+    ${ZLIB_INCLUDE_DIRS}
+)
+
+add_executable(heaptrack_interpret
+    heaptrack_interpret.cpp
+)
+
+target_link_libraries(heaptrack_interpret
+    backtrace
+)
+
+install(TARGETS heaptrack_interpret
+    RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR}
+)

diff --git a/heaptrack_interpret.cpp b/src/interpret/heaptrack_interpret.cpp
similarity index 99%
rename from heaptrack_interpret.cpp
rename to src/interpret/heaptrack_interpret.cpp
index cd1ac64..418d27e 100644 (file)
--- a/heaptrack_interpret.cpp
+++ b/src/interpret/heaptrack_interpret.cpp
@@ -38,8 +38,8 @@
 
 #include "libbacktrace/backtrace.h"
 #include "libbacktrace/internal.h"
-#include "linereader.h"
-#include "pointermap.h"
+#include "util/linereader.h"
+#include "util/pointermap.h"
 
 using namespace std;
 

diff --git a/src/track/CMakeLists.txt b/src/track/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8e974e8
--- /dev/null
+++ b/src/track/CMakeLists.txt
@@ -0,0 +1,60 @@
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${LIBUNWIND_INCLUDE_DIR}
+)
+
+# heaptrack: bash script to inject/preload
+configure_file(heaptrack.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/heaptrack @ONLY)
+
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/heaptrack
+    DESTINATION ${BIN_INSTALL_DIR}
+)
+
+# heaptrack_preload: track a newly started process
+add_library(heaptrack_preload MODULE
+    heaptrack_preload.cpp
+    libheaptrack.cpp
+)
+
+target_link_libraries(heaptrack_preload LINK_PRIVATE
+    ${CMAKE_DL_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${LIBUNWIND_LIBRARY}
+    rt
+)
+
+set_target_properties(heaptrack_preload PROPERTIES
+    VERSION ${HEAPTRACK_LIB_VERSION}
+    SOVERSION ${HEAPTRACK_LIB_SOVERSION}
+)
+
+install(TARGETS heaptrack_preload
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}/heaptrack/
+)
+
+# heaptrack_inject: track an already running process
+add_library(heaptrack_inject MODULE
+    heaptrack_inject.cpp
+    libheaptrack.cpp
+)
+
+target_link_libraries(heaptrack_inject LINK_PRIVATE
+    ${CMAKE_DL_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${LIBUNWIND_LIBRARY}
+    rt
+)
+
+set_target_properties(heaptrack_inject PROPERTIES
+    VERSION ${HEAPTRACK_LIB_VERSION}
+    SOVERSION ${HEAPTRACK_LIB_SOVERSION}
+)
+
+install(TARGETS heaptrack_inject
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}/heaptrack/
+)
+
+# public API for custom pool allocators or static binaries
+install(FILES heaptrack_api.h
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+)

diff --git a/heaptrack.sh.cmake b/src/track/heaptrack.sh.cmake
similarity index 100%
rename from heaptrack.sh.cmake
rename to src/track/heaptrack.sh.cmake

diff --git a/heaptrack_api.h b/src/track/heaptrack_api.h
similarity index 100%
rename from heaptrack_api.h
rename to src/track/heaptrack_api.h

diff --git a/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
similarity index 100%
rename from heaptrack_inject.cpp
rename to src/track/heaptrack_inject.cpp

diff --git a/heaptrack_preload.cpp b/src/track/heaptrack_preload.cpp
similarity index 100%
rename from heaptrack_preload.cpp
rename to src/track/heaptrack_preload.cpp

diff --git a/libheaptrack.cpp b/src/track/libheaptrack.cpp
similarity index 99%
rename from libheaptrack.cpp
rename to src/track/libheaptrack.cpp
index 076d9b7..17c104b 100644 (file)
--- a/libheaptrack.cpp
+++ b/src/track/libheaptrack.cpp
@@ -41,7 +41,7 @@
 #include <boost/algorithm/string/replace.hpp>
 
 #include "tracetree.h"
-#include "config.h"
+#include "util/config.h"
 
 /**
  * uncomment this to get extended debug code for known pointers

diff --git a/libheaptrack.h b/src/track/libheaptrack.h
similarity index 100%
rename from libheaptrack.h
rename to src/track/libheaptrack.h

diff --git a/trace.h b/src/track/trace.h
similarity index 100%
rename from trace.h
rename to src/track/trace.h

diff --git a/tracetree.h b/src/track/tracetree.h
similarity index 100%
rename from tracetree.h
rename to src/track/tracetree.h

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1a49311
--- /dev/null
+++ b/src/util/CMakeLists.txt
@@ -0,0 +1,7 @@
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(HEAPTRACK_DEBUG_BUILD 1)
+else()
+    set(HEAPTRACK_DEBUG_BUILD 0)
+endif()
+
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

diff --git a/config.h.cmake b/src/util/config.h.cmake
similarity index 100%
rename from config.h.cmake
rename to src/util/config.h.cmake

diff --git a/indices.h b/src/util/indices.h
similarity index 100%
rename from indices.h
rename to src/util/indices.h

diff --git a/linereader.h b/src/util/linereader.h
similarity index 100%
rename from linereader.h
rename to src/util/linereader.h

diff --git a/pointermap.h b/src/util/pointermap.h
similarity index 100%
rename from pointermap.h
rename to src/util/pointermap.h

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index f1d303a..4889578 100644 (file)
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -2,7 +2,7 @@ set(CMAKE_BUILD_TYPE Debug)
 
 include_directories(
     ${LIBUNWIND_INCLUDE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 add_definitions(-DCATCH_CONFIG_MAIN)
 add_executable(tst_trace tst_trace.cpp)

diff --git a/tests/auto/tst_trace.cpp b/tests/auto/tst_trace.cpp
index 0f1941e..3e825a5 100644 (file)
--- a/tests/auto/tst_trace.cpp
+++ b/tests/auto/tst_trace.cpp
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "trace.h"
+#include "src/track/trace.h"
 #include "3rdparty/catch.hpp"
 
 #include <algorithm>
@@ -66,4 +66,4 @@ TEST_CASE("getting backtrace traces", "[trace]") {
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/tests/benchmarks/bench_pointerhash.cpp b/tests/benchmarks/bench_pointerhash.cpp
index 40ae5a0..1d8c58b 100644 (file)
--- a/tests/benchmarks/bench_pointerhash.cpp
+++ b/tests/benchmarks/bench_pointerhash.cpp
@@ -20,7 +20,7 @@
 #include <unordered_map>
 
 #include "bench_pointers.h"
-#include "indices.h"
+#include "src/util/indices.h"
 
 struct PointerHashMap
 {
@@ -52,4 +52,4 @@ int main()
 {
     benchPointers<PointerHashMap>();
     return 0;
-}
\ No newline at end of file
+}

diff --git a/tests/benchmarks/bench_pointermap.cpp b/tests/benchmarks/bench_pointermap.cpp
index 543df64..e8239a3 100644 (file)
--- a/tests/benchmarks/bench_pointermap.cpp
+++ b/tests/benchmarks/bench_pointermap.cpp
@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "pointermap.h"
+#include "src/util/pointermap.h"
 #include "bench_pointers.h"
 
 int main()
 {
     benchPointers<PointerMap>();
     return 0;
-}
\ No newline at end of file
+}

diff --git a/tests/benchmarks/bench_pointers.h b/tests/benchmarks/bench_pointers.h
index d7f2f53..6a0fd68 100644 (file)
--- a/tests/benchmarks/bench_pointers.h
+++ b/tests/benchmarks/bench_pointers.h
@@ -27,7 +27,7 @@
 
 #include <malloc.h>
 
-#include "indices.h"
+#include "src/util/indices.h"
 
 template<typename Map>
 void benchPointers()

diff --git a/tests/benchmarks/bench_pointersparsehash.cpp b/tests/benchmarks/bench_pointersparsehash.cpp
index 4437e1d..d78095d 100644 (file)
--- a/tests/benchmarks/bench_pointersparsehash.cpp
+++ b/tests/benchmarks/bench_pointersparsehash.cpp
@@ -19,7 +19,7 @@
 
 #include <sparse_hash_map>
 #include "bench_pointers.h"
-#include "indices.h"
+#include "src/util/indices.h"
 
 struct PointerHashMap
 {
@@ -46,4 +46,4 @@ int main()
 {
     benchPointers<PointerHashMap>();
     return 0;
-}
\ No newline at end of file
+}