From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15281 invoked by alias); 27 Feb 2008 19:03:22 -0000 Received: (qmail 15254 invoked by uid 367); 27 Feb 2008 19:03:20 -0000 Date: Wed, 27 Feb 2008 19:03:00 -0000 Message-ID: <20080227190320.15237.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Make Proc.taskPool private. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d0389c68ba9e11e6ffacec53596d2b05425f1c4b X-Git-Newrev: 9d48be0ed86dd7fb9ff9e4a4ab8ff2730d4f6f33 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/msg00267.txt.bz2 The branch, master has been updated via 9d48be0ed86dd7fb9ff9e4a4ab8ff2730d4f6f33 (commit) from d0389c68ba9e11e6ffacec53596d2b05425f1c4b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 9d48be0ed86dd7fb9ff9e4a4ab8ff2730d4f6f33 Author: Andrew Cagney Date: Wed Feb 27 14:02:21 2008 -0500 Make Proc.taskPool private. frysk-core/frysk/proc/ChangeLog 2008-02-27 Andrew Cagney * Proc.java (taskPool): Make private. frysk-core/frysk/proc/live/ChangeLog 2008-02-27 Andrew Cagney * LinuxPtraceProcState.java: Do not use Proc.taskPool. * LinuxPtraceTaskState.java: Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 2 ++ frysk-core/frysk/proc/Proc.java | 2 +- frysk-core/frysk/proc/live/ChangeLog | 3 +++ .../frysk/proc/live/LinuxPtraceProcState.java | 2 +- .../frysk/proc/live/LinuxPtraceTaskState.java | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index 3412eb1..64bdc69 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,7 @@ 2008-02-27 Andrew Cagney + * Proc.java (taskPool): Make private. + * Task.java (getTaskId()): Make package private. * TestTaskSyscallObserver.java: Use Task.getTid(). diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java index 267d90e..f6f2b6b 100644 --- a/frysk-core/frysk/proc/Proc.java +++ b/frysk-core/frysk/proc/Proc.java @@ -321,7 +321,7 @@ public abstract class Proc implements Comparable { * * XXX: Should not be public. */ - public Map taskPool = new HashMap(); + private final Map taskPool = new HashMap(); /** * Add the Task to this Proc. diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index 495d229..6738280 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,5 +1,8 @@ 2008-02-27 Andrew Cagney + * LinuxPtraceProcState.java: Do not use Proc.taskPool. + * LinuxPtraceTaskState.java: Ditto. + * LinuxPtraceProc.java (tasks): New. (removeTask(ProcessIdentifier)): New. (addTask(ProcessIdentifier,LinuxPtraceTask)): New. diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java index f22f347..3dd8f3f 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java @@ -150,7 +150,7 @@ abstract class LinuxPtraceProcState extends State { observation.fail(new RuntimeException("not actually added")); // Grab the main task; only bother with the refresh if the // Proc has no clue as to its task list. - if (proc.taskPool.size () == 0) + if (proc.getTasks().size() == 0) proc.sendRefresh (); // Assumes that the main Task's ID == the Proc's ID. LinuxPtraceTask mainTask diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java index 2c07389..a04daa7 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java @@ -164,7 +164,7 @@ class LinuxPtraceTaskState extends State { else task.notifyTerminated(false, status); // A process with no tasks is dead ...? - if (task.getProc().taskPool.size() == 0) { + if (task.getProc().getTasks().size() == 0) { task.getProc().parent.remove(task.getProc()); task.getProc().getHost().remove(task.getProc()); } hooks/post-receive -- frysk system monitor/debugger