Revise stacktrace printing

caclark · caclark · commit 05cc9fa3ef3e · 2025-11-24T17:49:56.000Z
libdwarf used by backward.h created versioning problems after
development system was updated to Ubuntu 25.04.

- third-party/backward.h is deleted. Backtrace printing uses only
backtrace, backtrace_symbols_fd and code within log_print_backtrace()
- HAVE_DEVELOPER and extended_stacktrace are deleted
- SA_SIGINFO is not checked for - it is assumed to be set
- buildtype=release - for debugging use meson setup --buildtype=debug
build
diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml
@@ -56,7 +56,6 @@ jobs:
             mkdir -p $GITHUB_WORKSPACE/AppDir/usr
             meson setup \
               -Ddoxygen=disabled \
-              -Dextended_stacktrace=disabled \
               -Dunit_tests=disabled \
               -Dyelp-build=disabled \
               -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
diff --git a/.github/workflows/appimage-minimal-aarch64.yml b/.github/workflows/appimage-minimal-aarch64.yml
@@ -47,7 +47,6 @@ jobs:
               -Dexecinfo=disabled \
               -Dexiv2=disabled \
               -Dexr=disabled \
-              -Dextended_stacktrace=disabled \
               -Dfits=disabled \
               -Dgps-map=disabled \
               -Dheif=disabled \
diff --git a/.github/workflows/appimage-minimal-x86_64.yml b/.github/workflows/appimage-minimal-x86_64.yml
@@ -61,7 +61,6 @@ jobs:
             -Dexecinfo=disabled
             -Dexiv2=disabled
             -Dexr=disabled
-            -Dextended_stacktrace=disabled
             -Dfits=disabled
             -Dgit=disabled
             -Dgps-map=disabled
diff --git a/.github/workflows/appimage-x86_64.yml b/.github/workflows/appimage-x86_64.yml
@@ -79,7 +79,6 @@ jobs:
           setup-options: >
             --prefix=/usr
             --datadir=share
-            -Dextended_stacktrace=disabled
           options: --verbose
           meson-version: 1.3.2
 
diff --git a/.github/workflows/check-build-actions.yml b/.github/workflows/check-build-actions.yml
@@ -48,7 +48,6 @@ jobs:
           -Dexecinfo=disabled
           -Dexiv2=disabled
           -Dexr=disabled
-          -Dextended_stacktrace=disabled
           -Dfits=disabled
           -Dgit=disabled
           -Dgps-map=disabled
@@ -110,7 +109,6 @@ jobs:
           -Dexecinfo=disabled
           -Dexiv2=disabled
           -Dexr=disabled
-          -Dextended_stacktrace=disabled
           -Dfits=disabled
           -Dgit=disabled
           -Dgps-map=disabled
diff --git a/config.h.in b/config.h.in
@@ -226,9 +226,6 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-/* Define to enable extended stack trace support */
-#mesondefine HAVE_DEVELOPER
-
 /* Define to 1 if you have the <execinfo.h> header file. */
 #mesondefine HAVE_EXECINFO_H
 
diff --git a/meson.build b/meson.build
@@ -46,7 +46,7 @@ project(
     version : run_command('./version.sh', check : true).stdout().strip(),
     license : ['GPL-2.0-or-later'],
     meson_version : '>=1.3.2',
-    default_options : ['cpp_std=c++17', 'warning_level=3', 'buildtype=debugoptimized', 'cpp_link_args=-rdynamic']
+    default_options : ['cpp_std=c++17', 'warning_level=3', 'buildtype=release', 'cpp_link_args=-rdynamic']
 )
 
 # To inhibit warnings from the generated file icons.h
@@ -159,33 +159,6 @@ else
 endif
 glib_dep = dependency('glib-2.0', version : '>=2.66', required: true)
 
