From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20870 invoked by alias); 27 Feb 2008 18:12:41 -0000 Received: (qmail 20845 invoked by uid 367); 27 Feb 2008 18:12:40 -0000 Date: Wed, 27 Feb 2008 18:12:00 -0000 Message-ID: <20080227181240.20830.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Reduce scope of Task.getTaskId(). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b7b5cd5297f20f4946c1913a45bfddcb837cbf00 X-Git-Newrev: d0389c68ba9e11e6ffacec53596d2b05425f1c4b 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/msg00266.txt.bz2 The branch, master has been updated via d0389c68ba9e11e6ffacec53596d2b05425f1c4b (commit) from b7b5cd5297f20f4946c1913a45bfddcb837cbf00 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit d0389c68ba9e11e6ffacec53596d2b05425f1c4b Author: Andrew Cagney Date: Wed Feb 27 13:08:40 2008 -0500 Reduce scope of Task.getTaskId(). frysk-core/frysk/proc/ChangeLog 2008-02-27 Andrew Cagney * Task.java (getTaskId()): Make package private. * TestTaskSyscallObserver.java: Use Task.getTid(). frysk-core/frysk/proc/dead/ChangeLog 2008-02-27 Andrew Cagney * TestLinuxCore.java: Do not use Task.getTaskId. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 3 + frysk-core/frysk/proc/Task.java | 2 +- frysk-core/frysk/proc/TestTaskSyscallObserver.java | 44 ++++++++++---------- frysk-core/frysk/proc/dead/ChangeLog | 2 + frysk-core/frysk/proc/dead/TestLinuxCore.java | 1 - 5 files changed, 28 insertions(+), 24 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index 80ffe82..3412eb1 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,8 @@ 2008-02-27 Andrew Cagney + * Task.java (getTaskId()): Make package private. + * TestTaskSyscallObserver.java: Use Task.getTid(). + * Proc.java (remove(Task)): Make protected. 2008-02-26 Andrew Cagney diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java index d42fe74..99d6474 100644 --- a/frysk-core/frysk/proc/Task.java +++ b/frysk-core/frysk/proc/Task.java @@ -68,7 +68,7 @@ public abstract class Task { /** * Return the task's corresponding TaskId. */ - public final TaskId getTaskId() { + TaskId getTaskId() { return id; } private final TaskId id; diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java index 7f6250e..1c8e5c4 100644 --- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java +++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java @@ -548,28 +548,28 @@ public class TestTaskSyscallObserver } } - TestSyscallInterruptXXX(final int pid) { - Manager.host.requestProc(pid, new FindProc() { - public void procFound(Proc p) { - List tasks = p.getTasks(); - for (Iterator i = tasks.iterator(); i.hasNext();) { - Task t = (Task) i.next(); - if (t.getTaskId().hashCode() == pid) { - syscallObserver = new SyscallInterruptObserver(t); - t.requestAddSyscallsObserver(syscallObserver); - assertRunUntilStop("Add syscallObservers"); - t.requestAddSignaledObserver(syscallObserver); - assertRunUntilStop("Add signaledObservers"); - } - } - Manager.eventLoop.requestStop(); - } - public void procNotFound (int pid) { - fail("proc not found " + pid); - } - }); - Manager.eventLoop.run(); - } + TestSyscallInterruptXXX(final int pid) { + Manager.host.requestProc(pid, new FindProc() { + public void procFound(Proc p) { + List tasks = p.getTasks(); + for (Iterator i = tasks.iterator(); i.hasNext();) { + Task t = (Task) i.next(); + if (t.getTid() == pid) { + syscallObserver = new SyscallInterruptObserver(t); + t.requestAddSyscallsObserver(syscallObserver); + assertRunUntilStop("Add syscallObservers"); + t.requestAddSignaledObserver(syscallObserver); + assertRunUntilStop("Add signaledObservers"); + } + } + Manager.eventLoop.requestStop(); + } + public void procNotFound (int pid) { + fail("proc not found " + pid); + } + }); + Manager.eventLoop.run(); + } } /** diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index ae17b0a..b83e06f 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,5 +1,7 @@ 2008-02-27 Andrew Cagney + * TestLinuxCore.java: Do not use Task.getTaskId. + * TestCoreRegs.java: Use LinuxCoreFactory. 2008-02-26 Andrew Cagney diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java index 634a592..333780a 100644 --- a/frysk-core/frysk/proc/dead/TestLinuxCore.java +++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java @@ -308,7 +308,6 @@ public class TestLinuxCore extends TestLib { { assertNotNull("Task exists in proc",tasks[i]); - assertEquals("Task ID",threadPid[i],tasks[i].getTaskId().id); assertEquals("Task TID",threadPid[i], tasks[i].getTid()); assertEquals("Task TID",threadName[i],tasks[i].getName()); assertNotNull("Task ISA",tasks[i].getISA()); hooks/post-receive -- frysk system monitor/debugger