From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17017 invoked by alias); 1 Apr 2008 17:23:33 -0000 Received: (qmail 16989 invoked by uid 9561); 1 Apr 2008 17:23:33 -0000 Date: Tue, 01 Apr 2008 17:23:00 -0000 Message-ID: <20080401172333.16974.qmail@sourceware.org> From: swagiaal@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: swagiaal: Added check to check for vdso before prepending path. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ea8c6c869e6a411e1c7c056e37cbdc9841b85e71 X-Git-Newrev: 3bcb0f3091a543cab064e0254e7aed7a8a8e3fdc Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00008.txt.bz2 The branch, master has been updated via 3bcb0f3091a543cab064e0254e7aed7a8a8e3fdc (commit) from ea8c6c869e6a411e1c7c056e37cbdc9841b85e71 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 3bcb0f3091a543cab064e0254e7aed7a8a8e3fdc Author: Sami Wagiaalla Date: Mon Mar 31 14:57:11 2008 -0400 swagiaal: Added check to check for vdso before prepending path. frysk-core/frysk/stack/ChangeLog +2008-03-31 Sami Wagiaalla + + * Frame.java: Added check to check for vdso before prepending path. + ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/stack/ChangeLog | 4 ++++ frysk-core/frysk/stack/Frame.java | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/stack/ChangeLog b/frysk-core/frysk/stack/ChangeLog index f429c93..929ea6a 100644 --- a/frysk-core/frysk/stack/ChangeLog +++ b/frysk-core/frysk/stack/ChangeLog @@ -1,3 +1,7 @@ +2008-03-31 Sami Wagiaalla + + * Frame.java: Added check to check for vdso before prepending path. + 2008-03-21 Petr Machata * Frame.java: Use lib.dwfl.ElfSymbol instead of diff --git a/frysk-core/frysk/stack/Frame.java b/frysk-core/frysk/stack/Frame.java index 9c16552..cd1c293 100644 --- a/frysk-core/frysk/stack/Frame.java +++ b/frysk-core/frysk/stack/Frame.java @@ -170,18 +170,26 @@ public abstract class Frame { writer.write(symbol.getDemangledName()); if (symbol != SymbolFactory.UNKNOWN) writer.write(" ()"); + if(printSource){ // the library if known ... File library = new File(getLibraryName()); if (library != null) { writer.print(" from "); - if (fullpath) { - writer.print(library.getAbsolutePath()); + + if(library.getPath().contains("vdso") || library.getPath().contains("stack")){ + writer.print(library.getName()); }else{ - writer.print(".../"+library.getName()); + + if(fullpath){ + writer.print(library.getPath()); + }else{ + writer.print(".../"+library.getName()); + } + } } - } + } } public String getLibraryName() { hooks/post-receive -- frysk system monitor/debugger