From 4e7dedede79872401f50c733bd74e5ddf1fa41f1 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 30 Nov 2019 22:55:04 -0500
Subject: [PATCH] bloaty show full demangle, increase number of lines, and
 combine segments + sections

---
 Jenkinsfile        |  4 ----
 cmake/bloaty.cmake | 13 +++----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e556dcdf6f..2b03631d92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -109,7 +109,6 @@ pipeline {
             sh 'make px4_io-v2_default'
             sh 'make px4_io-v2_default bloaty_compileunits'
             sh 'make px4_io-v2_default bloaty_inlines'
-            sh 'make px4_io-v2_default bloaty_sections'
             sh 'make px4_io-v2_default bloaty_segments'
             sh 'make px4_io-v2_default bloaty_symbols'
             sh 'make px4_io-v2_default bloaty_templates'
@@ -142,7 +141,6 @@ pipeline {
             sh 'make px4_fmu-v2_default'
             sh 'make px4_fmu-v2_default bloaty_compileunits'
             sh 'make px4_fmu-v2_default bloaty_inlines'
-            sh 'make px4_fmu-v2_default bloaty_sections'
             sh 'make px4_fmu-v2_default bloaty_segments'
             sh 'make px4_fmu-v2_default bloaty_symbols'
             sh 'make px4_fmu-v2_default bloaty_templates'
@@ -175,7 +173,6 @@ pipeline {
             sh 'make px4_fmu-v5_default'
             sh 'make px4_fmu-v5_default bloaty_compileunits'
             sh 'make px4_fmu-v5_default bloaty_inlines'
-            sh 'make px4_fmu-v5_default bloaty_sections'
             sh 'make px4_fmu-v5_default bloaty_segments'
             sh 'make px4_fmu-v5_default bloaty_symbols'
             sh 'make px4_fmu-v5_default bloaty_templates'
@@ -208,7 +205,6 @@ pipeline {
             sh 'make px4_sitl_default'
             sh 'make px4_sitl_default bloaty_compileunits'
             sh 'make px4_sitl_default bloaty_inlines'
-            sh 'make px4_sitl_default bloaty_sections'
             sh 'make px4_sitl_default bloaty_segments'
             sh 'make px4_sitl_default bloaty_symbols'
             sh 'make px4_sitl_default bloaty_templates'
diff --git a/cmake/bloaty.cmake b/cmake/bloaty.cmake
index 9f501de7c1..7a0f25b48e 100644
--- a/cmake/bloaty.cmake
+++ b/cmake/bloaty.cmake
@@ -34,7 +34,7 @@
 find_program(BLOATY_PROGRAM bloaty)
 if (BLOATY_PROGRAM)
 
-	set(BLOATY_OPTS --demangle=short --domain=vm -s vm -n 100 -w)
+	set(BLOATY_OPTS --demangle=full --domain=vm -s vm -n 200 -w)
 
 	# bloaty compilation units
 	add_custom_target(bloaty_compileunits
@@ -50,16 +50,9 @@ if (BLOATY_PROGRAM)
 		USES_TERMINAL
 		)
 
-	# bloaty sections
-	add_custom_target(bloaty_sections
-		COMMAND ${BLOATY_PROGRAM} -d sections ${BLOATY_OPTS} $<TARGET_FILE:px4>
-		DEPENDS px4
-		USES_TERMINAL
-		)
-
-	# bloaty segments
+	# bloaty segments,sections
 	add_custom_target(bloaty_segments
-		COMMAND ${BLOATY_PROGRAM} -d segments ${BLOATY_OPTS} $<TARGET_FILE:px4>
+		COMMAND ${BLOATY_PROGRAM} -d segments,sections ${BLOATY_OPTS} $<TARGET_FILE:px4>
 		DEPENDS px4
 		USES_TERMINAL
 		)