public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: swagiaal@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: swagiaal: Added option to disable printing of source libraries. Fix 5401.
Date: Mon, 26 Nov 2007 17:09:00 -0000 [thread overview]
Message-ID: <20071126170900.32379.qmail@sourceware.org> (raw)
The branch, master has been updated
via a53854d586aa13ef63c92fad41fc90d5e5ef7648 (commit)
from ae5acf615f1c91eec8e564581ea6b146a1f5a1b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit a53854d586aa13ef63c92fad41fc90d5e5ef7648
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date: Mon Nov 26 11:44:35 2007 -0500
swagiaal: Added option to disable printing of source libraries. Fix 5401.
frysk-core/frysk/bindir/ChangeLog
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * fstack.java: Updated.
+
frysk-core/frysk/debuginfo/ChangeLog
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * VirtualDebugInfoFrame.java: Updated.
+ * DebugInfoFrame.java: Updated.
+
frysk-core/frysk/proc/dead/ChangeLog
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * TestLinuxCore.java: Updated, and disabled printing of libraries.
+
frysk-core/frysk/stack/ChangeLog
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * Frame.java (toPrint): Added a boolean for printing source
+ libraries.
+ * StackFactory.java: Updated.
+
frysk-core/frysk/util/ChangeLog
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * TestStackTraceAction.java: updated.
+ * StacktraceAction.java: Updated.
+ * StressTestStackTraceAction.java: Updated.
+
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/bindir/ChangeLog | 5 ++++
frysk-core/frysk/bindir/fstack.java | 2 +-
frysk-core/frysk/debuginfo/ChangeLog | 6 ++++
frysk-core/frysk/debuginfo/DebugInfoFrame.java | 4 +-
.../frysk/debuginfo/VirtualDebugInfoFrame.java | 2 +-
frysk-core/frysk/proc/dead/ChangeLog | 5 ++++
frysk-core/frysk/proc/dead/TestLinuxCore.java | 4 +-
frysk-core/frysk/stack/ChangeLog | 6 ++++
frysk-core/frysk/stack/Frame.java | 26 ++++++++++---------
frysk-core/frysk/stack/StackFactory.java | 4 +-
frysk-core/frysk/util/ChangeLog | 7 +++++
frysk-core/frysk/util/StacktraceAction.java | 6 +++-
.../frysk/util/StressTestStackTraceAction.java | 2 +-
frysk-core/frysk/util/TestStackTraceAction.java | 4 +-
14 files changed, 58 insertions(+), 25 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index bc95dbe..2e883cd 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * fstack.java: Updated.
+
2007-11-23 Sami Wagiaalla <swagiaal@redhat.com>
* TestFstack.java (testBackTraceWithDashN): Updated regex to not
diff --git a/frysk-core/frysk/bindir/fstack.java b/frysk-core/frysk/bindir/fstack.java
index 98e1046..8e4ac56 100644
--- a/frysk-core/frysk/bindir/fstack.java
+++ b/frysk-core/frysk/bindir/fstack.java
@@ -82,7 +82,7 @@ public final class fstack
boolean printParameters, boolean printScopes,
boolean fullpath)
{
- super(printWriter, theProc, theEvent, numberOfFrames, elfOnly,virtualFrames, printParameters, printScopes, fullpath);
+ super(printWriter, theProc, theEvent, numberOfFrames, elfOnly,virtualFrames, printParameters, printScopes, false, fullpath);
this.proc = theProc;
}
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 801e378..63a81b7 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * VirtualDebugInfoFrame.java: Updated.
+ * DebugInfoFrame.java: Updated.
+
2007-11-26 Stan Cox <scox@redhat.com>
* gen-type-expect-tests.py: Cleanup imports.
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index 3c17d38..657d399 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -205,7 +205,7 @@ public class DebugInfoFrame extends FrameDecorator {
return this.lines;
}
- void toPrint(PrintWriter writer, boolean printParameters,
+ public void toPrint(PrintWriter writer, boolean printParameters,
boolean fullpath){
Subprogram subprogram = this.getSubprogram();
@@ -237,7 +237,7 @@ public class DebugInfoFrame extends FrameDecorator {
}
} else {
- super.toPrint(writer, true);
+ super.toPrint(writer, true, fullpath);
}
}
diff --git a/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java b/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
index 41815f5..ae3ed76 100644
--- a/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
@@ -52,7 +52,7 @@ public class VirtualDebugInfoFrame extends DebugInfoFrame {
super(inner, decorated);
}
- void toPrint(PrintWriter writer, boolean printParameters,
+ public void toPrint(PrintWriter writer, boolean printParameters,
boolean fullpath) {
super.toPrint(writer, printParameters, fullpath);
writer.print(" [inline]");
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 377d92e..d0829f3 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * TestLinuxCore.java: Updated, and disabled printing of libraries.
+
2007-11-23 Sami Wagiaalla <swagiaal@redhat.com>
* TestLinuxCore.java: Updated.
diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java
index 3845f70..ec92a65 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxCore.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java
@@ -159,7 +159,7 @@ public class TestLinuxCore
liveStacktrace = new StacktraceAction(new PrintWriter(liveStackOutput),
testProc,
new RequestStopEvent(Manager.eventLoop),0,
- true, false, false, false, false)
+ true, false, false, false, false,false)
{
@@ -190,7 +190,7 @@ public class TestLinuxCore
coreStacktrace = new StacktraceAction(new PrintWriter(coreStackOutput),
coreProc,
new PrintEvent(),0,
- true, false, false, false ,
+ true, false, false, false ,false,
false)
{
diff --git a/frysk-core/frysk/stack/ChangeLog b/frysk-core/frysk/stack/ChangeLog
index 322be9e..7219da3 100644
--- a/frysk-core/frysk/stack/ChangeLog
+++ b/frysk-core/frysk/stack/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * Frame.java (toPrint): Added a boolean for printing source
+ libraries.
+ * StackFactory.java: Updated.
+
2007-11-26 Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
* LibunwindRegisterMapFactory.java: Adding the correct map to
diff --git a/frysk-core/frysk/stack/Frame.java b/frysk-core/frysk/stack/Frame.java
index 9a84283..47126c5 100644
--- a/frysk-core/frysk/stack/Frame.java
+++ b/frysk-core/frysk/stack/Frame.java
@@ -42,15 +42,15 @@ package frysk.stack;
import java.io.File;
import java.io.PrintWriter;
-import frysk.isa.Register;
import lib.dwfl.Dwfl;
import lib.dwfl.DwflModule;
import frysk.dwfl.DwflCache;
+import frysk.isa.Register;
import frysk.proc.Task;
import frysk.symtab.Symbol;
import frysk.symtab.SymbolFactory;
-import frysk.value.Value;
import frysk.value.ScratchLocation;
+import frysk.value.Value;
public abstract class Frame {
@@ -144,14 +144,14 @@ public abstract class Frame {
* @param printWriter
*/
public void toPrint (PrintWriter writer) {
- toPrint(writer, true);
+ toPrint(writer, true, true);
}
/**
* Write a simple string representation of this stack frame.
* @param printWriter
*/
- public void toPrint (PrintWriter writer, boolean fullpath) {
+ public void toPrint (PrintWriter writer, boolean printSource, boolean fullpath) {
// the address, padded with 0s based on the task's word size, ...
writer.write("0x");
String addr = Long.toHexString(getAddress());
@@ -165,14 +165,16 @@ public abstract class Frame {
writer.write(symbol.getDemangledName());
if (symbol != SymbolFactory.UNKNOWN)
writer.write(" ()");
- // the library if known ...
- File library = new File(getLibraryName());
- if (library != null) {
- writer.print(" from ");
- if (fullpath) {
- writer.print(library.getAbsolutePath());
- }else{
- writer.print(".../"+library.getName());
+ if(printSource){
+ // the library if known ...
+ File library = new File(getLibraryName());
+ if (library != null) {
+ writer.print(" from ");
+ if (fullpath) {
+ writer.print(library.getAbsolutePath());
+ }else{
+ writer.print(".../"+library.getName());
+ }
}
}
}
diff --git a/frysk-core/frysk/stack/StackFactory.java b/frysk-core/frysk/stack/StackFactory.java
index 4a68a58..d86139e 100644
--- a/frysk-core/frysk/stack/StackFactory.java
+++ b/frysk-core/frysk/stack/StackFactory.java
@@ -86,7 +86,7 @@ public class StackFactory
}
public static final void printTaskStackTrace(PrintWriter writer,
- Task task,
+ Task task,boolean printSource,
boolean fullpath, int numberOfFrames) {
if (task != null) {
writer.print("Task #");
@@ -102,7 +102,7 @@ public class StackFactory
frame.printLevel(writer);
writer.print(" ");
- frame.toPrint(writer, fullpath);
+ frame.toPrint(writer, printSource, fullpath);
writer.println();
}
}
diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog
index 10941ae..13120ed 100644
--- a/frysk-core/frysk/util/ChangeLog
+++ b/frysk-core/frysk/util/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-26 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Added a boolean for printing source libraries to Frame.toPrint().
+ * TestStackTraceAction.java: updated.
+ * StacktraceAction.java: Updated.
+ * StressTestStackTraceAction.java: Updated.
+
2007-11-26 Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
* PPC32LinuxElfCorefile.java: Using direct reference to registers,
diff --git a/frysk-core/frysk/util/StacktraceAction.java b/frysk-core/frysk/util/StacktraceAction.java
index 855eea3..496ebb7 100644
--- a/frysk-core/frysk/util/StacktraceAction.java
+++ b/frysk-core/frysk/util/StacktraceAction.java
@@ -82,6 +82,7 @@ public abstract class StacktraceAction
private final int numberOfFrames;
boolean printParameters;
boolean printScopes;
+ private final boolean printSource;
boolean fullpath;
private boolean virtualFrames;
@@ -105,7 +106,7 @@ public abstract class StacktraceAction
* file path is printed other wise only the name of the file is printed.
* @throws ProcException
*/
- public StacktraceAction (PrintWriter printWriter, Proc theProc, Event theEvent, int numberOfFrames, boolean elfOnly, boolean virtualFrames, boolean printParameters, boolean printScopes, boolean fullpath)
+ public StacktraceAction (PrintWriter printWriter, Proc theProc, Event theEvent, int numberOfFrames, boolean elfOnly, boolean virtualFrames, boolean printParameters, boolean printScopes, boolean printSource, boolean fullpath)
{
event = theEvent;
@@ -114,6 +115,7 @@ public abstract class StacktraceAction
this.elfOnly = elfOnly;
this.printParameters = printParameters;
this.printScopes = printScopes;
+ this.printSource = printSource;
this.fullpath = fullpath;
this.printWriter = printWriter;
@@ -151,7 +153,7 @@ public abstract class StacktraceAction
Task task = (Task) iter.next();
if(elfOnly){
- StackFactory.printTaskStackTrace(printWriter,task,fullpath, numberOfFrames);
+ StackFactory.printTaskStackTrace(printWriter,task,printSource, fullpath, numberOfFrames);
}else{
if(virtualFrames){
DebugInfoStackFactory.printVirtualTaskStackTrace(printWriter,task,numberOfFrames, printParameters,printScopes,fullpath);
diff --git a/frysk-core/frysk/util/StressTestStackTraceAction.java b/frysk-core/frysk/util/StressTestStackTraceAction.java
index 6b4e974..3ff5f75 100644
--- a/frysk-core/frysk/util/StressTestStackTraceAction.java
+++ b/frysk-core/frysk/util/StressTestStackTraceAction.java
@@ -88,7 +88,7 @@ public class StressTestStackTraceAction
{
proc.requestAbandonAndRunEvent(new RequestStopEvent(Manager.eventLoop));
}
- },0, true,false, false, false, true)
+ },0, true,false, false, false,true, true)
{
public void addFailed (Object observable, Throwable w)
diff --git a/frysk-core/frysk/util/TestStackTraceAction.java b/frysk-core/frysk/util/TestStackTraceAction.java
index 66b667b..98122c0 100644
--- a/frysk-core/frysk/util/TestStackTraceAction.java
+++ b/frysk-core/frysk/util/TestStackTraceAction.java
@@ -104,7 +104,7 @@ public class TestStackTraceAction
StacktraceAction stacker;
- stacker = new StacktraceAction(new PrintWriter(stringWriter),proc, new RequestStopEvent(Manager.eventLoop),20, true, false,false, false, true)
+ stacker = new StacktraceAction(new PrintWriter(stringWriter),proc, new RequestStopEvent(Manager.eventLoop),20, true, false,false, false, true, true)
{
public void addFailed (Object observable, Throwable w)
@@ -145,7 +145,7 @@ public class TestStackTraceAction
Proc proc = (Proc) iter.next();
StacktraceAction stacker;
- stacker = new StacktraceAction(new PrintWriter(stringWriter),proc, new RequestStopEvent(Manager.eventLoop),20, true, false,false, false,true)
+ stacker = new StacktraceAction(new PrintWriter(stringWriter),proc, new RequestStopEvent(Manager.eventLoop),20, true, false,false, false,true,true)
{
public void addFailed (Object observable, Throwable w)
hooks/post-receive
--
frysk system monitor/debugger
reply other threads:[~2007-11-26 17:09 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=20071126170900.32379.qmail@sourceware.org \
--to=swagiaal@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: link
Be 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).