From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2664 invoked by alias); 14 Mar 2008 20:06:45 -0000 Received: (qmail 2638 invoked by uid 367); 14 Mar 2008 20:06:44 -0000 Date: Fri, 14 Mar 2008 20:06:00 -0000 Message-ID: <20080314200644.2623.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Mark observableAttached and observableDetached as "don't use". X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 77a0036b92204ca3a06f8b35d8cdcf47b72c34cb X-Git-Newrev: 2a0086b4846c2bb4bb2d5055efb8a784dae94019 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/msg00371.txt.bz2 The branch, master has been updated via 2a0086b4846c2bb4bb2d5055efb8a784dae94019 (commit) from 77a0036b92204ca3a06f8b35d8cdcf47b72c34cb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 2a0086b4846c2bb4bb2d5055efb8a784dae94019 Author: Andrew Cagney Date: Fri Mar 14 16:05:07 2008 -0400 Mark observableAttached and observableDetached as "don't use". frysk-core/frysk/proc/ChangeLog 2008-03-14 Andrew Cagney * Proc.java (observableAttachedXXX): Rename observableAttached. (observableDetachedXXX): Rename observableDetached. * StressAttachDetachRapidlyCloningMainTask.java: Update. * StressAttachDetachManyTasks.java: Update. * TestTaskObserverDetach.java: Update. frysk-core/frysk/proc/live/ChangeLog 2008-03-14 Andrew Cagney * LinuxPtraceProcState.java: Update to match Proc. frysk-core/frysk/testbed/ChangeLog 2008-03-14 Andrew Cagney * CoredumpAction.java: Update to match Proc. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 6 ++++++ frysk-core/frysk/proc/Proc.java | 16 +++++++--------- .../frysk/proc/StressAttachDetachManyTasks.java | 4 ++-- .../StressAttachDetachRapidlyCloningMainTask.java | 8 ++++---- frysk-core/frysk/proc/TestTaskObserver.java | 8 ++++---- frysk-core/frysk/proc/TestTaskObserverDetach.java | 4 ++-- frysk-core/frysk/proc/live/ChangeLog | 2 ++ .../frysk/proc/live/LinuxPtraceProcState.java | 4 ++-- frysk-core/frysk/testbed/ChangeLog | 4 ++++ frysk-core/frysk/testbed/CoredumpAction.java | 2 +- 10 files changed, 34 insertions(+), 24 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index b672cc7..b170c7d 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,11 @@ 2008-03-14 Andrew Cagney + * Proc.java (observableAttachedXXX): Rename observableAttached. + (observableDetachedXXX): Rename observableDetached. + * StressAttachDetachRapidlyCloningMainTask.java: Update. + * StressAttachDetachManyTasks.java: Update. + * TestTaskObserverDetach.java: Update. + * Host.java (observableProcRemovedXXX): Delete. (remove(Proc)): Delete. (ObservableXXX): Delete. diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java index e82b553..620a0c9 100644 --- a/frysk-core/frysk/proc/Proc.java +++ b/frysk-core/frysk/proc/Proc.java @@ -226,7 +226,7 @@ public abstract class Proc implements Comparable { public void requestAbandonAndRunEvent(final Event e) { fine.log(this, "abandonAndRunEvent"); requestAbandon(); - observableDetached.addObserver(new Observer() { + observableDetachedXXX.addObserver(new Observer() { public void update(Observable o, Object arg) { Manager.eventLoop.add(e); } @@ -368,18 +368,16 @@ public abstract class Proc implements Comparable { public abstract Auxv[] getAuxv(); /** - * The process has transitioned to the attached state. XXX: Should - * be made private and instead accessor methods added. Should more - * formally define the observable and the event. + * XXX: Clients should look at the updateRemoved() observer and + * use that to determine when they are attached or detached. */ - public ObservableXXX observableAttached = new ObservableXXX(); + public ObservableXXX observableAttachedXXX = new ObservableXXX(); /** - * The process has transitioned to the detached. XXX: Should be - * made private and instead accessor methods added. Should more - * formally define the observable and the event. + * XXX: Clients should look at the updateRemoved() observer and + * use that to determine when they are attached or detached. */ - public ObservableXXX observableDetached = new ObservableXXX(); + public ObservableXXX observableDetachedXXX = new ObservableXXX(); public String toString() { return ("{" + super.toString() diff --git a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java index 6cadc63..bc289c9 100644 --- a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java +++ b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java @@ -79,12 +79,12 @@ public class StressAttachDetachManyTasks // The main task never dies so at least it will have been // successfully attached. - proc.observableDetached.addObserver (new Observer () + proc.observableDetachedXXX.addObserver (new Observer () { Proc p = proc; public void update (Observable obj, Object arg) { - p.observableAttached.deleteObserver (this); + p.observableAttachedXXX.deleteObserver(this); Manager.eventLoop.requestStop (); } }); diff --git a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java index c46019e..83ceef4 100644 --- a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java +++ b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java @@ -92,12 +92,12 @@ public class StressAttachDetachRapidlyCloningMainTask for (int i = 0; i < tasks.length; i++) { tasks[i].requestAddAttachedObserver (canFailObserver); } - proc.observableAttached.addObserver (new Observer () + proc.observableAttachedXXX.addObserver (new Observer () { Proc p = proc; public void update (Observable obj, Object arg) { - p.observableAttached.deleteObserver (this); + p.observableAttachedXXX.deleteObserver (this); Manager.eventLoop.requestStop (); } }); @@ -110,12 +110,12 @@ public class StressAttachDetachRapidlyCloningMainTask for (int i = 0; i < tasks.length; i++) { tasks[i].requestDeleteAttachedObserver (canFailObserver); } - proc.observableDetached.addObserver (new Observer () + proc.observableDetachedXXX.addObserver (new Observer () { Proc p = proc; public void update (Observable obj, Object arg) { - p.observableAttached.deleteObserver (this); + p.observableAttachedXXX.deleteObserver (this); Manager.eventLoop.requestStop (); } }); diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java index 051e752..c69ec38 100644 --- a/frysk-core/frysk/proc/TestTaskObserver.java +++ b/frysk-core/frysk/proc/TestTaskObserver.java @@ -125,12 +125,12 @@ public class TestTaskObserver // the process reports back that the attach occurred. for (int i = 0; i < tasks.length; i++) tasks[i].requestAddAttachedObserver (attachedObserver); - tasks[0].getProc().observableAttached.addObserver (new Observer () + tasks[0].getProc().observableAttachedXXX.addObserver (new Observer () { Proc proc = tasks[0].getProc(); public void update (Observable obj, Object arg) { - proc.observableAttached.deleteObserver (this); + proc.observableAttachedXXX.deleteObserver (this); Manager.eventLoop.requestStop (); } }); @@ -163,12 +163,12 @@ public class TestTaskObserver // detached. for (int i = 0; i < tasks.length; i++) tasks[i].requestDeleteAttachedObserver (attachedObserver); - tasks[0].getProc().observableDetached.addObserver (new Observer () + tasks[0].getProc().observableDetachedXXX.addObserver (new Observer () { Proc proc = tasks[0].getProc(); public void update (Observable obj, Object arg) { - proc.observableAttached.deleteObserver (this); + proc.observableAttachedXXX.deleteObserver (this); Manager.eventLoop.requestStop (); } }); diff --git a/frysk-core/frysk/proc/TestTaskObserverDetach.java b/frysk-core/frysk/proc/TestTaskObserverDetach.java index edfb2ed..5cc4792 100644 --- a/frysk-core/frysk/proc/TestTaskObserverDetach.java +++ b/frysk-core/frysk/proc/TestTaskObserverDetach.java @@ -131,12 +131,12 @@ public class TestTaskObserverDetach extends TestLib { task.requestDeleteSignaledObserver (this); // Run the event-loop out waiting for the final detach. - task.getProc().observableDetached.addObserver (new Observer () + task.getProc().observableDetachedXXX.addObserver (new Observer () { Proc proc = task.getProc(); public void update (Observable obj, Object arg) { - proc.observableAttached.deleteObserver (this); + proc.observableAttachedXXX.deleteObserver (this); Manager.eventLoop.requestStop (); } }); diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index 1d1ecb7..773513b 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,5 +1,7 @@ 2008-03-14 Andrew Cagney + * LinuxPtraceProcState.java: Update to match Proc. + * LinuxPtraceHost.java: Do not call Host.remove(Proc). * LinuxPtraceTaskState.java: Ditto. diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java index c0fb413..59211ad 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java @@ -185,7 +185,7 @@ abstract class LinuxPtraceProcState extends State { LinuxPtraceTask t = (LinuxPtraceTask) i.next (); t.performContinue (); } - proc.observableAttached.notify (proc); + proc.observableAttachedXXX.notify (proc); return running; } /** @@ -354,7 +354,7 @@ abstract class LinuxPtraceProcState extends State { // Still more tasks to detach. return this; // All done, notify. - proc.observableDetached.notify (proc); + proc.observableDetachedXXX.notify (proc); return detached; } LinuxPtraceProcState handleTaskDetachCompleted (LinuxPtraceProc proc, LinuxPtraceTask task, diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog index 26a61f6..5d4988d 100644 --- a/frysk-core/frysk/testbed/ChangeLog +++ b/frysk-core/frysk/testbed/ChangeLog @@ -1,3 +1,7 @@ +2008-03-14 Andrew Cagney + + * CoredumpAction.java: Update to match Proc. + 2008-03-13 Andrew Cagney * StopEventLoopWhenProcRemoved.java: Delete. diff --git a/frysk-core/frysk/testbed/CoredumpAction.java b/frysk-core/frysk/testbed/CoredumpAction.java index a393724..d01a390 100644 --- a/frysk-core/frysk/testbed/CoredumpAction.java +++ b/frysk-core/frysk/testbed/CoredumpAction.java @@ -175,7 +175,7 @@ public class CoredumpAction implements ProcObserver.ProcAction { */ private void abandonCoreDump(Exception e) { proc.requestAbandon(); - proc.observableDetached.addObserver(new Observer() { + proc.observableDetachedXXX.addObserver(new Observer() { public void update(Observable o, Object arg) { Manager.eventLoop.add(new RequestStopEvent(Manager.eventLoop)); hooks/post-receive -- frysk system monitor/debugger