Add "VALGRIND" build type

Separate build type specialized for debugging memory leaks.
Example usage with GBS for Tizen:
  $ gbs build --define "build_type VALGRIND"

Change-Id: I7e150609021508541427ff009fa28b97a6004daf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77a6a358af5b4621abc70b161c39ff4c95800f26..d3d885a9f385748449ca725a76c79ca3a95acd39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,7 @@ SET(CMAKE_CXX_FLAGS_PROFILING  "-g -std=c++0x -O0 -pg -Wp,-U_FORTIFY_SOURCE")
 SET(CMAKE_CXX_FLAGS_DEBUG      "-g -std=c++0x -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
 SET(CMAKE_CXX_FLAGS_RELEASE    "-g -std=c++0x -O2")
 SET(CMAKE_CXX_FLAGS_CCOV       "-g -std=c++0x -O2 --coverage")
+SET(CMAKE_CXX_FLAGS_VALGRIND   "-ggdb -std=c++0x -O0 -fno-inline -Wp,-U_FORTIFY_SOURCE")
 
 # If supported for the target machine, emit position-independent code,suitable
 # for dynamic linking and avoiding any limit on the size of the global offset

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index a03f207bfaba02ac67e972a8d65176b5347e5bde..8d24815a3a2208d02cef6418f115d1cbe1a8ec72 100644 (file)
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -11,6 +11,9 @@ Source4:    libnss-security-manager.manifest
 Source5:    security-manager-tests.manifest
 Requires: security-manager-policy
 Requires: nether
+%if "%{build_type}" == "VALGRIND"
+Requires: valgrind
+%endif
 Requires(post): sqlite3
 Requires(post): smack
 BuildRequires: cmake

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 8d0a1aa8e47f202d081ba907b525c395396e1322..3e20c9b551b6887f6dd5551f692a0edd39b81e8b 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,4 +1,9 @@
-CONFIGURE_FILE(security-manager.service.in security-manager.service @ONLY)
+IF(CMAKE_BUILD_TYPE MATCHES "VALGRIND")
+    CONFIGURE_FILE(security-manager-valgrind.service.in security-manager.service @ONLY)
+ELSE()
+    CONFIGURE_FILE(security-manager.service.in security-manager.service @ONLY)
+ENDIF()
+
 CONFIGURE_FILE(security-manager-cleanup.service.in security-manager-cleanup.service @ONLY)
 CONFIGURE_FILE(security-manager-rules-loader.service.in security-manager-rules-loader.service @ONLY)
 

diff --git a/systemd/security-manager-valgrind.service.in b/systemd/security-manager-valgrind.service.in
new file mode 100644 (file)
index 0000000..ad02fcf
--- /dev/null
+++ b/systemd/security-manager-valgrind.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=Start the security manager
+Before=dbus.service
+
+[Service]
+Type=notify
+Environment="GLIBCXX_FORCE_NEW=1"
+ExecStart=@BIN_INSTALL_DIR@/valgrind -v --tool=memcheck --log-file=/tmp/security-manager.valgrind.%%p.log --num-callers=20 --leak-resolution=high --leak-check=full --show-reachable=yes --track-origins=yes @BIN_INSTALL_DIR@/security-manager
+#ExecStart=@BIN_INSTALL_DIR@/valgrind -v --tool=massif --log-file=/tmp/security-manager.valgrind.%%p.log --massif-out-file=/tmp/security-manager.massif.%%p.log @BIN_INSTALL_DIR@/security-manager
+Sockets=security-manager.socket
+Restart=always
+SmackProcessLabel=System::Privileged
+
+[Install]
+WantedBy=dbus.service