-# Required only when backward-cpp is used
-conf_data.set('HAVE_DEVELOPER', 0)
-libdw_dep = []
-libunwind_dep = []
-option = get_option('extended_stacktrace')
-if not option.disabled()
-    libdw_dep = dependency('libdw', required : false)
-    if libdw_dep.found()
-        libunwind_dep = dependency('libunwind', required : false)
-        if libunwind_dep.found()
-            if cc.has_link_argument('-ldwarf')
-                add_project_link_arguments('-ldwarf', language: 'cpp')
-                conf_data.set('HAVE_DEVELOPER', 1)
-                summary({'developer mode' : ['extended stacktrace:', true]}, section : 'Debugging', bool_yn : true)
-            else
-                summary({'developer mode' : ['link argument -ldwarf not found. extended stacktrace:', false]}, section : 'Debugging', bool_yn : true)
-            endif
-        else
-            summary({'developer mode' : ['libunwind not found. extended stacktrace:', false]}, section : 'Debugging', bool_yn : true)
-        endif
-    else
-        summary({'developer mode' : ['libdw not found. extended stacktrace:', false]}, section : 'Debugging', bool_yn : true)
-    endif
-else
-    summary({'developer mode' : ['extended stacktrace:', false]}, section : 'Debugging', bool_yn : true)
-endif
-
 # Required only for seg. fault stacktrace and backtrace debugging
 conf_data.set('HAVE_EXECINFO_H', 0)
 option = get_option('execinfo')
@@ -204,6 +177,11 @@ else
     summary({'execinfo' : ['stacktrace supported:', false]}, section : 'Debugging', bool_yn : true)
 endif
 
+# To override the default of 'release', run 'meson setup --buildtype=debug build'
+# That is necessary for stacktrace output
+buildtype = get_option('buildtype')
+summary({'buildtype' : buildtype}, section : 'Debugging')
+
 conf_data.set('ENABLE_UNIT_TESTS', 0)
 option = get_option('unit_tests')
 if not option.disabled()
