[SCM] master: Move Task.pendingObservations to LinuxPtraceTask.

[cagney@sourceware.org]

The branch, master has been updated
       via  26aa2cd53bd6f4f9dbdf542d2969686776489fcc (commit)
       via  cab397955289fbe0c0811ad633ef694ed47f9f30 (commit)
      from  e9c42b96ada5c88bd7d1bf05c784f71e5a8dfa59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 26aa2cd53bd6f4f9dbdf542d2969686776489fcc
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Jan 15 23:51:08 2008 -0500

    Move Task.pendingObservations to LinuxPtraceTask.
    
    frysk-core/frysk/proc/ChangeLog
    2008-01-15  Andrew Cagney  <cagney@redhat.com>
    
    	* Task.java (pendingObservations): Move to LinuxPtraceTask.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-01-15  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceTask.java (pendingObservations): Move here from
    	frysk.proc.Task.

commit cab397955289fbe0c0811ad633ef694ed47f9f30
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Jan 15 23:40:40 2008 -0500

    Delete unused Task.TaskStateObservable.
    
    frysk-core/frysk/proc/ChangeLog
    2008-01-15  Andrew Cagney  <cagney@redhat.com>
    
    	* Task.java (TaskStateObservable): Delete.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/proc/ChangeLog                 |    4 +++
 frysk-core/frysk/proc/Task.java                 |   24 -----------------------
 frysk-core/frysk/proc/live/ChangeLog            |    3 ++
 frysk-core/frysk/proc/live/LinuxPtraceTask.java |    8 +++++++
 4 files changed, 15 insertions(+), 24 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index d9269ea..61ccb8a 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-15  Andrew Cagney  <cagney@redhat.com>
 
+	* Task.java (pendingObservations): Move to LinuxPtraceTask.
+
+	* Task.java (TaskStateObservable): Delete.
+
 	* TestIsa.java (DetachedObserver): Delete.
 	(testIsa()): Use StatState.
 	(testAttachDetachAttachAgainDetachAgainAttachAgainAgain()): Ditto.
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index 710c8c0..dcd37e0 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -42,13 +42,11 @@ package frysk.proc;
 import frysk.proc.TaskObserver.Terminating;
 import frysk.syscall.SyscallTable;
 import frysk.syscall.SyscallTableFactory;
-import java.util.LinkedList;
 import inua.eio.ByteBuffer;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.Observable;
 import frysk.isa.Register;
 import frysk.isa.ISA;
 import frysk.bank.RegisterBanks;
@@ -301,16 +299,6 @@ public abstract class Task {
     public abstract void requestDeleteInstructionObserver(TaskObserver.Instruction o);
 
     /**
-     * List containing the TaskObservations that are pending addition
-     * or deletion (in order that they were requested). Will be dealt
-     * with as soon as a stop event is received during one of the
-     * running states.
-     *
-     * XXX: Should not be public.
-     */
-    public LinkedList pendingObservations = new LinkedList();
-
-    /**
      * Return the address of the instruction that this task will
      * execute next.
      */
@@ -372,16 +360,4 @@ public abstract class Task {
 	syscallTable = null;
 	currentISA = null;
     }
-  
-    /**
-     * XXX: Temporary until .observable's are converted to
-     * .requestAddObserver.
-     */
-    public static class TaskStateObservable extends Observable {
-	public void notify(Object o) {
-	    logger.log(Level.FINE, "{0} notify -- all observers\n", o); 
-	    setChanged();
-	    notifyObservers(o);
-	}
-    }
 }
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index b8e3cab..5a67393 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-15  Andrew Cagney  <cagney@redhat.com>
 
+	* LinuxPtraceTask.java (pendingObservations): Move here from
+	frysk.proc.Task.
+
 	* LinuxPtraceTaskState.java: Don't notify Task.taskStateDetached.
 	* LinuxPtraceTask.java (sendDetach(int)): Call clearIsa().
 	
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index 20f4953..9f95ee9 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -39,6 +39,7 @@
 
 package frysk.proc.live;
 
+import java.util.LinkedList;
 import frysk.isa.Register;
 import frysk.isa.RegistersFactory;
 import java.util.Iterator;
@@ -903,6 +904,13 @@ public class LinuxPtraceTask extends LiveTask {
 	((LinuxPtraceProc)getProc()).requestDeleteInstructionObserver(this, instructionObservers, o);
     }
   
+    /**
+     * List containing the TaskObservations that are pending addition
+     * or deletion (in order that they were requested). Will be dealt
+     * with as soon as a stop event is received during one of the
+     * running states.
+     */
+    final LinkedList pendingObservations = new LinkedList();
 
     /**
      * (Internal) Request that all observers from this task be


hooks/post-receive
--
frysk system monitor/debugger