From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20276 invoked by alias); 14 Mar 2008 20:31:12 -0000 Received: (qmail 20249 invoked by uid 367); 14 Mar 2008 20:31:11 -0000 Date: Fri, 14 Mar 2008 20:31:00 -0000 Message-ID: <20080314203111.20234.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete unused host-tracking-task code. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 963501ea208d03400e55c48ff8e28053f6b8e5b7 X-Git-Newrev: 22d29b98514df505cd9677caf63d9629499a3590 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/msg00373.txt.bz2 The branch, master has been updated via 22d29b98514df505cd9677caf63d9629499a3590 (commit) from 963501ea208d03400e55c48ff8e28053f6b8e5b7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 22d29b98514df505cd9677caf63d9629499a3590 Author: Andrew Cagney Date: Fri Mar 14 16:27:23 2008 -0400 Delete unused host-tracking-task code. frysk-core/frysk/proc/ChangeLog 2008-03-14 Andrew Cagney * Host.java (taskPool): Delete. (add(Task)): Delete. (remove(Task)): Delete. (removeTasks(Collection)): Delete. * Task.java: Update. * Proc.java: Update. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 7 +++++++ frysk-core/frysk/proc/Host.java | 23 ----------------------- frysk-core/frysk/proc/Proc.java | 2 -- frysk-core/frysk/proc/Task.java | 1 - 4 files changed, 7 insertions(+), 26 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index b170c7d..4fba145 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,12 @@ 2008-03-14 Andrew Cagney + * Host.java (taskPool): Delete. + (add(Task)): Delete. + (remove(Task)): Delete. + (removeTasks(Collection)): Delete. + * Task.java: Update. + * Proc.java: Update. + * Proc.java (observableAttachedXXX): Rename observableAttached. (observableDetachedXXX): Rename observableDetached. * StressAttachDetachRapidlyCloningMainTask.java: Update. diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java index 53cfbb5..949459c 100644 --- a/frysk-core/frysk/proc/Host.java +++ b/frysk-core/frysk/proc/Host.java @@ -41,8 +41,6 @@ package frysk.proc; import java.io.File; import java.util.Collection; -import java.util.Map; -import java.util.HashMap; import frysk.rsl.Log; /** @@ -62,27 +60,6 @@ public abstract class Host implements Comparable { fine.log(this, "Host"); } - // Maintain a collection of all known Tasks. - - // There's no new task observer here. It's the responsibility of - // the PROC, and not the MANAGER, to notify OBSERVERs of new - // THREAD events. That way its possible for the client to observe - // things on a per-PROC basis. - - Map taskPool = new HashMap(); - void add(Task task) { - fine.log(this, "add Task"); - taskPool.put(task.getTaskId(), task); - } - void remove(Task task) { - fine.log(this, "remove Task"); - taskPool.remove(task.getTaskId()); - } - void removeTasks(Collection c) { - fine.log(this, "removeTasks Collection"); - taskPool.values().removeAll(c); - } - /** * Find a specifc process from its Id. */ diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java index 620a0c9..9216eb1 100644 --- a/frysk-core/frysk/proc/Proc.java +++ b/frysk-core/frysk/proc/Proc.java @@ -338,7 +338,6 @@ public abstract class Proc implements Comparable { protected void remove(Task task) { fine.log(this, "remove(Task) -- within this Proc"); taskPool.remove(task.getTaskId()); - host.remove(task); } /** @@ -352,7 +351,6 @@ public abstract class Proc implements Comparable { new_tasks = (HashMap) ((HashMap) taskPool).clone(); new_tasks.values().remove(task); taskPool.values().removeAll(new_tasks.values()); - host.removeTasks(new_tasks.values()); } /** diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java index 75ca7a7..56b3b84 100644 --- a/frysk-core/frysk/proc/Task.java +++ b/frysk-core/frysk/proc/Task.java @@ -126,7 +126,6 @@ public abstract class Task { this.creator = creator; this.id = new TaskId(pid); proc.add(this); - proc.getHost().add(this); } /** hooks/post-receive -- frysk system monitor/debugger