public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Switch come code to frysk.rsl.
@ 2008-02-15 17:46 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-02-15 17:46 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  03abb6e93ea57566aa3b1b505cabc330287895eb (commit)
       via  acd33f83460580cb3dfc6eb2f0fe66b51402312b (commit)
      from  e16ca9dec6f5594d605d923d7d1f8a0235a916e3 (commit)

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

- Log -----------------------------------------------------------------
commit 03abb6e93ea57566aa3b1b505cabc330287895eb
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Feb 15 12:46:00 2008 -0500

    Switch come code to frysk.rsl.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-02-15  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceProc.java: Use frysk.rsl.
    	* LinuxPtraceTaskState.java: Ditto.
    	* IsaFactory.java: Ditto.
    	* LinuxPtraceTask.java: Ditto.
    	* LinuxWaitBuilder.java: Ditto.
    	* LinuxPtraceProcState.java: Ditto.
    	* State.java: Ditto.
    	* TestTaskObserverBlocked.java: Ditto.
    
    frysk-sys/frysk/rsl/ChangeLog
    2008-02-15  Andrew Cagney  <cagney@redhat.com>
    
    	* Log.java: Add more log methods and boolean support.

commit acd33f83460580cb3dfc6eb2f0fe66b51402312b
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Feb 15 09:18:05 2008 -0500

    frysk-core/frysk/proc/live/ChangeLog
    2008-02-15  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceHost.java: Replace TaskId with ProcessIdentifier.

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

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog               |   13 ++
 frysk-core/frysk/proc/live/IsaFactory.java         |   11 +-
 frysk-core/frysk/proc/live/LinuxPtraceHost.java    |   15 +-
 frysk-core/frysk/proc/live/LinuxPtraceProc.java    |   30 ++--
 .../frysk/proc/live/LinuxPtraceProcState.java      |   64 ++++----
 frysk-core/frysk/proc/live/LinuxPtraceTask.java    |  139 +++++++---------
 .../frysk/proc/live/LinuxPtraceTaskState.java      |  178 +++++++++-----------
 frysk-core/frysk/proc/live/LinuxWaitBuilder.java   |   13 +-
 frysk-core/frysk/proc/live/State.java              |    8 +-
 .../frysk/proc/live/TestTaskObserverBlocked.java   |   25 ++--
 frysk-sys/frysk/rsl/ChangeLog                      |    4 +
 frysk-sys/frysk/rsl/Log.java                       |   34 ++++-
 12 files changed, 271 insertions(+), 263 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index ea26cdb..8881a4a 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,16 @@
+2008-02-15  Andrew Cagney  <cagney@redhat.com>
+
+	* LinuxPtraceProc.java: Use frysk.rsl.
+	* LinuxPtraceTaskState.java: Ditto.
+	* IsaFactory.java: Ditto.
+	* LinuxPtraceTask.java: Ditto.
+	* LinuxWaitBuilder.java: Ditto.
+	* LinuxPtraceProcState.java: Ditto.
+	* State.java: Ditto.
+	* TestTaskObserverBlocked.java: Ditto.
+
+	* LinuxPtraceHost.java: Replace TaskId with ProcessIdentifier.
+
 2008-02-14  Andrew Cagney  <cagney@redhat.com>
 
 	* LiveProc.java: Replace ProcId with ProcessIdentifier and int.
diff --git a/frysk-core/frysk/proc/live/IsaFactory.java b/frysk-core/frysk/proc/live/IsaFactory.java
index 298a116..5317e83 100644
--- a/frysk-core/frysk/proc/live/IsaFactory.java
+++ b/frysk-core/frysk/proc/live/IsaFactory.java
@@ -39,8 +39,6 @@
 
 package frysk.proc.live;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.Hashtable;
 import java.io.File;
 import lib.dwfl.Elf;
@@ -50,11 +48,12 @@ import lib.dwfl.ElfEMachine;
 import lib.dwfl.ElfException;
 import lib.dwfl.ElfFileException;
 import frysk.sys.ProcessIdentifier;
