public inbox for frysk-cvs@sourceware.org help / color / mirror / Atom feed
From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Contract foo () to foo() in elf backtrace. Date: Wed, 11 Jun 2008 18:24:00 -0000 [thread overview] Message-ID: <20080611182416.28483.qmail@sourceware.org> (raw) The branch, master has been updated via c712fc53a1e5ada9061d4f71990fccd70f4245d7 (commit) from a67d402d632120a8333704285870220e35a87328 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit c712fc53a1e5ada9061d4f71990fccd70f4245d7 Author: Andrew Cagney <cagney@toil.yyz.redhat.com> Date: Wed Jun 11 14:22:54 2008 -0400 Contract foo () to foo() in elf backtrace. frysk-core/frysk/hpd/ChangeLog 2008-06-11 Andrew Cagney <cagney@redhat.com> * TestBreakpoints.java: Update to match backtrace output. frysk-core/frysk/proc/dead/ChangeLog 2008-06-11 Andrew Cagney <cagney@redhat.com> * TestLinuxCore.java: Update to match stack trace output. frysk-core/frysk/stack/ChangeLog 2008-06-11 Andrew Cagney <cagney@redhat.com> * Frame.java: Drop space in "function ()". frysk-core/frysk/util/ChangeLog 2008-06-11 Andrew Cagney <cagney@redhat.com> * TestStackTraceAction.java: Update to match stack backtrace. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 4 ++++ frysk-core/frysk/hpd/TestBreakpoints.java | 2 +- frysk-core/frysk/proc/dead/ChangeLog | 4 ++++ frysk-core/frysk/proc/dead/TestLinuxCore.java | 10 +++++----- frysk-core/frysk/stack/ChangeLog | 4 ++++ frysk-core/frysk/stack/Frame.java | 9 ++++++--- frysk-core/frysk/util/ChangeLog | 4 ++++ frysk-core/frysk/util/TestStackTraceAction.java | 14 +++++++------- 8 files changed, 35 insertions(+), 16 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 9fb2ad2..31128ad 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Andrew Cagney <cagney@redhat.com> + + * TestBreakpoints.java: Update to match backtrace output. + 2008-06-10 Andrew Cagney <cagney@redhat.com> * StackCommands.java: Use setPrintPaths. diff --git a/frysk-core/frysk/hpd/TestBreakpoints.java b/frysk-core/frysk/hpd/TestBreakpoints.java index 2fe15a3..7a8d12c 100644 --- a/frysk-core/frysk/hpd/TestBreakpoints.java +++ b/frysk-core/frysk/hpd/TestBreakpoints.java @@ -96,7 +96,7 @@ public class TestBreakpoints e.send("go\n"); e.expect("go.*" + prompt + ".*Breakpoint.*sin.*"); e.send("where\n"); - e.expect("where.*#0.* (__)?sin \\(\\).*" + prompt); + e.expect("where.*#0.* (__)?sin\\(\\).*" + prompt); e.send("quit\n"); e.expect("Quitting..."); e.close(); diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index f42839c..83851a5 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Andrew Cagney <cagney@redhat.com> + + * TestLinuxCore.java: Update to match stack trace output. + 2008-06-10 Andrew Cagney <cagney@redhat.com> * TestLinuxCore.java: Use PrintDebugInfoStackOptions. diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java index baeac70..9bd63d4 100644 --- a/frysk-core/frysk/proc/dead/TestLinuxCore.java +++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java @@ -132,10 +132,10 @@ public class TestLinuxCore extends TestLib { String mainThread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*" - + "#[\\d]+ 0x[\\da-f]+ in server \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in main \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in __libc_start_main \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in _start \\(\\).*\n\n"; + + "#[\\d]+ 0x[\\da-f]+ in server\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in main\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in __libc_start_main\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in _start\\(\\).*\n\n"; String regex = new String(); regex += "(" + mainThread + ")"; @@ -143,7 +143,7 @@ public class TestLinuxCore extends TestLib { String result = coreStackOutput.getBuffer().toString(); assertTrue(result + "should match: " + regex + " threads", - result.matches(regex)); + result.matches(regex)); } diff --git a/frysk-core/frysk/stack/ChangeLog b/frysk-core/frysk/stack/ChangeLog index e766365..8e99fc2 100644 --- a/frysk-core/frysk/stack/ChangeLog +++ b/frysk-core/frysk/stack/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Andrew Cagney <cagney@redhat.com> + + * Frame.java: Drop space in "function ()". + 2008-06-10 Andrew Cagney <cagney@redhat.com> * Frame.java (toPrint): Use printLibraryPaths. diff --git a/frysk-core/frysk/stack/Frame.java b/frysk-core/frysk/stack/Frame.java index 5405ae7..6ba3dc1 100644 --- a/frysk-core/frysk/stack/Frame.java +++ b/frysk-core/frysk/stack/Frame.java @@ -155,8 +155,10 @@ public abstract class Frame { Symbol symbol = getSymbol(); writer.write(" in "); writer.write(symbol.getDemangledName()); - if (symbol != SymbolFactory.UNKNOWN) - writer.write(" ()"); + if (symbol != SymbolFactory.UNKNOWN) { + // XXX: Perhaps this should not print the (). + writer.write("()"); + } printLibraryName(writer, options); } @@ -164,7 +166,8 @@ public abstract class Frame { * If requrested by the stack options, print the library name * using the form " from LIBRARY". */ - protected void printLibraryName(PrintWriter writer, PrintStackOptions options) { + protected void printLibraryName(PrintWriter writer, + PrintStackOptions options) { if (options.printLibraryNames()) { // the library if known ... String library = getLibraryName(); diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog index bb8009f..2d04425 100644 --- a/frysk-core/frysk/util/ChangeLog +++ b/frysk-core/frysk/util/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Andrew Cagney <cagney@redhat.com> + + * TestStackTraceAction.java: Update to match stack backtrace. + 2008-06-10 Andrew Cagney <cagney@redhat.com> * TestStackTraceAction.java: Use setPrintPaths. diff --git a/frysk-core/frysk/util/TestStackTraceAction.java b/frysk-core/frysk/util/TestStackTraceAction.java index 42fe49b..3fd33cf 100644 --- a/frysk-core/frysk/util/TestStackTraceAction.java +++ b/frysk-core/frysk/util/TestStackTraceAction.java @@ -86,15 +86,15 @@ public class TestStackTraceAction extends TestLib { StringWriter stringWriter = new StringWriter(); String mainThread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*" - + "#[\\d]+ 0x[\\da-f]+ in server \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in main \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in __libc_start_main \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in _start \\(\\).*\n\n"; + + "#[\\d]+ 0x[\\da-f]+ in server\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in main\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in __libc_start_main\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in _start\\(\\).*\n\n"; String thread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*" - + "#[\\d]+ 0x[\\da-f]+ in server \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in start_thread \\(\\).*\n" - + "#[\\d]+ 0x[\\da-f]+ in (__)?clone \\(\\).*\n\n"; + + "#[\\d]+ 0x[\\da-f]+ in server\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in start_thread\\(\\).*\n" + + "#[\\d]+ 0x[\\da-f]+ in (__)?clone\\(\\).*\n\n"; final Proc proc = ackProc.assertRunToFindProc(); hooks/post-receive -- frysk system monitor/debugger
reply other threads:[~2008-06-11 18:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080611182416.28483.qmail@sourceware.org \ --to=cagney@sourceware.org \ --cc=frysk-cvs@sourceware.org \ --cc=frysk@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).