This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Extract TaskAttachedObserverXXX from TaskObserver, clarifying status.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 17 Mar 2008 17:27:31 -0000
- Subject: [SCM] master: Extract TaskAttachedObserverXXX from TaskObserver, clarifying status.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via ec2bf1299f4d201f2452558aafd0880c680c729c (commit)
from 4b724f586ac233134035866d0052612d7ba56ff6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit ec2bf1299f4d201f2452558aafd0880c680c729c
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Mar 17 13:23:23 2008 -0400
Extract TaskAttachedObserverXXX from TaskObserver, clarifying status.
frysk-core/frysk/bindir/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* fstep.java: Update; using TaskAttachedObserverXXX.
frysk-core/frysk/ftrace/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* Ftrace.java: Update; using TaskAttachedObserverXXX.
frysk-core/frysk/hpd/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* ShellCommand.java: Update; using TaskAttachedObserverXXX.
* StartRun.java: Ditto.
frysk-core/frysk/proc/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* TaskObserver.java (Attached): Move to ...
* TaskAttachedObserverXXX.java: ... here.
* StressAttachDetachSignaledTask.java: Ditto.
* StressAttachDetachRapidlyCloningMainTask.java: Update.
* StressAttachDetachManyTasks.java: Update.
* TestTaskObserverInstruction.java: Update.
* TestTaskObserverInstructionSigReturn.java: Update.
* TestTaskSyscallObserver.java: Update.
* TestTaskObserver.java: Update.
* Host.java: Update.
* Task.java: Update.
* TestBreakpoints.java: Update.
* TestInstructions.java: Update.
* TestRun.java: Update.
frysk-core/frysk/proc/dead/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* DeadHost.java: Update; using TaskAttachedObserverXXX;
* TestLinuxCore.java: Update.
* DeadTask.java: Ditto.
frysk-core/frysk/proc/dummy/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* DummyHost.java: Update; using TaskAttachedObserverXXX.
* DummyTask.java: Ditto.
frysk-core/frysk/proc/live/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java: Update; using TaskAttachedObserverXXX.
* TestTaskObserverCode.java: Ditto.
* TestTaskObserverBlocked.java: Ditto.
* TestRuntimeIsa.java: Ditto.
* LinuxWaitBuilder.java: Ditto.
* LinuxPtraceTask.java: Ditto.
frysk-core/frysk/stepping/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* TestFirstInstruction.java: Update; using
TaskAttachedObserverXXX.
frysk-core/frysk/testbed/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* OffspringType.java: Update; using TaskAttachedObserverXXX.
frysk-core/frysk/util/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* ProcRunUtil.java: Update; using TaskAttachedObserverXXX.
frysk-gui/frysk/gui/monitor/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* actions/RunExternal.java: Update; using TaskAttachedObserverXXX.
* MainWindow.java: Ditto.
frysk-gui/frysk/gui/srcwin/ChangeLog
2008-03-17 Andrew Cagney <cagney@redhat.com>
* SourceWindowFactory.java: Update; using TaskAttachedObserverXXX.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/bindir/ChangeLog | 4 +++
frysk-core/frysk/bindir/fstep.java | 6 ++--
frysk-core/frysk/ftrace/ChangeLog | 4 +++
frysk-core/frysk/ftrace/Ftrace.java | 5 +--
frysk-core/frysk/hpd/ChangeLog | 5 +++
frysk-core/frysk/hpd/ShellCommand.java | 4 +-
frysk-core/frysk/hpd/StartRun.java | 4 +-
frysk-core/frysk/proc/ChangeLog | 17 ++++++++++++
frysk-core/frysk/proc/Host.java | 8 +++---
.../frysk/proc/StressAttachDetachManyTasks.java | 3 +-
.../StressAttachDetachRapidlyCloningMainTask.java | 2 +-
.../frysk/proc/StressAttachDetachSignaledTask.java | 2 +-
frysk-core/frysk/proc/Task.java | 8 +++---
...{FindProc.java => TaskAttachedObserverXXX.java} | 27 +++++++++----------
frysk-core/frysk/proc/TaskObserver.java | 20 --------------
frysk-core/frysk/proc/TestBreakpoints.java | 2 +-
frysk-core/frysk/proc/TestInstructions.java | 2 +-
frysk-core/frysk/proc/TestRun.java | 10 +++---
frysk-core/frysk/proc/TestTaskObserver.java | 4 +-
.../frysk/proc/TestTaskObserverInstruction.java | 2 +-
.../proc/TestTaskObserverInstructionSigReturn.java | 4 +-
frysk-core/frysk/proc/TestTaskSyscallObserver.java | 2 +-
frysk-core/frysk/proc/dead/ChangeLog | 6 ++++
frysk-core/frysk/proc/dead/DeadHost.java | 4 +-
frysk-core/frysk/proc/dead/DeadTask.java | 9 +++---
frysk-core/frysk/proc/dead/TestLinuxCore.java | 6 +---
frysk-core/frysk/proc/dummy/ChangeLog | 5 +++
frysk-core/frysk/proc/dummy/DummyHost.java | 4 +-
frysk-core/frysk/proc/dummy/DummyTask.java | 5 ++-
frysk-core/frysk/proc/live/ChangeLog | 9 ++++++
frysk-core/frysk/proc/live/LinuxPtraceHost.java | 4 +-
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 13 +++++----
frysk-core/frysk/proc/live/LinuxWaitBuilder.java | 4 +-
frysk-core/frysk/proc/live/TestRuntimeIsa.java | 9 +++---
.../frysk/proc/live/TestTaskObserverBlocked.java | 7 +++--
.../frysk/proc/live/TestTaskObserverCode.java | 3 +-
frysk-core/frysk/stepping/ChangeLog | 5 +++
.../frysk/stepping/TestFirstInstruction.java | 4 +-
frysk-core/frysk/testbed/ChangeLog | 4 +++
frysk-core/frysk/testbed/OffspringType.java | 4 +-
frysk-core/frysk/util/ChangeLog | 4 +++
frysk-core/frysk/util/ProcRunUtil.java | 9 +++---
frysk-gui/frysk/gui/monitor/ChangeLog | 5 +++
frysk-gui/frysk/gui/monitor/MainWindow.java | 4 +-
.../frysk/gui/monitor/actions/RunExternal.java | 6 ++--
frysk-gui/frysk/gui/srcwin/ChangeLog | 4 +++
.../frysk/gui/srcwin/SourceWindowFactory.java | 6 ++--
47 files changed, 171 insertions(+), 117 deletions(-)
copy frysk-core/frysk/proc/{FindProc.java => TaskAttachedObserverXXX.java} (78%)
First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index 353b5f0..519fa1f 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-17 Andrew Cagney <cagney@redhat.com>
+
+ * fstep.java: Update; using TaskAttachedObserverXXX.
+
2008-03-14 Andrew Cagney <cagney@redhat.com>
* frysk.xml: New.
diff --git a/frysk-core/frysk/bindir/fstep.java b/frysk-core/frysk/bindir/fstep.java
index 282142b..6fa722a 100644
--- a/frysk-core/frysk/bindir/fstep.java
+++ b/frysk-core/frysk/bindir/fstep.java
@@ -56,9 +56,9 @@ import java.util.Iterator;
import frysk.proc.Action;
import frysk.proc.Proc;
import frysk.proc.Task;
+import frysk.proc.TaskAttachedObserverXXX;
-public class fstep
- implements TaskObserver.Attached,
+public class fstep implements TaskAttachedObserverXXX,
TaskObserver.Code,
TaskObserver.Instruction,
TaskObserver.Terminated
@@ -223,7 +223,7 @@ public class fstep
}
}
- // TaskObserver.Attached interface
+ // TaskAttachedObserverXXX interface
public Action updateAttached(Task task)
{
// We only need one disassembler since all Tasks share their memory.
diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog
index cf76d7c..7d088ce 100644
--- a/frysk-core/frysk/ftrace/ChangeLog
+++ b/frysk-core/frysk/ftrace/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-17 Andrew Cagney <cagney@redhat.com>
+
+ * Ftrace.java: Update; using TaskAttachedObserverXXX.
+
2008-03-14 Andrew Cagney <cagney@redhat.com>
* Ftrace.java (ProcRemovedObserver): Re-implement as a Terminated
diff --git a/frysk-core/frysk/ftrace/Ftrace.java b/frysk-core/frysk/ftrace/Ftrace.java
index bb53b21..1b88af9 100644
--- a/frysk-core/frysk/ftrace/Ftrace.java
+++ b/frysk-core/frysk/ftrace/Ftrace.java
@@ -56,6 +56,7 @@ import java.util.Set;
import java.util.Iterator;
import java.util.logging.Logger;
import java.util.logging.Level;
+import frysk.proc.TaskAttachedObserverXXX;
public class Ftrace
{
@@ -401,9 +402,7 @@ public class Ftrace
* An observer that sets up things once frysk has set up the requested
* proc and attached to it.
*/
- class MyAttachedObserver
- implements TaskObserver.Attached
- {
+ class MyAttachedObserver implements TaskAttachedObserverXXX {
private Set procs = new HashSet();
public synchronized Action updateAttached (Task task)
{
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 3e5d541..c0b6878 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17 Andrew Cagney <cagney@redhat.com>
+
+ * ShellCommand.java: Update; using TaskAttachedObserverXXX.
+ * StartRun.java: Ditto.
+
2008-03-14 Rick Moseley <rmoseley@redhat.com>
* LoadCommand.java: Add target set to output line.
diff --git a/frysk-core/frysk/hpd/ShellCommand.java b/frysk-core/frysk/hpd/ShellCommand.java
index 79f84a1..b60a710 100644
--- a/frysk-core/frysk/hpd/ShellCommand.java
+++ b/frysk-core/frysk/hpd/ShellCommand.java
@@ -40,7 +40,7 @@
package frysk.hpd;
import java.util.List;
-
+import frysk.proc.TaskAttachedObserverXXX;
import frysk.proc.Action;
import frysk.proc.Manager;
import frysk.proc.Task;
@@ -91,7 +91,7 @@ class ShellCommand extends NoOptsCommand {
// Request for an attached proc to execute the command.
Manager.host.requestCreateAttachedProc(command,
- new TaskObserver.Attached() {
+ new TaskAttachedObserverXXX() {
public Action updateAttached (Task task)
{
// On termination of command, resume fhpd.
diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java
index cf6044e..8201936 100644
--- a/frysk-core/frysk/hpd/StartRun.java
+++ b/frysk-core/frysk/hpd/StartRun.java
@@ -45,13 +45,13 @@ import frysk.proc.Proc;
import frysk.proc.ProcObserver.ProcTasks;
import frysk.proc.ProcTasksObserver;
import frysk.proc.Task;
-import frysk.proc.TaskObserver;
import frysk.util.CountDownLatch;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import frysk.proc.TaskAttachedObserverXXX;
/**
* Due to a lot of similar code in StartCommand/RunCommand this class was
@@ -63,7 +63,7 @@ abstract class StartRun extends ParameterizedCommand {
super(command, help1, help2);
}
- static class Runner implements TaskObserver.Attached {
+ static class Runner implements TaskAttachedObserverXXX {
final CLI cli;
CountDownLatch latch;
Task launchedTask;
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 6f431d2..d39e838 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,20 @@
+2008-03-17 Andrew Cagney <cagney@redhat.com>
+
+ * TaskObserver.java (Attached): Move to ...
+ * TaskAttachedObserverXXX.java: ... here.
+ * StressAttachDetachSignaledTask.java: Ditto.
+ * StressAttachDetachRapidlyCloningMainTask.java: Update.
+ * StressAttachDetachManyTasks.java: Update.
+ * TestTaskObserverInstruction.java: Update.
+ * TestTaskObserverInstructionSigReturn.java: Update.
+ * TestTaskSyscallObserver.java: Update.
+ * TestTaskObserver.java: Update.
+ * Host.java: Update.
+ * Task.java: Update.
+ * TestBreakpoints.java: Update.
+ * TestInstructions.java: Update.
+ * TestRun.java: Update.
+
2008-03-15 Andrew Cagney <cagney@redhat.com>
* Proc.java (observations): Move to LinuxPtraceProc.
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index 949459c..0acd51b 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -89,14 +89,14 @@ public abstract class Host implements Comparable {
String stdout,
String stderr,
String[] args,
- TaskObserver.Attached attachedObserver);
+ TaskAttachedObserverXXX attachedObserver);
/**
* Request that a new attached and running process(with stdin,
* stdout, and stderr are shared with this process) be created.
*/
public void requestCreateAttachedProc(String stdin, String stdout,
String stderr, String[] args,
- TaskObserver.Attached attachedObserver) {
+ TaskAttachedObserverXXX attachedObserver) {
fine.log(this, "requestCreateAttachedProc", args, "observer",
attachedObserver);
requestCreateAttachedProc(new File(args[0]), stdin, stdout, stderr,
@@ -107,7 +107,7 @@ public abstract class Host implements Comparable {
* stdout, and stderr are shared with this process) be created.
*/
public void requestCreateAttachedProc(String[] args,
- TaskObserver.Attached attachedObserver) {
+ TaskAttachedObserverXXX attachedObserver) {
fine.log(this, "requestCreateAttachedProc", args, "observer",
attachedObserver);
requestCreateAttachedProc(new File(args[0]), null, null, null,
@@ -118,7 +118,7 @@ public abstract class Host implements Comparable {
* TEMPLATE be created.
*/
public void requestCreateAttachedProc(Proc template,
- TaskObserver.Attached attachedObserver) {
+ TaskAttachedObserverXXX attachedObserver) {
fine.log(this, "requestCreateAttachedProc template", template,
"observer", attachedObserver);
requestCreateAttachedProc(new File(template.getExe()),
diff --git a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
index bc289c9..07cce2a 100644
--- a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
+++ b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
@@ -44,6 +44,7 @@ import java.util.Observer;
import java.util.Observable;
import frysk.testbed.TaskObserverBase;
import frysk.testbed.FunitThreadsOffspring;
+import frysk.proc.TaskAttachedObserverXXX;
/**
* Test attaching to a process with many many tasks.
@@ -65,7 +66,7 @@ public class StressAttachDetachManyTasks
class AttachDetachObserver
extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
public Action updateAttached (Task task)
{
diff --git a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
index 83ceef4..0235e85 100644
--- a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
+++ b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
@@ -74,7 +74,7 @@ public class StressAttachDetachRapidlyCloningMainTask
// one of those old tasks is attempted.
class CanFailObserver
extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
int failedCount;
public void addFailed (Object o, Throwable w)
diff --git a/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java b/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
index 5efdfd2..12ecdd1 100644
--- a/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
+++ b/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
@@ -64,7 +64,7 @@ public class StressAttachDetachSignaledTask
*/
class AttachDetach
extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
public Action updateAttached (Task task)
{
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index 06fc24a..ffbb097 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -184,13 +184,13 @@ public abstract class Task {
public abstract void requestDeleteClonedObserver(TaskObserver.Cloned o);
/**
- * Add a TaskObserver.Attached observer.
+ * Add a TaskAttachedObserverXXX observer.
*/
- public abstract void requestAddAttachedObserver(TaskObserver.Attached o);
+ public abstract void requestAddAttachedObserver(TaskAttachedObserverXXX o);
/**
- * Delete a TaskObserver.Attached observer.
+ * Delete a TaskAttachedObserverXXX observer.
*/
- public abstract void requestDeleteAttachedObserver(TaskObserver.Attached o);
+ public abstract void requestDeleteAttachedObserver(TaskAttachedObserverXXX o);
/**
* Add a TaskObserver.Forked observer.
diff --git a/frysk-core/frysk/proc/FindProc.java b/frysk-core/frysk/proc/TaskAttachedObserverXXX.java
similarity index 78%
copy from frysk-core/frysk/proc/FindProc.java
copy to frysk-core/frysk/proc/TaskAttachedObserverXXX.java
index cb9d748..df24b1a 100644
--- a/frysk-core/frysk/proc/FindProc.java
+++ b/frysk-core/frysk/proc/TaskAttachedObserverXXX.java
@@ -40,21 +40,20 @@
package frysk.proc;
/**
- * Interface to be used with Host.requestFindProc.
+ * Interface used to notify of a Task that has has been attached, and
+ * is about to resume execution in that state. Only after a Task has
+ * been attached can its internals be manipulated (registers, memory,
+ * auxv).
+ *
+ * XXX: This observer only works on un-attached tasks.
+ *
+ * XXX: This is an internal observer used to test the attached /
+ * detached state transitions. It was never intended to escape into
+ * the wild and is currently being re-captured.
*/
-
-public interface FindProc {
-
- /**
- * The process was successfully found and added to the Host's list
- * of processes.
- * @param proc the Proc that was found.
- */
- void procFound(Proc proc);
-
+public interface TaskAttachedObserverXXX extends TaskObserver {
/**
- * The process with the given ID was not found.
- * @param procId the procId that was not found.
+ * The Task is attached.
*/
- void procNotFound(int pid);
+ Action updateAttached(Task task);
}
diff --git a/frysk-core/frysk/proc/TaskObserver.java b/frysk-core/frysk/proc/TaskObserver.java
index 14f47d6..7ee7189 100644
--- a/frysk-core/frysk/proc/TaskObserver.java
+++ b/frysk-core/frysk/proc/TaskObserver.java
@@ -223,24 +223,4 @@ public interface TaskObserver
*/
Action updateHit (Task task, long address);
}
-
- /**
- * Interface used to notify of a Task that has has been attached,
- * and is about to resume execution in that state. Only after a
- * Task has been attached can its internals be manipulated
- * (registers, memory, auxv).
- *
- * XXX: This observer only works on un-attached tasks.
- *
- * XXX: This is an internal observer used to test the attached /
- * detached state transitions.
- */
- interface Attached
- extends TaskObserver
- {
- /**
- * The Task is attached.
- */
- Action updateAttached (Task task);
- }
}
diff --git a/frysk-core/frysk/proc/TestBreakpoints.java b/frysk-core/frysk/proc/TestBreakpoints.java
index 025ee96..e0b617d 100644
--- a/frysk-core/frysk/proc/TestBreakpoints.java
+++ b/frysk-core/frysk/proc/TestBreakpoints.java
@@ -430,7 +430,7 @@ public class TestBreakpoints
}
private class AttachedObserver
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
public Action updateAttached(Task task)
{
diff --git a/frysk-core/frysk/proc/TestInstructions.java b/frysk-core/frysk/proc/TestInstructions.java
index cef5c8e..698de98 100644
--- a/frysk-core/frysk/proc/TestInstructions.java
+++ b/frysk-core/frysk/proc/TestInstructions.java
@@ -309,7 +309,7 @@ public class TestInstructions
}
}
- class AttachedObserver implements TaskObserver.Attached
+ class AttachedObserver implements TaskAttachedObserverXXX
{
Task task;
diff --git a/frysk-core/frysk/proc/TestRun.java b/frysk-core/frysk/proc/TestRun.java
index d1f475b..9907049 100644
--- a/frysk-core/frysk/proc/TestRun.java
+++ b/frysk-core/frysk/proc/TestRun.java
@@ -63,10 +63,10 @@ public class TestRun
TearDownFile tmpFile = TearDownFile.create();
assertNotNull("temporary file", tmpFile);
- // Observe TaskObserver.Attached events; when any occur indicate
+ // Observe TaskAttachedObserverXXX events; when any occur indicate
// that the curresponding task should continue.
class TaskCreatedContinuedObserver extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
final TaskSet attachedTasks = new TaskSet();
Proc proc;
@@ -96,7 +96,7 @@ public class TestRun
/**
* Check that a stopped (at entry point) sub-process can be created. This gets
- * a little messy, need to get TaskObserver.Attached installed on the just
+ * a little messy, need to get TaskAttachedObserverXXX installed on the just
* added task.
*/
public void testCreateAttachedStoppedProc ()
@@ -104,12 +104,12 @@ public class TestRun
TearDownFile tmpFile = TearDownFile.create();
assertNotNull("temporary file", tmpFile);
- // Observe TaskObserver.Attached events; when any occur indicate
+ // Observe TaskAttachedObserverXXX events; when any occur indicate
// that the curresponding task should block, and then request that
// the event-loop stop.
class TaskCreatedStoppedObserver
extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
Proc proc;
final TaskSet attachedTasks = new TaskSet();
diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java
index c69ec38..18ecf2c 100644
--- a/frysk-core/frysk/proc/TestTaskObserver.java
+++ b/frysk-core/frysk/proc/TestTaskObserver.java
@@ -64,7 +64,7 @@ public class TestTaskObserver
*/
class AttachedObserver
extends TaskObserverBase
- implements TaskObserver.Attached
+ implements TaskAttachedObserverXXX
{
int attachedCount;
public Action updateAttached (Task task)
@@ -492,7 +492,7 @@ public class TestTaskObserver
*/
private void deleteUnattachedObserver (Offspring child, boolean main)
{
- TaskObserver.Attached unattachedObserver = new TaskObserver.Attached ()
+ TaskAttachedObserverXXX unattachedObserver = new TaskAttachedObserverXXX ()
{
public Action updateAttached (Task task)
{
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstruction.java b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
index 230b468..d5e3d2a 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstruction.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
@@ -136,7 +136,7 @@ public class TestTaskObserverInstruction extends TestLib
assertTrue("InstructionObserver hit", instr.hit == 2);
}
- private class StepAttachedObserver implements TaskObserver.Attached
+ private class StepAttachedObserver implements TaskAttachedObserverXXX
{
private final InstructionObserver instr;
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java b/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
index a382413..83a0086 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
@@ -45,7 +45,7 @@ import frysk.testbed.TestLib;
public class TestTaskObserverInstructionSigReturn
extends TestLib
- implements TaskObserver.Attached,
+ implements TaskAttachedObserverXXX,
TaskObserver.Instruction,
TaskObserver.Terminating,
TaskObserver.Signaled
@@ -107,7 +107,7 @@ public class TestTaskObserverInstructionSigReturn
// ignored
}
- // TaskObserver.Attached interface
+ // TaskAttachedObserverXXX interface
public Action updateAttached(Task task) {
addToTearDown(task);
this.task = task;
diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
index 14975c8..eb32613 100644
--- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java
+++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
@@ -275,7 +275,7 @@ public class TestTaskSyscallObserver extends TestLib {
*/
SyscallObserver syscallObserver1 = null;
- TaskObserver.Attached attachedObserver = new TaskObserver.Attached()
+ TaskAttachedObserverXXX attachedObserver = new TaskAttachedObserverXXX()
{
public Action updateAttached (Task task)
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 1c39faa..9229a67 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-17 Andrew Cagney <cagney@redhat.com>
+
+ * DeadHost.java: Update; using TaskAttachedObserverXXX;
+ * TestLinuxCore.java: Update.
+ * DeadTask.java: Ditto.
+
2008-03-15 Andrew Cagney <cagney@redhat.com>
* InterpreterFactory.java: Convert IOException into RuntimeException.
diff --git a/frysk-core/frysk/proc/dead/DeadHost.java b/frysk-core/frysk/proc/dead/DeadHost.java
index dd90783..08a5baf 100644
--- a/frysk-core/frysk/proc/dead/DeadHost.java
+++ b/frysk-core/frysk/proc/dead/DeadHost.java
@@ -41,7 +41,7 @@ package frysk.proc.dead;
import frysk.proc.Host;
import java.util.HashSet;
-import frysk.proc.TaskObserver.Attached;
+import frysk.proc.TaskAttachedObserverXXX;
hooks/post-receive
--
frysk system monitor/debugger