+import frysk.rsl.Log;
+
+public class IsaFactory {
+    private static final Log fine = Log.fine(IsaFactory.class);
 
-public class IsaFactory
-{
   private static IsaFactory factory;
-  static final Logger logger = Logger.getLogger("frysk");
   private Hashtable isaHash;
   private String MESSAGE = "getting task's executable";
     
@@ -88,7 +87,7 @@ public class IsaFactory
      * the processes memory is still readable.
      */
     Isa getIsa(ProcessIdentifier pid) {
-	logger.log (Level.FINE, "{0} getIsa\n", this);
+	fine.log(this, "getIsa", pid);
 	
 	// FIXME: This should use task.proc.getExe().  Only that
 	// causes wierd failures; take a rain-check :-(
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
index 08aecbe..84717b0 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
@@ -48,13 +48,12 @@ import frysk.proc.Proc;
 import frysk.sys.proc.Stat;
 import frysk.sys.proc.ProcBuilder;
 import java.util.Iterator;
-import frysk.proc.TaskId;
 import frysk.proc.Task;
 import frysk.proc.TaskObserver.Attached;
 import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import frysk.proc.Manager;
-import java.util.logging.Level;
+import frysk.rsl.Log;
 import frysk.sys.Fork;
 import frysk.sys.Tid;
 import frysk.sys.Pid;
@@ -68,6 +67,8 @@ import java.util.Collection;
  */
 
 public class LinuxPtraceHost extends LiveHost {
+    private static final Log fine = Log.fine(LinuxPtraceHost.class);
+
     /**
      * Construct an instance of the LinuxPtraceHost that uses the
      * specified eventLoop.
@@ -202,7 +203,7 @@ public class LinuxPtraceHost extends LiveHost {
   
     public void requestRefresh(final Collection knownProcesses,
 			       final HostRefreshBuilder updates) {
-	logger.log(Level.FINE, "{0} requestRefresh\n", this);
+	fine.log(this, "requestRefresh");
 	Manager.eventLoop.add(new Event() {
 		public void execute() {
 		    LinuxPtraceHost.this.executeRefresh(knownProcesses,
@@ -249,15 +250,15 @@ public class LinuxPtraceHost extends LiveHost {
 					  final String stderr,
 					  final String[] args,
 					  final Attached attachedObserver) {
- 	logger.log(Level.FINE, "{0} requestCreateAttachedProc\n", this); 
+	fine.log(this, "requestCreateAttachedProc");
 	Manager.eventLoop.add(new Event() {
 		public void execute() {
-		    logger.log(Level.FINE, "{0} sendCreateAttachedProc\n", this);
+		    fine.log(LinuxPtraceHost.this, "executeCreateAttachedProc");
 		    ProcessIdentifier pid
 			= Fork.ptrace(stdin, stdout, stderr, args);
 		    // See if the Host knows about this task.
-		    TaskId myTaskId = new TaskId(Tid.get().intValue());
-		    Task myTask = get(myTaskId);
+		    ProcessIdentifier myTid = Tid.get();
+		    Task myTask = getTask(myTid);
 		    if (myTask == null) {
 			// If not, find this process and add this task to it.
 			Proc myProc = getSelf();
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index 933bd79..6f59dd0 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -54,7 +54,7 @@ import frysk.sys.proc.MapsBuilder;
 import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import frysk.sys.proc.Status;
-import java.util.logging.Level;
+import frysk.rsl.Log;
 import frysk.sys.proc.ProcBuilder;
 import java.util.Map;
 import java.util.HashMap;
@@ -70,6 +70,8 @@ import frysk.proc.TaskObserver;
  */
 
 public class LinuxPtraceProc extends LiveProc {
+    private static final Log fine = Log.fine(LinuxPtraceProc.class);
+
     /**
      * Create a new detached process.  RUNNING makes no sense here.
      * Since PARENT could be NULL, also explicitly pass in the host.
@@ -318,7 +320,7 @@ public class LinuxPtraceProc extends LiveProc {
      * tables.
      */
     public void requestRefresh() {
-	logger.log(Level.FINE, "{0} requestRefresh\n", this);
+	fine.log(this, "requestRefresh");
 	Manager.eventLoop.add(new ProcEvent() {
 		public void execute() {
 		    newState = oldState().handleRefresh(LinuxPtraceProc.this);
@@ -333,7 +335,7 @@ public class LinuxPtraceProc extends LiveProc {
      * XXX: This should not be public.
      */
     void performRemoval() {
-	logger.log(Level.FINEST, "{0} performRemoval -- no longer in /proc\n", this);
+	fine.log(this, "performRemoval -- no longer in /proc");
 	Manager.eventLoop.add(new ProcEvent() {
 		public void execute() {
 		    newState = oldState().handleRemoval(LinuxPtraceProc.this);
@@ -348,7 +350,7 @@ public class LinuxPtraceProc extends LiveProc {
      * XXX: Should not be public.
      */
     void performTaskAttachCompleted (final Task theTask) {
-	logger.log(Level.FINE, "{0} performTaskAttachCompleted\n", this);
+	fine.log(this, "performTaskAttachCompleted");
 	Manager.eventLoop.add(new ProcEvent() {
 		Task task = theTask;
 
@@ -365,7 +367,7 @@ public class LinuxPtraceProc extends LiveProc {
      * XXX: Should not be public.
      */
     void performTaskDetachCompleted(final Task theTask) {
-	logger.log(Level.FINE, "{0} performTaskDetachCompleted\n", this);
+	fine.log(this, "performTaskDetachCompleted");
 	Manager.eventLoop.add(new ProcEvent() {
 		Task task = theTask;
 		public void execute() {
@@ -379,7 +381,7 @@ public class LinuxPtraceProc extends LiveProc {
      * completed its detach.
      */
     void performTaskDetachCompleted(final Task theTask, final Task theClone) {
-	logger.log(Level.FINE, "{0} performTaskDetachCompleted/clone\n", this);
+	fine.log(this, "performTaskDetachCompleted/clone");
 	Manager.eventLoop.add(new ProcEvent() {
 		Task task = theTask;
 
@@ -392,7 +394,7 @@ public class LinuxPtraceProc extends LiveProc {
     }
 
     protected void performDetach() {
-	logger.log(Level.FINE, "{0} performDetach\n", this);
+	fine.log(this, "performDetach");
 	Manager.eventLoop.add(new ProcEvent() {
 		public void execute() {
 		    newState = oldState().handleDetach(LinuxPtraceProc.this, true);
@@ -414,7 +416,7 @@ public class LinuxPtraceProc extends LiveProc {
      */
     void requestAddObserver(Task task, TaskObservable observable,
 			    TaskObserver observer) {
-	logger.log(Level.FINE, "{0} requestAddObservation\n", this);
+	fine.log(this, "requestAddObservation");
 	Manager.eventLoop.add(new TaskObservation((LinuxPtraceTask)task,
 						  observable, observer, true) {
 		public void execute() {
@@ -469,7 +471,7 @@ public class LinuxPtraceProc extends LiveProc {
      */
     void requestAddSyscallObserver(final Task task, TaskObservable observable,
 				   TaskObserver observer) {
-	logger.log(Level.FINE, "{0} requestAddSyscallObserver\n", this);
+	fine.log(this, "requestAddSyscallObserver");
 	SyscallAction sa = new SyscallAction((LinuxPtraceTask)task, true);
 	TaskObservation to = new TaskObservation((LinuxPtraceTask)task,
 						 observable, observer, sa,
@@ -491,7 +493,7 @@ public class LinuxPtraceProc extends LiveProc {
     void requestDeleteSyscallObserver(final Task task,
 				      TaskObservable observable,
 				      TaskObserver observer) {
-	logger.log(Level.FINE, "{0} requestDeleteSyscallObserver\n", this);
+	fine.log(this, "requestDeleteSyscallObserver");
 	SyscallAction sa = new SyscallAction((LinuxPtraceTask)task, false);
 	TaskObservation to = new TaskObservation((LinuxPtraceTask)task,
 						 observable, observer, sa,
@@ -557,7 +559,7 @@ public class LinuxPtraceProc extends LiveProc {
     void requestAddCodeObserver(Task task, TaskObservable observable,
 				TaskObserver.Code observer,
 				final long address) {
-	logger.log(Level.FINE, "{0} requestAddCodeObserver\n", this);
+	fine.log(this, "requestAddCodeObserver");
 	BreakpointAction bpa = new BreakpointAction(observer, task, address, true);
 	TaskObservation to;
 	to = new TaskObservation((LinuxPtraceTask) task, observable, observer,
@@ -579,7 +581,7 @@ public class LinuxPtraceProc extends LiveProc {
     void requestDeleteCodeObserver(Task task, TaskObservable observable,
 				   TaskObserver.Code observer,
 				   final long address)    {
-	logger.log(Level.FINE, "{0} requestDeleteCodeObserver\n", this);
+	fine.log(this, "requestDeleteCodeObserver");
 	BreakpointAction bpa = new BreakpointAction(observer, task, address, false);
 	TaskObservation to;
 	to = new TaskObservation((LinuxPtraceTask)task, observable, observer, bpa, false) {
@@ -626,7 +628,7 @@ public class LinuxPtraceProc extends LiveProc {
     void requestAddInstructionObserver(final Task task,
 				       TaskObservable observable,
 				       TaskObserver.Instruction observer) {
-	logger.log(Level.FINE, "{0} requestAddInstructionObserver\n", this);
+	fine.log(this, "requestAddInstructionObserver");
 	TaskObservation to;
 	InstructionAction ia = new InstructionAction();
 	to = new TaskObservation((LinuxPtraceTask)task, observable, observer, ia, true) {
@@ -660,7 +662,7 @@ public class LinuxPtraceProc extends LiveProc {
     void requestDeleteInstructionObserver(final Task task,
 					  TaskObservable observable,
 					  TaskObserver.Instruction observer) {
-	logger.log(Level.FINE, "{0} requestDeleteInstructionObserver\n", this);
+	fine.log(this, "requestDeleteInstructionObserver");
 	TaskObservation to;
 	InstructionAction ia = new InstructionAction();
 	to = new TaskObservation((LinuxPtraceTask)task, observable, observer, ia, false) {
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
index ce77c57..10e99c9 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
@@ -42,7 +42,7 @@ package frysk.proc.live;
 import java.util.Iterator;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.logging.Level;
+import frysk.rsl.Log;
 import frysk.proc.Observation;
 import frysk.proc.TaskId;
 import frysk.proc.Manager;
@@ -53,6 +53,9 @@ import frysk.proc.Manager;
  */
 
 abstract class LinuxPtraceProcState extends State {
+    private static final Log fine = Log.fine(LinuxPtraceProcState.class);
+    private static final Log finest = Log.finest(LinuxPtraceProcState.class);
+
     LinuxPtraceProcState(String state) {
 	super (state);
     }
@@ -89,7 +92,7 @@ abstract class LinuxPtraceProcState extends State {
      * added is assumed to be about to detach.
      */
     static LinuxPtraceProcState initial (boolean starting) {
-	logger.log (Level.FINEST, "{0} initial\n");
+	fine.log("initial", starting);
 	if (starting)
 	    return new Detaching();
 	else
@@ -102,15 +105,13 @@ abstract class LinuxPtraceProcState extends State {
      */
     private static final LinuxPtraceProcState detached = new LinuxPtraceProcState ("detached")
 	{
-	    LinuxPtraceProcState handleRefresh (LinuxPtraceProc proc)
-	    {
-		logger.log (Level.FINE, "{0} handleRefresh\n", proc); 
+	    LinuxPtraceProcState handleRefresh(LinuxPtraceProc proc) {
+		fine.log("handleRefresh", proc); 
 		proc.sendRefresh ();
 		return detached;
 	    }
-	    LinuxPtraceProcState handleRemoval (LinuxPtraceProc proc)
-	    {
-		logger.log (Level.FINEST, "{0} handleRemoval\n", proc); 
+	    LinuxPtraceProcState handleRemoval(LinuxPtraceProc proc) {
+		fine.log("handleRemoval", proc); 
 		// XXX: What about a dieing proc's tasks, have a
 		// dieing state and force a proc refresh?
 		if (proc.parent != null)
@@ -118,16 +119,15 @@ abstract class LinuxPtraceProcState extends State {
 		return destroyed;
 	    }
 	    LinuxPtraceProcState handleAddObservation (LinuxPtraceProc proc,
-					    Observation observation)
-	    {
-	    	logger.log (Level.FINE, "{0} handleAddObserver \n", proc); 
+						       Observation observation) {
+	    	fine.log("handleAddObserver", proc); 
 	    	return Attaching.initialState (proc, observation);
 	    }
 
 	    LinuxPtraceProcState handleDeleteObservation (LinuxPtraceProc proc,
 					       Observation observation)
 	    {
-	    	logger.log (Level.FINE, "{0} handleDeleteObservation\n", proc); 
+	    	fine.log("handleDeleteObservation", proc); 
 		// Must be bogus; if there were observations then the
 		// Proc wouldn't be in this state.
 		observation.fail (new RuntimeException ("not attached"));
@@ -147,7 +147,7 @@ abstract class LinuxPtraceProcState extends State {
 	 */
 	static LinuxPtraceProcState initialState (LinuxPtraceProc proc, Observation observation)
 	{
-	    logger.log (Level.FINE, "{0} state\n", proc); 
+	    fine.log("state", proc); 
 	    if (!proc.addObservation (observation))
 		observation.fail(new RuntimeException("not actually added"));
 	    // Grab the main task; only bother with the refresh if the
@@ -173,7 +173,7 @@ abstract class LinuxPtraceProcState extends State {
 	 */
 	private static LinuxPtraceProcState allAttached (LinuxPtraceProc proc)
 	{
-	    logger.log (Level.FINE, "{0} allAttached\n", proc); 
+	    fine.log("allAttached", proc); 
 	    for (Iterator i = proc.observationsIterator();
 		 i.hasNext ();) {
 		Observation observation = (Observation) i.next ();
@@ -204,7 +204,7 @@ abstract class LinuxPtraceProcState extends State {
 	    }
 	    LinuxPtraceProcState handleTaskAttachCompleted (LinuxPtraceProc proc, LinuxPtraceTask task)
 	    {
-		logger.log (Level.FINE, "{0} handleTaskAttachCompleted\n", proc); 
+		fine.log("handleTaskAttachCompleted", proc); 
 		// With the main task attached, it is possible to get
 		// an up-to-date list of tasks.  Remove from it the
 		// tasks already being attached.  Ask them to also
@@ -229,7 +229,7 @@ abstract class LinuxPtraceProcState extends State {
 	    LinuxPtraceProcState handleAddObservation (LinuxPtraceProc proc,
 					    Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleAddObservation\n", proc); 
+		fine.log("handleAddObservation", proc); 
 		// An extra observation, just add it to the list.
 		proc.addObservation (observation);
 		return this;
@@ -237,7 +237,7 @@ abstract class LinuxPtraceProcState extends State {
 	    LinuxPtraceProcState handleDeleteObservation (LinuxPtraceProc proc,
 					       Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleDeleteObservation\n", proc); 
+		fine.log("handleDeleteObservation", proc); 
 		// If the observation was never added, this will
 		// return false, but that is ok.
 		proc.removeObservation (observation);
@@ -258,7 +258,7 @@ abstract class LinuxPtraceProcState extends State {
         
 	    LinuxPtraceProcState handleDetach(LinuxPtraceProc proc, boolean shouldRemoveObservers)
 	    {
-		logger.log(Level.FINE, "{0} handleDetach\n", proc);
+		fine.log("handleDetach", proc);
 		return new Detaching (proc, shouldRemoveObservers);
 	    } 
 
@@ -277,7 +277,7 @@ abstract class LinuxPtraceProcState extends State {
 	    }
 	    LinuxPtraceProcState handleTaskAttachCompleted (LinuxPtraceProc proc, LinuxPtraceTask task)
 	    {
-		logger.log (Level.FINE, "{0} handleTaskAttachCompleted\n", proc); 
+		fine.log("handleTaskAttachCompleted", proc); 
 		// As each task reports that it has been attached,
 		// remove it from the pool, wait until there are none
 		// left.
@@ -289,14 +289,14 @@ abstract class LinuxPtraceProcState extends State {
 	    LinuxPtraceProcState handleAddObservation (LinuxPtraceProc proc,
 					    Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleAddObservation\n", proc); 
+		fine.log("handleAddObservation", proc); 
 		proc.addObservation (observation);
 		return this;
 	    }
 	    LinuxPtraceProcState handleDeleteObservation (LinuxPtraceProc proc,
 					       Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleDeleteObservation\n", proc); 
+		fine.log("handleDeleteObservation", proc); 
 		proc.removeObservation (observation);
 		observation.fail (new RuntimeException ("canceled"));
 		if (proc.observationsSize () == 0)
@@ -347,7 +347,7 @@ abstract class LinuxPtraceProcState extends State {
 	}
 	LinuxPtraceProcState handleTaskDetachCompleted (LinuxPtraceProc proc, LinuxPtraceTask task)
 	{
-	    logger.log (Level.FINE, "{0} handleTaskDetachCompleted. LinuxPtraceTask {1}\n", new Object[] {proc, task});
+	    fine.log("handleTaskDetachCompleted", proc, "task", task);
 	    // As each task reports that it has detached, add it
 	    // to the detached list.
 	    attachedTasks.remove (task);
@@ -361,9 +361,7 @@ abstract class LinuxPtraceProcState extends State {
 	LinuxPtraceProcState handleTaskDetachCompleted (LinuxPtraceProc proc, LinuxPtraceTask task,
 					     LinuxPtraceTask clone)
 	{
-	    logger.log (Level.FINE,
-			"{0} handleTaskDetachCompleted\n",
-			proc);
+	    fine.log("handleTaskDetachCompleted", proc);
 	    attachedTasks.remove (task);
 	    // Doh, a clone, need to also wait for that to detach.
 	    attachedTasks.add (clone);
@@ -380,16 +378,14 @@ abstract class LinuxPtraceProcState extends State {
 	LinuxPtraceProcState handleAddObservation (LinuxPtraceProc proc,
 					Observation observation)
 	{
-	    logger.log (Level.FINE, "{0} handleAddObservation\n",
-			proc);
+	    fine.log("handleAddObservation", proc);
 	    // Ulgh, detaching and a new observer arrived.
 	    return Attaching.initialState (proc, observation);
 	}
 	LinuxPtraceProcState handleDeleteObservation (LinuxPtraceProc proc,
 					   Observation observation)
 	{
-	    logger.log (Level.FINE, "{0} handleDeleteObservation\n",
-			proc);
+	    fine.log("handleDeleteObservation", proc);
 	    // Ouch; request to remove what must be an already
 	    // removed observation.
 	    observation.fail (new RuntimeException ("canceled"));
@@ -413,7 +409,7 @@ abstract class LinuxPtraceProcState extends State {
 	    LinuxPtraceProcState handleAddObservation (LinuxPtraceProc proc,
 					    Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleAddObservation\n", proc); 
+		fine.log("handleAddObservation", proc); 
 		proc.addObservation(observation);
 		observation.handleAdd ();
 		return running;
@@ -421,12 +417,12 @@ abstract class LinuxPtraceProcState extends State {
 	    LinuxPtraceProcState handleDeleteObservation (LinuxPtraceProc proc,
 					       Observation observation)
 	    {
-		logger.log (Level.FINE, "{0} handleDeleteObservation\n", proc); 
+		fine.log("handleDeleteObservation", proc); 
 		if (proc.removeObservation (observation)) {
-		    logger.log(Level.FINEST, "handleDeleteObservation remove succeeded\n");
+		    finest.log("handleDeleteObservation remove succeeded");
 		    observation.handleDelete ();
 		    if (proc.observationsSize () == 0) {
-			logger.log(Level.FINEST, "handleDeleteObservation size == 0, detaching\n");
+			finest.log("handleDeleteObservation size == 0, detaching");
 			return new Detaching (proc, false);
 		    }
 		}
@@ -437,7 +433,7 @@ abstract class LinuxPtraceProcState extends State {
 	    }
 	    LinuxPtraceProcState handleDetach(LinuxPtraceProc proc, boolean shouldRemoveObservers)
             {
-		logger.log(Level.FINE, "{0} handleDetach\n", proc);
+		fine.log("handleDetach", proc);
 		return new Detaching (proc, shouldRemoveObservers);
             }        
 	};
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index ecad2a8..5f86dd6 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -53,7 +53,6 @@ import frysk.proc.TaskObserver.Terminating;
 import frysk.proc.TaskObserver;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import java.util.logging.Level;
 import frysk.event.Event;
 import inua.eio.ByteBuffer;
 import inua.eio.ByteOrder;
@@ -67,12 +66,15 @@ import frysk.isa.ISA;
 import frysk.isa.ElfMap;
 import java.io.File;
 import frysk.isa.banks.RegisterBanks;
+import frysk.rsl.Log;
 
 /**
  * A Linux Task tracked using PTRACE.


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-02-15 17:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-15 17:46 [SCM] master: Switch come code to frysk.rsl cagney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).