From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15340 invoked by alias); 27 Feb 2008 03:21:38 -0000 Received: (qmail 15311 invoked by uid 367); 27 Feb 2008 03:21:37 -0000 Date: Wed, 27 Feb 2008 03:21:00 -0000 Message-ID: <20080227032137.15296.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete fstack.parseCoresFIXME. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 13eaab0224ce71fe031becc059a0d342b6047a4e X-Git-Newrev: 79569bf5e4b48be2efebcea902795514f238ca9f 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-q1/txt/msg00260.txt.bz2 The branch, master has been updated via 79569bf5e4b48be2efebcea902795514f238ca9f (commit) from 13eaab0224ce71fe031becc059a0d342b6047a4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 79569bf5e4b48be2efebcea902795514f238ca9f Author: Andrew Cagney Date: Tue Feb 26 22:20:25 2008 -0500 Delete fstack.parseCoresFIXME. frysk-core/frysk/bindir/ChangeLog 2008-02-26 Andrew Cagney * fstack.java (parseCores(Proc[])): Replace parseCoresFIXME. (stackCore(Proc)): Replace stackCore(CoreExePair). frysk-core/frysk/util/ChangeLog 2008-02-26 Andrew Cagney * Util.java (getProcFromCoreExePair(CoreExePair)): Delete. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 3 ++ frysk-core/frysk/bindir/fstack.java | 41 ++++++++++++++-------------------- frysk-core/frysk/util/ChangeLog | 2 + frysk-core/frysk/util/Util.java | 7 ------ 4 files changed, 22 insertions(+), 31 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 506f506..340a72c 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,5 +1,8 @@ 2008-02-26 Andrew Cagney + * fstack.java (parseCores(Proc[])): Replace parseCoresFIXME. + (stackCore(Proc)): Replace stackCore(CoreExePair). + * fauxv.java: Update to match ProcEvent. * fmaps.java: Ditto. * fexe.java: Ditto. diff --git a/frysk-core/frysk/bindir/fstack.java b/frysk-core/frysk/bindir/fstack.java index b25b682..0424525 100644 --- a/frysk-core/frysk/bindir/fstack.java +++ b/frysk-core/frysk/bindir/fstack.java @@ -50,9 +50,7 @@ import frysk.proc.Proc; import frysk.proc.ProcBlockAction; import frysk.proc.ProcCoreAction; import frysk.util.CommandlineParser; -import frysk.util.CoreExePair; import frysk.util.StacktraceAction; -import frysk.util.Util; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; @@ -136,14 +134,11 @@ public final class fstack } } - private static void stackCore(CoreExePair coreExePair) - { - - Proc proc = Util.getProcFromCoreExePair(coreExePair); - stacker = new Stacker(printWriter, proc, new PrintEvent(), numberOfFrames, elfOnly,virtualFrames,printParameters,printScopes, fullpath); - new ProcCoreAction(proc, stacker); - Manager.eventLoop.run(); - } + private static void stackCore(Proc proc) { + stacker = new Stacker(printWriter, proc, new PrintEvent(), numberOfFrames, elfOnly,virtualFrames,printParameters,printScopes, fullpath); + new ProcCoreAction(proc, stacker); + Manager.eventLoop.run(); + } private static void stackPid(Proc proc) { stacker = new Stacker(printWriter, proc, new AbandonPrintEvent(proc), numberOfFrames, elfOnly,virtualFrames,printParameters,printScopes, fullpath); @@ -154,20 +149,18 @@ public final class fstack public static void main (String[] args) { - parser = new CommandlineParser("fstack") - { - //@Override - public void parseCoresFIXME(CoreExePair[] coreExePairs) { - for (int i = 0; i < coreExePairs.length; i++) - stackCore(coreExePairs[i]); - } - - //@Override - public void parsePids(Proc[] procs) { - for (int i = 0; i < procs.length; i++) - stackPid(procs[i]); - } - }; + parser = new CommandlineParser("fstack") { + //@Override + public void parseCores(Proc[] cores) { + for (int i = 0; i < cores.length; i++) + stackCore(cores[i]); + } + //@Override + public void parsePids(Proc[] procs) { + for (int i = 0; i < procs.length; i++) + stackPid(procs[i]); + } + }; parser.add(new Option("number-of-frames", 'n', "number of frames to print. Use -n 0 or" + " -n all to print all frames.", "") { diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog index b129829..fbe5f51 100644 --- a/frysk-core/frysk/util/ChangeLog +++ b/frysk-core/frysk/util/ChangeLog @@ -1,5 +1,7 @@ 2008-02-26 Andrew Cagney + * Util.java (getProcFromCoreExePair(CoreExePair)): Delete. + * CommandlineParser.java: Add logging; check for null getMessage(). diff --git a/frysk-core/frysk/util/Util.java b/frysk-core/frysk/util/Util.java index 0bcce53..f3c1de3 100644 --- a/frysk-core/frysk/util/Util.java +++ b/frysk-core/frysk/util/Util.java @@ -70,13 +70,6 @@ public class Util return proc; } - public static Proc getProcFromCoreExePair(CoreExePair coreExePair) { - if (coreExePair.exeFile == null) - return getProcFromCoreFile(coreExePair.coreFile); - else - return getProcFromCoreFile(coreExePair.coreFile, coreExePair.exeFile); - } - /** * Return a Proc associated with the given pid. * @param procId The given pid. hooks/post-receive -- frysk system monitor/debugger