From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27786 invoked by alias); 5 Mar 2008 18:11:57 -0000 Received: (qmail 27748 invoked by uid 9112); 5 Mar 2008 18:11:51 -0000 Date: Wed, 05 Mar 2008 18:11:00 -0000 Message-ID: <20080305181151.27725.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use Comparator inside ActionPointCommands. Fixes bug #5809. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ed3e465f0588c2297480be91501c431a5ccf2b22 X-Git-Newrev: 225b857e68be8aaace9cc2736e330f3b3b471809 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/msg00311.txt.bz2 The branch, master has been updated via 225b857e68be8aaace9cc2736e330f3b3b471809 (commit) via 9bb0e1ddb504de1bf456b810f47a6533bea6c89c (commit) from ed3e465f0588c2297480be91501c431a5ccf2b22 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 225b857e68be8aaace9cc2736e330f3b3b471809 Author: Mark Wielaard Date: Wed Mar 5 19:11:02 2008 +0100 Use Comparator inside ActionPointCommands. Fixes bug #5809. 2008-03-05 Tom Tromey Bug 5809 * ActionPointCommands.java (Actions.interpret): Use Comparator to sort the task set. commit 9bb0e1ddb504de1bf456b810f47a6533bea6c89c Author: Mark Wielaard Date: Wed Mar 5 19:09:17 2008 +0100 Add new test TestActionsCommand. frysk-core/frysk/hpd/ChangeLog 2008-03-05 Mark Wielaard * TestActionsCommand.java: New test. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ActionPointCommands.java | 9 ++++- frysk-core/frysk/hpd/ChangeLog | 10 +++++ .../TestActionsCommand.java} | 40 +++++++++---------- 3 files changed, 37 insertions(+), 22 deletions(-) copy frysk-core/frysk/{debuginfo/CompilerVersion.java => hpd/TestActionsCommand.java} (78%) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ActionPointCommands.java b/frysk-core/frysk/hpd/ActionPointCommands.java index 5fdaaf1..3c6c681 100644 --- a/frysk-core/frysk/hpd/ActionPointCommands.java +++ b/frysk-core/frysk/hpd/ActionPointCommands.java @@ -46,6 +46,7 @@ import frysk.rt.SourceBreakpoint; import frysk.rt.UpdatingDisplayValue; import java.util.List; import java.util.Arrays; +import java.util.Comparator; import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -213,7 +214,13 @@ abstract class ActionPointCommands extends ParameterizedCommand { Map.Entry[] taskEntries = new Map.Entry[taskEntrySet.size()]; taskEntrySet.toArray(taskEntries); - Arrays.sort(taskEntries); + Arrays.sort(taskEntries, new Comparator() { + public int compare(Object o1, Object o2) { + Map.Entry me1 = (Map.Entry) o1; + Map.Entry me2 = (Map.Entry) o2; + return ((Task) me1.getKey()).compareTo(me2.getKey()); + } + }); for (int i = 0; i < taskEntries.length; i++) { int id = ((Task) taskEntries[i].getKey()).getTid(); SourceBreakpoint.State state = (SourceBreakpoint.State) taskEntries[i] diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 650bcd4..4f4d065 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,13 @@ +2008-03-05 Tom Tromey + + Bug 5809 + * ActionPointCommands.java (Actions.interpret): Use Comparator to + sort the task set. + +2008-03-05 Mark Wielaard + + * TestActionsCommand.java: New test. + 2008-03-04 Andrew Cagney * LoadCommand.java (interpret()): Simplify; add -exe option. diff --git a/frysk-core/frysk/debuginfo/CompilerVersion.java b/frysk-core/frysk/hpd/TestActionsCommand.java similarity index 78% copy from frysk-core/frysk/debuginfo/CompilerVersion.java copy to frysk-core/frysk/hpd/TestActionsCommand.java index 8b174c0..a01b9e8 100644 --- a/frysk-core/frysk/debuginfo/CompilerVersion.java +++ b/frysk-core/frysk/hpd/TestActionsCommand.java @@ -37,30 +37,28 @@ // version and license this file solely under the GPL without // exception. -package frysk.debuginfo; +package frysk.hpd; -import frysk.rsl.Log; +public class TestActionsCommand extends TestLib { -public class CompilerVersion { + public void testBreakpointActionsCommand() + { + HpdTestbed hpd = new HpdTestbed(); + hpd = HpdTestbed.load("funit-hello"); - protected static Log fine = Log.fine(CompilerVersion.class); - public final String compilerString; - - CompilerVersion(String compString) { - this.compilerString = compString; - fine.log(this, "Created compilerVersion for:", compString); - } + hpd.send("break print\n"); + hpd.expect("breakpoint.*\n" + prompt); - public boolean supportsClassType() { - return false; - } - - public boolean supportsInterFaceType() { - return false; - } - - public String toString() { - return "Compiler: " + compilerString; - } + hpd.send("run\n"); + hpd.expect("Breakpoint 0.*\n"); + hpd.send("actions\n"); + hpd.expect("actions.*\n"); + hpd.expect("BREAKPOINTS.*\n"); + hpd.expect("0 y print [0-9]+.*\n"); + + hpd.send("quit\n"); + hpd.expect("quit.*\nQuitting..."); + hpd.close(); + } } hooks/post-receive -- frysk system monitor/debugger