From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24811 invoked by alias); 14 Mar 2008 18:07:51 -0000 Received: (qmail 24754 invoked by uid 367); 14 Mar 2008 18:07:50 -0000 Date: Fri, 14 Mar 2008 18:07:00 -0000 Message-ID: <20080314180750.24739.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete observableProcRemovedXXX; ya! X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: de852ac86b074b8100e1f9b6c504dee5374dc08a X-Git-Newrev: 77a0036b92204ca3a06f8b35d8cdcf47b72c34cb 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/msg00370.txt.bz2 The branch, master has been updated via 77a0036b92204ca3a06f8b35d8cdcf47b72c34cb (commit) from de852ac86b074b8100e1f9b6c504dee5374dc08a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 77a0036b92204ca3a06f8b35d8cdcf47b72c34cb Author: Andrew Cagney Date: Fri Mar 14 14:06:27 2008 -0400 Delete observableProcRemovedXXX; ya! frysk-core/frysk/hpd/ChangeLog 2008-03-14 Andrew Cagney * UnloadCommand.java: Do not call Host.remove(Proc). frysk-core/frysk/proc/ChangeLog 2008-03-14 Andrew Cagney * Host.java (observableProcRemovedXXX): Delete. (remove(Proc)): Delete. (ObservableXXX): Delete. frysk-core/frysk/proc/live/ChangeLog 2008-03-14 Andrew Cagney * LinuxPtraceHost.java: Do not call Host.remove(Proc). * LinuxPtraceTaskState.java: Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 4 ++ frysk-core/frysk/hpd/UnloadCommand.java | 7 ---- frysk-core/frysk/proc/ChangeLog | 4 ++ frysk-core/frysk/proc/Host.java | 30 -------------------- frysk-core/frysk/proc/live/ChangeLog | 3 ++ frysk-core/frysk/proc/live/LinuxPtraceHost.java | 1 - .../frysk/proc/live/LinuxPtraceTaskState.java | 1 - 7 files changed, 11 insertions(+), 39 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 5c2da7b..0f1caa9 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,7 @@ +2008-03-14 Andrew Cagney + + * UnloadCommand.java: Do not call Host.remove(Proc). + 2008-03-14 Mark Wielaard * CLI.java (flushMessages): Make comment a javadoc comment. diff --git a/frysk-core/frysk/hpd/UnloadCommand.java b/frysk-core/frysk/hpd/UnloadCommand.java index 68d15e0..efdf38c 100644 --- a/frysk-core/frysk/hpd/UnloadCommand.java +++ b/frysk-core/frysk/hpd/UnloadCommand.java @@ -136,13 +136,6 @@ public class UnloadCommand extends ParameterizedCommand { * */ private void removeAllProcs(HashMap procMap, CLI cli) { - Set procSet = procMap.entrySet(); - Iterator foo = procSet.iterator(); - while (foo.hasNext()) { - Map.Entry me = (Map.Entry) foo.next(); - Proc proc = (Proc) me.getKey(); - proc.getHost().remove(proc); - } synchronized (cli) { procMap.clear(); } diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index 7c19295..b672cc7 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,9 @@ 2008-03-14 Andrew Cagney + * Host.java (observableProcRemovedXXX): Delete. + (remove(Proc)): Delete. + (ObservableXXX): Delete. + * TestExec.java (testTaskBlockExec()): Use StopEventLoopWhenProcTerminated. diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java index ee54225..53cfbb5 100644 --- a/frysk-core/frysk/proc/Host.java +++ b/frysk-core/frysk/proc/Host.java @@ -43,7 +43,6 @@ import java.io.File; import java.util.Collection; import java.util.Map; import java.util.HashMap; -import java.util.Observable; // XXX: Temporary. import frysk.rsl.Log; /** @@ -85,14 +84,6 @@ public abstract class Host implements Comparable { } /** - * XXX: Should not be public. - */ - public void remove(Proc proc) { - fine.log(this, "remove Proc"); - observableProcRemovedXXX.notify(proc); - } - - /** * Find a specifc process from its Id. */ public abstract void requestProc(int pid, FindProc finder); @@ -160,27 +151,6 @@ public abstract class Host implements Comparable { } /** - * XXX: Temporary until .observable's are converted to - * .requestAddObserver. - */ - public static class ObservableXXX extends Observable { - public void notify(Object o) { - setChanged(); - notifyObservers(o); - } - } - - /* - * An existing process has been removed. Possible reasons include - * the process is no longer listed in the system process table - * (and presumably has exited). - * - * XXX: Should be made private and instead accessor methods added. - * Should more formally define the observable and the event. - */ - public ObservableXXX observableProcRemovedXXX = new ObservableXXX(); - - /** * Return the process corresponding to this running frysk instance * found on this host. */ diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index 3738d03..1d1ecb7 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,5 +1,8 @@ 2008-03-14 Andrew Cagney + * LinuxPtraceHost.java: Do not call Host.remove(Proc). + * LinuxPtraceTaskState.java: Ditto. + * LinuxPtraceTaskState.java: Don't remove non-exec tasks; already deleted. * LinuxWaitBuilder.java (execEvent(ProcessIdentifier)): Kill off diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java index c733b00..e0ea0e8 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java @@ -200,7 +200,6 @@ public class LinuxPtraceHost extends LiveHost { // Manager .eventLoop .appendEvent for injecting the event // into the event loop? proc.performRemoval(); - remove(proc); } return procChanges; } diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java index a2d557f..8d800ce 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java @@ -168,7 +168,6 @@ class LinuxPtraceTaskState extends State { // A process with no tasks is dead ...? if (task.getProc().getTasks().size() == 0) { task.getProc().parent.remove(task.getProc()); - task.getProc().getHost().remove(task.getProc()); } } hooks/post-receive -- frysk system monitor/debugger