From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11307 invoked by alias); 13 Mar 2008 20:27:52 -0000 Received: (qmail 11279 invoked by uid 367); 13 Mar 2008 20:27:51 -0000 Date: Thu, 13 Mar 2008 20:27:00 -0000 Message-ID: <20080313202751.11264.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Switching to StopEventLoopWhenProcTerminated. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 14c618d591647a1efe0d8e53186d88f1c56d7615 X-Git-Newrev: 7db59f35b3cae9f519920db4132c6bc31a43af78 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/msg00360.txt.bz2 The branch, master has been updated via 7db59f35b3cae9f519920db4132c6bc31a43af78 (commit) from 14c618d591647a1efe0d8e53186d88f1c56d7615 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 7db59f35b3cae9f519920db4132c6bc31a43af78 Author: Andrew Cagney Date: Thu Mar 13 16:27:08 2008 -0400 Switching to StopEventLoopWhenProcTerminated. frysk-core/frysk/proc/ChangeLog 2008-03-13 Andrew Cagney * TestTaskSyscallObserver.java: Use StopEventLoopWhenProcTerminated. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 3 ++ frysk-core/frysk/proc/TestTaskSyscallObserver.java | 21 +++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index a959021..874d507 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,8 @@ 2008-03-13 Andrew Cagney + * TestTaskSyscallObserver.java: Use + StopEventLoopWhenProcTerminated. + * TestTaskTerminateObserver.java: Do not use StopEventLoopWhenProcRemoved. diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java index 2ff9d0c..14975c8 100644 --- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java +++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java @@ -54,7 +54,7 @@ import frysk.sys.Pid; import frysk.sys.Signal; import frysk.testbed.TestLib; import frysk.testbed.SlaveOffspring; -import frysk.testbed.StopEventLoopWhenProcRemoved; +import frysk.testbed.StopEventLoopWhenProcTerminated; import frysk.testbed.TaskObserverBase; import frysk.testbed.DaemonBlockedAtEntry; import frysk.testbed.IsaTestbed; @@ -260,9 +260,7 @@ public class TestTaskSyscallObserver extends TestLib { child.getMainTask().requestAddSyscallsObserver(syscallObserver); assertRunUntilStop("add SyscallObserver"); - // XXX: This is wrong; the task isn't a child so this will - // never work. What about assertRunUntilTaskRemoved (...)? - new StopEventLoopWhenProcRemoved(child); + new StopEventLoopWhenProcTerminated(child); child.requestRemoveBlock(); assertRunUntilStop("run until program exits"); @@ -343,9 +341,6 @@ public class TestTaskSyscallObserver extends TestLib { */ public void testSyscalls () { - // if (unresolved (2245)) - // return; - // Create program making syscalls DaemonBlockedAtEntry child = new DaemonBlockedAtEntry(Config.getPkgLibFile("funit-syscalls")); @@ -356,9 +351,7 @@ public class TestTaskSyscallObserver extends TestLib { child.getMainTask().requestAddSyscallsObserver(syscallObserver); assertRunUntilStop("add SyscallObserver"); - // XXX: This is wrong; the task isn't a child so this will - // never work. What about assertRunUntilTaskRemoved (...)? - new StopEventLoopWhenProcRemoved(child); + new StopEventLoopWhenProcTerminated(child); child.requestRemoveBlock(); assertRunUntilStop("run until program exits"); @@ -424,7 +417,7 @@ public class TestTaskSyscallObserver extends TestLib { // Create program making syscalls DaemonBlockedAtEntry child = new DaemonBlockedAtEntry(Config.getPkgLibFile("funit-syscalls")); - new StopEventLoopWhenProcRemoved(child); + new StopEventLoopWhenProcTerminated(child); SyscallOpenObserver syscallOpenObserver = new SyscallOpenObserver( child.getMainTask()); @@ -578,12 +571,10 @@ public class TestTaskSyscallObserver extends TestLib { */ public void testSyscallInterrupt () { - // if (unresolved (2245)) - // return; PipeReadChild prc = new PipeReadChild(false); TestSyscallInterruptXXX t = new TestSyscallInterruptXXX(prc.getPid().intValue()); - new StopEventLoopWhenProcRemoved(prc.getPid()); + new StopEventLoopWhenProcTerminated(prc.getPid()); assertRunUntilStop("run \"syscallint\" until exit"); assertEquals("read enter events", 1, t.readEnter); @@ -601,7 +592,7 @@ public class TestTaskSyscallObserver extends TestLib { PipeReadChild prc = new PipeReadChild(true); TestSyscallInterruptXXX t = new TestSyscallInterruptXXX(prc.getPid().intValue()); - new StopEventLoopWhenProcRemoved(prc.getPid()); + new StopEventLoopWhenProcTerminated(prc.getPid()); assertRunUntilStop("run \"syscallint\" with restart until exit"); assertEquals("restart read enter events", 2, t.readEnter); hooks/post-receive -- frysk system monitor/debugger