diff --git a/meson_options.txt b/meson_options.txt
@@ -31,7 +31,6 @@ option('evince', type : 'feature', value : 'auto', description : 'print preview'
 option('execinfo', type : 'feature', value : 'auto', description : 'execinfo.h')
 option('exiv2', type : 'feature', value : 'auto', description : 'exiv2')
 option('exr', type : 'feature', value : 'auto', description : 'exr')
-option('extended_stacktrace', type : 'feature', value : 'auto', description : 'extended stacktrace')
 option('fits', type : 'feature', value : 'auto', description : 'fits')
 option('git', type : 'feature', value : 'auto', description : 'lua-api and changelog.html')
 option('gps-map', type : 'feature', value : 'auto', description : 'gps map')
diff --git a/scripts/geeqie.cppcheck b/scripts/geeqie.cppcheck
@@ -15,7 +15,6 @@
         <define name="HAVE_ARCHIVE"/>
         <define name="HAVE_CLUTTER"/>
         <define name="HAVE_DJVU"/>
-        <define name="HAVE_DEVELOPER"/>
         <define name="HAVE_EXECINFO_H"/>
         <define name="HAVE_EXIV2"/>
         <define name="HAVE_EXIV2_ERROR_CODE"/>
diff --git a/scripts/test-all.sh b/scripts/test-all.sh
@@ -42,7 +42,7 @@ export XDG_DATA_HOME
 rm --recursive --force build
 tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
 
-# Check with all options disabled
+# Check with all options disabled except for developer
 meson setup \
 -Darchive=disabled \
 -Dcms=disabled \
@@ -52,7 +52,6 @@ meson setup \
 -Dexecinfo=disabled \
 -Dexiv2=disabled \
 -Dexr=disabled \
--Dextended_stacktrace=disabled \
 -Dfits=disabled \
 -Dgit=disabled \
 -Dgps-map=disabled \
@@ -73,6 +72,7 @@ meson setup \
 -Dvideothumbnailer=disabled \
 -Dwebp=disabled \
 -Dyelp-build=disabled \
+--buildtype=debug \
 build
 
 if ninja test -C build
@@ -86,7 +86,7 @@ cp ./build/meson-logs/meson-log.txt "$tmpdir/testlog-options-disabled.txt"
 cat ./build/meson-logs/testlog.txt >> "$tmpdir/testlog-options-disabled.txt"
 
 rm --recursive --force build
-meson setup -Dunit_tests=enabled build
+meson setup --buildtype=debug -Dunit_tests=enabled build
 if ninja test -C build
 then
 	options_enabled="PASS"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -84,7 +84,6 @@ parts:
       - --prefix=/usr
       - --wrap-mode=default
       - -Ddoxygen=disabled
-      - -Dextended_stacktrace=disabled
       - -Dgit=disabled
       - -Dhelp_pdf=disabled
       - -Dpandoc=disabled
diff --git a/src/debug.cc b/src/debug.cc
@@ -28,8 +28,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
-
-#include <config.h>
+#include <iostream>
+#include <regex>
 
 #if HAVE_EXECINFO_H
 #  include <execinfo.h>
@@ -269,6 +269,38 @@ gchar *get_regexp()
  * The log window F1 command and Edit/Preferences/Behavior/Log Window F1
  * Command may be used to open an editor at a backtrace location.
  */
+
+static std::string extract_function_name(const std::string &input)
+{
+	/* String may be of style:
+	 * (anonymous namespace)::osd_tag_button_new((anonymous namespace)::OsdTag const&, _GtkWidget*) at \
+	 *  /home/<project src>/build/../src/osd.cc:137
+	 * or:
+	 * osd_new(int, _GtkWidget*) at /home/<project src>/build/../src/osd.cc:319 (discriminator 1)
+	 *
+	 * Only the function name is required
+	 */
+
+	/* Strip everything after " at "
+	 */
+	size_t at_pos = input.find(" at ");
+	std::string lhs = (at_pos == std::string::npos) ? input : input.substr(0, at_pos);
+
+	/* Regex to match: optional namespaces + function name + '('
+	 * e.g.  (anonymous namespace)::osd_tag_button_new(
+	 *        osd_new(
+	 */
+	std::regex re(R"((?:[\w\(\) ]+::)*(\w+)\s*\()");
+	std::smatch m;
+
+	if (std::regex_search(lhs, m, re))
+		{
+		return m[1].str();   // capture group 1 = function name only
+		}
+
+	return "";
+}
+
 void log_print_backtrace(const gchar *file, gint line, const gchar *function)
 {
 	FILE *fp;
@@ -286,7 +318,7 @@ void log_print_backtrace(const gchar *file, gint line, const gchar *function)
 		bt_size = backtrace(bt, 1024);
 		bt_syms = backtrace_symbols(bt, bt_size);
 
-		log_printf("Backtrace start");
+		log_printf("\nBacktrace start");
 		log_printf("%s/../%s:%d %s\n", exe_path, file, line, function);
 
 		/* Last item is always "??:?", so ignore it */
@@ -318,7 +350,66 @@ void log_print_backtrace(const gchar *file, gint line, const gchar *function)
 						gchar *paren = g_strstr_len(path, path_len, "(");
 						g_autofree gchar *function_name = paren ? g_strndup(path, paren - path) : g_strdup("");
 
-						log_printf("%s %s", g_strstr_len(path, -1, "at ") + 3, function_name);
+						log_printf("\n%s", g_strstr_len(path, -1, "at ") + 3);
+						log_printf("%s", extract_function_name(path).c_str());
+
+						std::string line = path;
+
+						size_t at_pos = line.find("at ");
+						if (at_pos != std::string::npos)
+							{
+							at_pos += 3; // move past "at "
+
+							size_t end_pos = line.find(' ', at_pos);
+							if (end_pos == std::string::npos)
+								end_pos = line.length();
+
+							std::string extracted = line.substr(at_pos, end_pos - at_pos);
+
+							// Step 1: Split into path and line number
+							size_t colon_pos = extracted.rfind(':');
+							if (colon_pos == std::string::npos)
+								{
+								std::cerr << _("Invalid input format\n");
+								return ;
+								}
+
+							std::string path = extracted.substr(0, colon_pos);
+							int line_number = std::stoi(extracted.substr(colon_pos + 1));
+
+							// Step 2: Open the file
+							std::ifstream file(path);
+							if (!file)
+								{
+								std::cerr << _("Failed to open file: ") << path << "\n";
+								return ;
+								}
+
+							// Step 3: Read all lines
+							std::vector<std::string> lines;
+							std::string line;
+							while (std::getline(file, line))
+								{
+								lines.push_back(line);
+								}
+
+							// Step 4: Print 4 lines before and after the target line
+							int start = std::max(0, line_number - 5); // line_number is 1-based
+							int end = std::min(static_cast<int>(lines.size()), line_number + 4);
+
+							for (int i = start; i < end; ++i)
+								{
+								// Highlight the target line
+								if (i == line_number - 1)
+									{
+									log_printf(">%d | %s", i + 1, lines[i].c_str());
+									}
+								else
+									{
+									log_printf(" %d | %s", i + 1, lines[i].c_str());
+									}
+								}
+							}
 						}
 					}
 
