From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21770 invoked by alias); 12 Mar 2008 21:06:29 -0000 Received: (qmail 21744 invoked by uid 367); 12 Mar 2008 21:06:28 -0000 Date: Wed, 12 Mar 2008 21:06:00 -0000 Message-ID: <20080312210628.21729.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: frysk-core/frysk/testbed/ChangeLog X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 63483127121a20b5318affa620e6f42cb7040cfb X-Git-Newrev: 1d5c87ae35df7f48f21b3d364ed8a57e9c5d475f 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/msg00348.txt.bz2 The branch, master has been updated via 1d5c87ae35df7f48f21b3d364ed8a57e9c5d475f (commit) via 942d8f423e109ed9f461d8a82fb449200e637898 (commit) from 63483127121a20b5318affa620e6f42cb7040cfb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 1d5c87ae35df7f48f21b3d364ed8a57e9c5d475f Author: Andrew Cagney Date: Wed Mar 12 17:06:04 2008 -0400 frysk-core/frysk/testbed/ChangeLog 2008-03-12 Andrew Cagney * SignalWaiter.java (assertRunUntilSignal()): Include message in assert. commit 942d8f423e109ed9f461d8a82fb449200e637898 Author: Andrew Cagney Date: Wed Mar 12 16:53:49 2008 -0400 Delete Host.observableProcAddedXXX. frysk-core/frysk/proc/ChangeLog 2008-03-12 Andrew Cagney * Host.java (observableProcAddedXXX): Delete. frysk-core/frysk/proc/live/ChangeLog 2008-03-12 Andrew Cagney * LinuxPtraceHost.java (addProc(ProcessIdentifier,LinuxPtraceProc)): Do not notify observableProcAddedXXX. frysk-core/frysk/testbed/ChangeLog 2008-03-12 Andrew Cagney * TestLib.java (setUp()): Do not use Host.observableProcAddedXXX. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 2 + frysk-core/frysk/proc/Host.java | 9 ------ frysk-core/frysk/proc/live/ChangeLog | 5 +++ frysk-core/frysk/proc/live/LinuxPtraceHost.java | 4 --- frysk-core/frysk/testbed/ChangeLog | 7 +++++ frysk-core/frysk/testbed/SignalWaiter.java | 11 ++++--- frysk-core/frysk/testbed/TestLib.java | 32 ----------------------- 7 files changed, 20 insertions(+), 50 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index 1022bf7..a82541a 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,7 @@ 2008-03-12 Andrew Cagney + * Host.java (observableProcAddedXXX): Delete. + * TestTaskObserverInstruction.java (testFirstInstructionSteppingEngine()): Delete; move to frysk.stepping.TestFirstInstruction. diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java index ef09cf2..39fec06 100644 --- a/frysk-core/frysk/proc/Host.java +++ b/frysk-core/frysk/proc/Host.java @@ -170,15 +170,6 @@ public abstract class Host implements Comparable { } } - /** - * A process has been added. Possible reasons include a process - * refresh, and a fork. - * - * XXX: Should be made private and instead accessor methods added. - * Should more formally define the observable and the event. - */ - public ObservableXXX observableProcAddedXXX = new ObservableXXX(); - /* * An existing process has been removed. Possible reasons include * the process is no longer listed in the system process table diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index efa024e..92bbfd9 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,3 +1,8 @@ +2008-03-12 Andrew Cagney + + * LinuxPtraceHost.java (addProc(ProcessIdentifier,LinuxPtraceProc)): + Do not notify observableProcAddedXXX. + 2008-03-11 Andrew Cagney * TestTaskObserverCode.java: Do not use diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java index 3c3789c..c733b00 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java @@ -99,10 +99,6 @@ public class LinuxPtraceHost extends LiveHost { } void addProc(ProcessIdentifier pid, LinuxPtraceProc proc) { procs.put(pid, proc); - // FIXME: Code looking for procs shouldn't be parked on - // observer, rather the code should be using - // Host.requestRefresh. - observableProcAddedXXX.notify(proc); } void removeProc(ProcessIdentifier pid) { procs.remove(pid); diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog index 6acb136..5d4f39f 100644 --- a/frysk-core/frysk/testbed/ChangeLog +++ b/frysk-core/frysk/testbed/ChangeLog @@ -1,3 +1,10 @@ +2008-03-12 Andrew Cagney + + * SignalWaiter.java (assertRunUntilSignal()): Include message in + assert. + + * TestLib.java (setUp()): Do not use Host.observableProcAddedXXX. + 2008-03-11 Andrew Cagney * StatState.java: Use LogFactory. diff --git a/frysk-core/frysk/testbed/SignalWaiter.java b/frysk-core/frysk/testbed/SignalWaiter.java index 9047aef..98c789d 100644 --- a/frysk-core/frysk/testbed/SignalWaiter.java +++ b/frysk-core/frysk/testbed/SignalWaiter.java @@ -105,13 +105,14 @@ public final class SignalWaiter extends TestCase { * Runs the EventLoop until all specified signals have been * received. */ - public void assertRunUntilSignaled () - { + public void assertRunUntilSignaled() { // Run the event loop. while (outstanding.size() > 0) { - fine.log(this, "start: outstanding", outstanding); - assertTrue (eventLoop.runPolling (getTimeoutMilliseconds())); - fine.log(this, "stop: outstanding", outstanding); + fine.log(this, "start; outstanding", outstanding); + assertTrue("run until signal: " + reason + + "; outstanding: " + outstanding, + eventLoop.runPolling(getTimeoutMilliseconds())); + fine.log(this, "stop; outstanding", outstanding); } } } diff --git a/frysk-core/frysk/testbed/TestLib.java b/frysk-core/frysk/testbed/TestLib.java index d877969..ad97623 100644 --- a/frysk-core/frysk/testbed/TestLib.java +++ b/frysk-core/frysk/testbed/TestLib.java @@ -53,8 +53,6 @@ import frysk.sys.SignalSet; import frysk.proc.FindProc; import frysk.sys.Signal; import frysk.sys.proc.Stat; -import java.util.Observable; -import java.util.Observer; import frysk.rsl.Log; /** @@ -203,36 +201,6 @@ public class TestLib extends TestCase { fine.log(this, "<<<<<<<<<<<<<<<< start setUp"); // Extract a fresh new Host and EventLoop from the Manager. host = Manager.resetXXX(); - // Detect all test processes added to the process tree, - // registering each with TearDownProcess list. Look both for - // children of this process, and children of any processes - // already marked to be killed. The latter is to catch - // children of children, such as daemons. - // - // Note that, in addition to this, the Child code also - // directly registers its process. That is to ensure that - // children that never get entered into the process tree also - // get registered with TearDownProcess. - if (host.observableProcAddedXXX != null) - host.observableProcAddedXXX.addObserver(new Observer() { - public void update (Observable o, Object obj) { - Proc proc = (Proc) obj; - if (isChildOfMine(proc)) { - addToTearDown(proc); - return; - } - Proc parent = proc.getParent(); - if (parent != null) { - ProcessIdentifier parentPid - = ProcessIdentifierFactory.create(proc.getParent() - .getPid()); - if (TearDownProcess.contains(parentPid)) { - addToTearDown(proc); - return; - } - } - } - }); fine.log(this, "<<<<<<<<<<<<<<<< end setUp"); } hooks/post-receive -- frysk system monitor/debugger