From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4276 invoked by alias); 27 Feb 2008 19:43:59 -0000 Received: (qmail 4244 invoked by uid 367); 27 Feb 2008 19:43:59 -0000 Date: Wed, 27 Feb 2008 19:43:00 -0000 Message-ID: <20080227194359.4229.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Trim Host.get(TaskId). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d65cdc1ffc9f4e023508552b16a530f04c96458a X-Git-Newrev: f0bc57dd50f9c00eddfc9b054fd9e5f2e717de36 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/msg00269.txt.bz2 The branch, master has been updated via f0bc57dd50f9c00eddfc9b054fd9e5f2e717de36 (commit) from d65cdc1ffc9f4e023508552b16a530f04c96458a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f0bc57dd50f9c00eddfc9b054fd9e5f2e717de36 Author: Andrew Cagney Date: Wed Feb 27 14:43:04 2008 -0500 Trim Host.get(TaskId). frysk-core/frysk/proc/ChangeLog 2008-02-27 Andrew Cagney * ProcEvent.java (getProcFromTaskId()): Delete. * Host.java (get(TaskId)): Delete. * Proc.java (getMainTask()): Use taskPool, not Host. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 4 ++++ frysk-core/frysk/proc/Host.java | 5 ----- frysk-core/frysk/proc/Proc.java | 2 +- frysk-core/frysk/proc/ProcEvent.java | 12 ------------ 4 files changed, 5 insertions(+), 18 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index e488180..863fd83 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,9 @@ 2008-02-27 Andrew Cagney + * ProcEvent.java (getProcFromTaskId()): Delete. + * Host.java (get(TaskId)): Delete. + * Proc.java (getMainTask()): Use taskPool, not Host. + * ProcTasksObserver.java: Use Proc.getMainTask. Use Log. * Proc.java (taskPool): Make private. diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java index 69f5891..6d15454 100644 --- a/frysk-core/frysk/proc/Host.java +++ b/frysk-core/frysk/proc/Host.java @@ -83,11 +83,6 @@ public abstract class Host implements Comparable { logger.log(Level.FINE, "{0} removeTasks Collection\n", this); taskPool.values().removeAll(c); } - public Task get(TaskId id) { - logger.log(Level.FINE, "{0} get TaskId\n", this); - return (Task) taskPool.get(id); - } - /** * XXX: Should not be public. diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java index f6f2b6b..3aa0a24 100644 --- a/frysk-core/frysk/proc/Proc.java +++ b/frysk-core/frysk/proc/Proc.java @@ -120,7 +120,7 @@ public abstract class Proc implements Comparable { * @return The main task for this process */ public Task getMainTask() { - return this.host.get(new TaskId(this.getPid())); + return (Task) taskPool.get(new TaskId(this.getPid())); } /** diff --git a/frysk-core/frysk/proc/ProcEvent.java b/frysk-core/frysk/proc/ProcEvent.java index 79f95f4..a84da2c 100644 --- a/frysk-core/frysk/proc/ProcEvent.java +++ b/frysk-core/frysk/proc/ProcEvent.java @@ -69,18 +69,6 @@ public abstract class ProcEvent { this.taskId = taskId; } - /** - * Find the Proc that owns the task. - */ - protected Proc getProcFromTaskId () - { - logger.log (Level.FINE, "", this); - Task task = Manager.host.get (taskId); - if (task == null) - return null; - proc = task.getProc(); - return proc; - } public String toString () { return ("[ProcEvent" hooks/post-receive -- frysk system monitor/debugger