@@ -359,10 +450,10 @@ void log_print_file_data_dump(const gchar *file, gint line, const gchar *functio
 
 /**
  * @brief Print memory usage and runtime
- * @param file 
- * @param line 
- * @param function 
- * 
+ * @param file
+ * @param line
+ * @param function
+ *
  */
 void log_print_ru(const gchar *file, gint line, const gchar *function)
 {
diff --git a/src/main.cc b/src/main.cc
@@ -52,10 +52,6 @@
 #  include <libintl.h>
 #endif
 
-#if HAVE_DEVELOPER
-#include "third-party/backward.h"
-#endif
-
 #include "cache-maint.h"
 #include "cache.h"
 #include "collect-io.h"
@@ -207,8 +203,6 @@ GOptionEntry command_line_options_cache_maintenance[] =
 	{ nullptr            ,   0, G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE  , nullptr, nullptr                                             , nullptr },
 };
 
-#if !HAVE_DEVELOPER
-#if defined(SA_SIGINFO)
 void sig_handler_cb(int signo, siginfo_t *info, void *)
 {
 	gchar hex_char[16];
@@ -309,28 +303,10 @@ void sig_handler_cb(int signo, siginfo_t *info, void *)
 	backtrace_symbols_fd(bt, bt_size, STDERR_FILENO);
 #endif
 
-	exit(EXIT_FAILURE);
-}
-#else /* defined(SA_SIGINFO) */
-void sig_handler_cb(int)
-{
-#if HAVE_EXECINFO_H
-	gint bt_size;
-	void *bt[1024];
-#endif
-
-	write(STDERR_FILENO, "Geeqie fatal error\n", 19);
-	write(STDERR_FILENO, "Signal: Segmentation fault\n", 27);
-
-#if HAVE_EXECINFO_H
-	bt_size = backtrace(bt, 1024);
-	backtrace_symbols_fd(bt, bt_size, STDERR_FILENO);
-#endif
+	BACKTRACE(DEBUG);
 
 	exit(EXIT_FAILURE);
 }
-#endif /* defined(SA_SIGINFO) */
-#endif /* !HAVE_DEVELOPER */
 
 gboolean search_command_line_for_option(const gint argc, const gchar* const argv[], const gchar* option_name)
 {
@@ -685,7 +661,6 @@ void sigbus_handler_cb_unused(int, [[maybe_unused]] siginfo_t *info, void *)
 
 #pragma GCC diagnostic pop
 
-#if !HAVE_DEVELOPER
 void setup_sig_handler()
 {
 	struct sigaction sigsegv_action;
@@ -700,7 +675,6 @@ void setup_sig_handler()
 	sigaction(SIGIOT, &sigsegv_action, nullptr);
 	sigaction(SIGSEGV, &sigsegv_action, nullptr);
 }
-#endif
 
 void set_theme_bg_color()
 {
@@ -784,11 +758,7 @@ gint shutdown_cache_maintenance_cb(GtkApplication *, gpointer)
 void startup_common(GtkApplication *, gpointer)
 {
 	/* seg. fault handler */
-#if HAVE_DEVELOPER
-	backward::SignalHandling sh {};
-#else
 	setup_sig_handler();
-#endif
 
 	/* init execution time counter (debug only) */
 	init_exec_time();
diff --git a/src/main.h b/src/main.h
@@ -39,6 +39,7 @@ extern gchar *instance_identifier;
 void exit_program();
 
 #define CASE_SORT (options->file_sort.case_sensitive ? strcmp : strcasecmp)
+#define BACKTRACE(name) name##_BT() // To avoid errors messages from DEBUG_x statement checks
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
diff --git a/src/meson.build b/src/meson.build
diff --git a/src/third-party/backward.h b/src/third-party/backward.h
diff --git a/src/third-party/meson.build b/src/third-party/meson.build
