|
 |
01add4 |
From 0fcd63190deeb0afa2ad04826da99e5632f9d517 Mon Sep 17 00:00:00 2001
|
|
|
01add4 |
From: Martin Milata <mmilata@redhat.com>
|
|
|
01add4 |
Date: Mon, 14 Jul 2014 16:53:12 +0200
|
|
|
01add4 |
Subject: [SATYR PATCH 4/6] gdb: fix parsing of ppc64 stacktraces
|
|
|
01add4 |
|
|
|
01add4 |
Fixes rhbz#1119072.
|
|
|
01add4 |
|
|
|
01add4 |
Signed-off-by: Martin Milata <mmilata@redhat.com>
|
|
|
01add4 |
---
|
|
|
01add4 |
lib/gdb_frame.c | 3 +-
|
|
|
01add4 |
tests/gdb_stacktrace.at | 35 ++++++++++++++++++++
|
|
|
01add4 |
tests/gdb_stacktraces/rhbz-1119072 | 67 ++++++++++++++++++++++++++++++++++++++
|
|
|
01add4 |
3 files changed, 104 insertions(+), 1 deletion(-)
|
|
|
01add4 |
create mode 100644 tests/gdb_stacktraces/rhbz-1119072
|
|
|
01add4 |
|
|
|
01add4 |
diff --git a/lib/gdb_frame.c b/lib/gdb_frame.c
|
|
|
01add4 |
index 57e9479..e449b30 100644
|
|
|
01add4 |
--- a/lib/gdb_frame.c
|
|
|
01add4 |
+++ b/lib/gdb_frame.c
|
|
|
01add4 |
@@ -559,12 +559,13 @@ sr_gdb_frame_parse_function_name(const char **input,
|
|
|
01add4 |
/* First character:
|
|
|
01add4 |
'~' for destructor
|
|
|
01add4 |
'*' for ????
|
|
|
01add4 |
+ '.' on ppc64
|
|
|
01add4 |
'_a-zA-Z' for mangled/nonmangled function name
|
|
|
01add4 |
'(' to start "(anonymous namespace)::" or something
|
|
|
01add4 |
*/
|
|
|
01add4 |
char first;
|
|
|
01add4 |
char *namechunk;
|
|
|
01add4 |
- if (sr_parse_char_limited(&local_input, "~*_" SR_alpha, &first))
|
|
|
01add4 |
+ if (sr_parse_char_limited(&local_input, "~*._" SR_alnum, &first))
|
|
|
01add4 |
{
|
|
|
01add4 |
/* If it's a start of 'o'perator, put the 'o' back! */
|
|
|
01add4 |
if (first == 'o')
|
|
|
01add4 |
diff --git a/tests/gdb_stacktrace.at b/tests/gdb_stacktrace.at
|
|
|
01add4 |
index 8832cb8..f626417 100644
|
|
|
01add4 |
--- a/tests/gdb_stacktrace.at
|
|
|
01add4 |
+++ b/tests/gdb_stacktrace.at
|
|
|
01add4 |
@@ -247,3 +247,38 @@ main(void)
|
|
|
01add4 |
return 0;
|
|
|
01add4 |
}
|
|
|
01add4 |
]])
|
|
|
01add4 |
+
|
|
|
01add4 |
+## ----------------------------- ##
|
|
|
01add4 |
+## sr_gdb_stacktrace_parse_ppc64 ##
|
|
|
01add4 |
+## ----------------------------- ##
|
|
|
01add4 |
+AT_TESTFUN([sr_gdb_stacktrace_parse_ppc64],
|
|
|
01add4 |
+[[
|
|
|
01add4 |
+#include "gdb/stacktrace.h"
|
|
|
01add4 |
+#include "gdb/thread.h"
|
|
|
01add4 |
+#include "gdb/frame.h"
|
|
|
01add4 |
+#include "location.h"
|
|
|
01add4 |
+#include "utils.h"
|
|
|
01add4 |
+#include <assert.h>
|
|
|
01add4 |
+#include <stdio.h>
|
|
|
01add4 |
+
|
|
|
01add4 |
+int
|
|
|
01add4 |
+main(void)
|
|
|
01add4 |
+{
|
|
|
01add4 |
+ /* Check that satyr is able to parse backtrace with missing Thread header */
|
|
|
01add4 |
+ struct sr_location location;
|
|
|
01add4 |
+ sr_location_init(&location);
|
|
|
01add4 |
+ char *error_message;
|
|
|
01add4 |
+ char *full_input = sr_file_to_string("../../gdb_stacktraces/rhbz-1119072", &error_message);
|
|
|
01add4 |
+ assert(full_input);
|
|
|
01add4 |
+ char *input = full_input;
|
|
|
01add4 |
+ struct sr_gdb_stacktrace *stacktrace = sr_gdb_stacktrace_parse(&input, &location);
|
|
|
01add4 |
+ assert(stacktrace);
|
|
|
01add4 |
+ assert(5 == sr_gdb_stacktrace_get_thread_count(stacktrace));
|
|
|
01add4 |
+ struct sr_gdb_thread *thread = stacktrace->threads;
|
|
|
01add4 |
+ assert(7 == sr_thread_frame_count(thread));
|
|
|
01add4 |
+ struct sr_gdb_frame *frame = thread->frames;
|
|
|
01add4 |
+ assert(0 == strcmp(frame->function_name, ".pthread_cond_timedwait"));
|
|
|
01add4 |
+ sr_gdb_stacktrace_free(stacktrace);
|
|
|
01add4 |
+ return 0;
|
|
|
01add4 |
+}
|
|
|
01add4 |
+]])
|
|
|
01add4 |
diff --git a/tests/gdb_stacktraces/rhbz-1119072 b/tests/gdb_stacktraces/rhbz-1119072
|
|
|
01add4 |
new file mode 100644
|
|
|
01add4 |
index 0000000..2aca936
|
|
|
01add4 |
--- /dev/null
|
|
|
01add4 |
+++ b/tests/gdb_stacktraces/rhbz-1119072
|
|
|
01add4 |
@@ -0,0 +1,67 @@
|
|
|
01add4 |
+[New LWP 2271]
|
|
|
01add4 |
+[New LWP 2374]
|
|
|
01add4 |
+[New LWP 2325]
|
|
|
01add4 |
+[New LWP 2360]
|
|
|
01add4 |
+[New LWP 2375]
|
|
|
01add4 |
+[Thread debugging using libthread_db enabled]
|
|
|
01add4 |
+Using host libthread_db library "/lib64/libthread_db.so.1".
|
|
|
01add4 |
+Core was generated by `caja '.
|
|
|
01add4 |
+Program terminated with signal SIGTRAP, Trace/breakpoint trap.
|
|
|
01add4 |
+#0 0x000000803a327a54 in .raise () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+
|
|
|
01add4 |
+Thread 5 (Thread 0x3fffa0ebeed0 (LWP 2375)):
|
|
|
01add4 |
+#0 0x000000803a321f24 in .pthread_cond_timedwait () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#1 0x000000803a748054 in .g_cond_wait_until () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#2 0x000000803a6ac2c8 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#3 0x000000803a720530 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#4 0x000000803a71f3f8 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#5 0x000000803a31c31c in .start_thread () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#6 0x000000803a20c150 in .__clone () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+
|
|
|
01add4 |
+Thread 4 (Thread 0x3fffa208eed0 (LWP 2360)):
|
|
|
01add4 |
+#0 0x000000803a1fd130 in .__GI___poll () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+#1 0x000000803a6fe0b0 in .g_poll () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#2 0x000000803a6e9ef4 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#3 0x000000803a6ea610 in .g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#4 0x000000803ae658c8 in 0000090f.plt_call.g_io_channel_flush+0 () from /usr/lib64/libgio-2.0.so.0
|
|
|
01add4 |
+#5 0x000000803a71f3f8 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#6 0x000000803a31c31c in .start_thread () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#7 0x000000803a20c150 in .__clone () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+
|
|
|
01add4 |
+Thread 3 (Thread 0x3fffa288eed0 (LWP 2325)):
|
|
|
01add4 |
+#0 0x000000803a1fd130 in .__GI___poll () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+#1 0x000000803a6fe0b0 in .g_poll () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#2 0x000000803a6e9ef4 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#3 0x000000803a6ea0a4 in .g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#4 0x00003fffa28ba8dc in 00000010.plt_call.g_hash_table_size+0 () from /usr/lib64/gio/modules/libdconfsettings.so
|
|
|
01add4 |
+#5 0x000000803a71f3f8 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#6 0x000000803a31c31c in .start_thread () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#7 0x000000803a20c150 in .__clone () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+
|
|
|
01add4 |
+Thread 2 (Thread 0x3fffa16beed0 (LWP 2374)):
|
|
|
01add4 |
+#0 0x000000803a1fd130 in .__GI___poll () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+#1 0x000000803a6fe0b0 in .g_poll () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#2 0x000000803a6e9ef4 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#3 0x000000803a6ea0a4 in .g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#4 0x000000803a6ea15c in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#5 0x000000803a71f3f8 in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#6 0x000000803a31c31c in .start_thread () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#7 0x000000803a20c150 in .__clone () from /usr/lib64/libc.so.6
|
|
|
01add4 |
+
|
|
|
01add4 |
+Thread 1 (Thread 0x3fffa9210490 (LWP 2271)):
|
|
|
01add4 |
+#0 0x000000803a327a54 in .raise () from /usr/lib64/libpthread.so.0
|
|
|
01add4 |
+#1 0x000000803a6f3dd8 in .g_logv () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#2 0x000000803a6f3ef8 in .g_log () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#3 0x000000803cd0c230 in 000002cd.plt_call.XmbTextExtents+0 () from /usr/lib64/libgdk-x11-2.0.so.0
|
|
|
01add4 |
+#4 0x000000803a9e0870 in ._XError () from /usr/lib64/libX11.so.6
|
|
|
01add4 |
+#5 0x000000803a9dc398 in 00000e9e.plt_call._XimXTransGetHostname+0 () from /usr/lib64/libX11.so.6
|
|
|
01add4 |
+#6 0x000000803a9dc514 in 00000e9e.plt_call._XimXTransGetHostname+0 () from /usr/lib64/libX11.so.6
|
|
|
01add4 |
+#7 0x000000803a9dd19c in ._XEventsQueued () from /usr/lib64/libX11.so.6
|
|
|
01add4 |
+#8 0x000000803a9c8d6c in .XPending () from /usr/lib64/libX11.so.6
|
|
|
01add4 |
+#9 0x000000803ccfbd74 in 000002cd.plt_call.XmbTextExtents+0 () from /usr/lib64/libgdk-x11-2.0.so.0
|
|
|
01add4 |
+#10 0x000000803ccfbf58 in 000002cd.plt_call.XmbTextExtents+0 () from /usr/lib64/libgdk-x11-2.0.so.0
|
|
|
01add4 |
+#11 0x000000803a6e9124 in .g_main_context_prepare () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#12 0x000000803a6e9d7c in 000000ca.plt_call.strncasecmp@@GLIBC_2.3+0 () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#13 0x000000803a6ea610 in .g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
|
|
|
01add4 |
+#14 0x000000803c839050 in .gtk_main () from /usr/lib64/libgtk-x11-2.0.so.0
|
|
|
01add4 |
+#15 0x0000000010051054 in .main ()
|
|
|
01add4 |
--
|
|
|
01add4 |
1.9.3
|
|
|
01add4 |
|