From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8329 invoked by alias); 28 Feb 2008 05:33:11 -0000 Received: (qmail 8303 invoked by uid 9519); 28 Feb 2008 05:33:10 -0000 Date: Thu, 28 Feb 2008 05:33:00 -0000 Message-ID: <20080228053310.8288.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix ViewsetCommand error for load/unload command. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 079a3dcbfa8d03af12f3c218a198318e48d9a2e2 X-Git-Newrev: e5a45290eaa2d95ae971591d15f2cb79a10b6cc7 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/msg00273.txt.bz2 The branch, master has been updated via e5a45290eaa2d95ae971591d15f2cb79a10b6cc7 (commit) from 079a3dcbfa8d03af12f3c218a198318e48d9a2e2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit e5a45290eaa2d95ae971591d15f2cb79a10b6cc7 Author: Rick Moseley Date: Wed Feb 27 23:31:20 2008 -0600 Fix ViewsetCommand error for load/unload command. * ViewsetCommand.java: Fix error when duplicate executables are loaded/unloaded(bz 5799). ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 6 ++++++ frysk-core/frysk/hpd/ViewsetCommand.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index c876cd2..28d1f25 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,9 @@ +2008-02-27 Rick Moseley + + * ViewsetCommand.java: Fix error when duplicate executables are + loaded/unloaded(bz 5799). + + 2008-02-27 Sami Wagiaalla * StackCommands.java: Use PrintStackOptions instead of boolean list. diff --git a/frysk-core/frysk/hpd/ViewsetCommand.java b/frysk-core/frysk/hpd/ViewsetCommand.java index 25be163..a72d9fb 100644 --- a/frysk-core/frysk/hpd/ViewsetCommand.java +++ b/frysk-core/frysk/hpd/ViewsetCommand.java @@ -88,6 +88,9 @@ class ViewsetCommand extends ParameterizedCommand { * * @param tempset is the target set to use in printing * @param cli is the current command line interface object + * @param displayedName is the String used for the title of the set + * @param loadedOnly is true if the display is to show procs that exist in the + * cli.loadeProcs table only, false if not */ static void printLoop(PTSet tempset, CLI cli, String displayedName, boolean loadedOnly) { @@ -97,7 +100,7 @@ class ViewsetCommand extends ParameterizedCommand { cli.outWriter.println("\tpid\tid\tpath-to-executable"); for (Iterator iter = tempset.getTaskData(); iter.hasNext();) { temptd = (TaskData) iter.next(); - if (loadedOnly && cli.loadedProcs.containsKey(temptd.getTask().getProc()) + if (loadedOnly && cli.loadedProcs.containsValue(new Integer(temptd.getID())) || !loadedOnly) { cli.outWriter.print("["); cli.outWriter.print(temptd.getParentID()); hooks/post-receive -- frysk system monitor/debugger