This is the mail archive of the frysk-cvs@sources.redhat.com mailing list for the frysk project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[SCM] master: Push Host.requestProc into sub-classes.


The branch, master has been updated
       via  e0f002f5df6e8a32204c53578432f499217d0988 (commit)
       via  e7258b106e1dd4e588fc42839aa9e5066c82d26c (commit)
      from  8ef752b059d5ef9aab05f147a729452efea6afbe (commit)

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

- Log -----------------------------------------------------------------
commit e0f002f5df6e8a32204c53578432f499217d0988
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Jan 8 00:00:18 2008 -0500

    Push Host.requestProc into sub-classes.
    
    frysk-core/frysk/proc/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* Host.java requestProc(ProcId,FindProc): Make abstract.
    	(sendRefresh(ProcId,FindProc)): Delete.
    
    frysk-core/frysk/proc/dead/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxCoreHost.java (sendRefresh(ProcId,FindProc)): Delete.
    	* LinuxExeHost.java (sendRefresh(ProcId,FindProc)): Delete.
    	* DeadHost.java (requestProc(ProcId,FindProc)): New.
    
    frysk-core/frysk/proc/dummy/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* DummyHost.java (requestProc(ProcId,FindProc)): Replace
    	sendRefresh(ProcId,FindProc).
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceHost.java (requestProc(ProcId,FindProc)): Replace
    	sendRefresh(ProcId,FindProc).

commit e7258b106e1dd4e588fc42839aa9e5066c82d26c
Author: Andrew Cagney <cagney@redhat.com>
Date:   Mon Jan 7 23:38:31 2008 -0500

    Replace Host.requestFindProc with Host.requestProc.
    
    frysk-core/frysk/bindir/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* fstep.java: Update; use Host.requestProc(ProcId,FindProc).
    
    frysk-core/frysk/ftrace/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* Ftrace.java: Update; use Host.requestProc(ProcId,FindProc).
    
    frysk-core/frysk/hpd/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* AttachCommand.java: Update; use Host.requestProc(ProcId,FindProc).
    	* TestLib.java: Ditto.
    
    frysk-core/frysk/proc/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* FindProc.java (procFound(Proc)): Replace procFound(ProcId).
    	(procNotFound(ProcId)): Replace
    	procNotFound(ProcId,RuntimeException).
    	* Host.java (requestProc(ProcId,FindProc)): Rename
    	requestFindProc.
    	* TestTaskSyscallObserver.java: Update.
    	* TestSyscallRunning.java: Update.
    	* ProcBlockAction.java: Update.
    	* TestBreakpoints.java: Update.
    	* TestFindProc.java: Ditto.
    	* TestSyscallSignal.java: Update.
    
    frysk-core/frysk/proc/dead/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxCoreHost.java: Update; implement FindProc.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceHost.java: Update; implement FindProc.
    	(sendGetProc): Delete.
    
    frysk-core/frysk/testbed/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* Offspring.java: Update; use Host.requestProc.
    
    frysk-core/frysk/util/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* FCatch.java: Update; use Host.requestProc.
    	* TestFCatch.java: Ditto.
    	* Util.java: Ditto.

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

Summary of changes:
 frysk-core/frysk/bindir/ChangeLog                  |    2 +
 frysk-core/frysk/bindir/fstep.java                 |   21 ++--
 frysk-core/frysk/ftrace/ChangeLog                  |    4 +
 frysk-core/frysk/ftrace/Ftrace.java                |    6 +-
 frysk-core/frysk/hpd/AttachCommand.java            |    8 +-
 frysk-core/frysk/hpd/ChangeLog                     |    5 +
 frysk-core/frysk/hpd/TestLib.java                  |    9 +-
 frysk-core/frysk/proc/ChangeLog                    |   15 +++
 frysk-core/frysk/proc/FindProc.java                |   12 +-
 frysk-core/frysk/proc/Host.java                    |   11 +--
 frysk-core/frysk/proc/ProcBlockAction.java         |   26 ++---
 frysk-core/frysk/proc/TestBreakpoints.java         |    8 +-
 frysk-core/frysk/proc/TestFindProc.java            |   53 ++++------
 frysk-core/frysk/proc/TestSyscallRunning.java      |   13 +-
 frysk-core/frysk/proc/TestSyscallSignal.java       |   12 +-
 frysk-core/frysk/proc/TestTaskSyscallObserver.java |   41 +++----
 frysk-core/frysk/proc/dead/ChangeLog               |    6 +
 frysk-core/frysk/proc/dead/DeadHost.java           |   21 ++++
 frysk-core/frysk/proc/dead/LinuxCoreHost.java      |   26 -----
 frysk-core/frysk/proc/dead/LinuxExeHost.java       |    9 --
 frysk-core/frysk/proc/dummy/ChangeLog              |    3 +
 frysk-core/frysk/proc/dummy/DummyHost.java         |    3 +-
 frysk-core/frysk/proc/live/ChangeLog               |    6 +
 frysk-core/frysk/proc/live/LinuxPtraceHost.java    |  117 ++++----------------
 frysk-core/frysk/testbed/ChangeLog                 |    4 +
 frysk-core/frysk/testbed/Offspring.java            |   11 +-
 frysk-core/frysk/util/ChangeLog                    |    6 +
 frysk-core/frysk/util/FCatch.java                  |    9 +-
 frysk-core/frysk/util/TestFCatch.java              |   17 +--
 frysk-core/frysk/util/Util.java                    |   11 +-
 30 files changed, 202 insertions(+), 293 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index 9925b91..6bda106 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* fstep.java: Update; use Host.requestProc(ProcId,FindProc).
+
 	* fstep.java: Update; use Task.getPC().
 
 2007-12-20  Phil Muldoon  <pmuldoon@redhat.com>
diff --git a/frysk-core/frysk/bindir/fstep.java b/frysk-core/frysk/bindir/fstep.java
index 92749da..315e73c 100644
--- a/frysk-core/frysk/bindir/fstep.java
+++ b/frysk-core/frysk/bindir/fstep.java
@@ -176,20 +176,15 @@ public class fstep
     final fstep step = new fstep();
     if (pid != 0)
       {
-	Manager.host.requestFindProc(new ProcId(pid), new FindProc() {
-	    
-	    public void procFound (ProcId procId)
-	    {
-	      Proc proc = Manager.host.getProc(procId);
-	      Task mainTask = proc.getMainTask();
-	      mainTask.requestAddAttachedObserver(step);
+	Manager.host.requestProc(new ProcId(pid), new FindProc() {
+	    public void procFound(Proc proc) {
+		Task mainTask = proc.getMainTask();
+		mainTask.requestAddAttachedObserver(step);
 	    }
-	    
-	    public void procNotFound (ProcId procId, Exception e)
-	    {
-	      System.err.println("no such process (" + pid + ") " + e);
-	      parser.printHelp();
-	      System.exit(-1);
+	    public void procNotFound(ProcId procId) {
+		System.err.println("no such process: " + pid);
+		parser.printHelp();
+		System.exit(-1);
 	    }});
       }
     else
diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog
index 06c163e..96b10e7 100644
--- a/frysk-core/frysk/ftrace/ChangeLog
+++ b/frysk-core/frysk/ftrace/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-07  Andrew Cagney  <cagney@redhat.com>
+
+	* Ftrace.java: Update; use Host.requestProc(ProcId,FindProc).
+
 2007-12-28  Andrew Cagney  <cagney@redhat.com>
 
 	frysk.proc.TaskObserver.Syscall reanmed to .Syscalls. Syscall
diff --git a/frysk-core/frysk/ftrace/Ftrace.java b/frysk-core/frysk/ftrace/Ftrace.java
index 621054e..942530d 100644
--- a/frysk-core/frysk/ftrace/Ftrace.java
+++ b/frysk-core/frysk/ftrace/Ftrace.java
@@ -209,11 +209,11 @@ public class Ftrace
     public void trace () {
 	init();
 	for (Iterator it = tracedParents.iterator(); it.hasNext(); ){
-	    Manager.host.requestFindProc
+	    Manager.host.requestProc
 		((ProcId)it.next(),
 		 new FindProc() {
-		     public void procFound (ProcId procId) {}
-		     public void procNotFound (ProcId procId, Exception e) {
+		     public void procFound(Proc proc) {}
+		     public void procNotFound(ProcId procId) {
 			 System.err.println("No process with ID " + procId.intValue() + " found.");
 			 Manager.eventLoop.requestStop();
 		     }
diff --git a/frysk-core/frysk/hpd/AttachCommand.java b/frysk-core/frysk/hpd/AttachCommand.java
index 90b014f..ce960e6 100644
--- a/frysk-core/frysk/hpd/AttachCommand.java
+++ b/frysk-core/frysk/hpd/AttachCommand.java
@@ -52,13 +52,13 @@ class AttachCommand extends ParameterizedCommand {
 
 	boolean procSearchFinished = false;
 
-	public synchronized void procFound(ProcId procId) {
-	    proc = Manager.host.getProc(procId);
+	public synchronized void procFound(Proc proc) {
+	    this.proc = proc;
 	    procSearchFinished = true;
 	    notifyAll();
 	}
 
-	public synchronized void procNotFound(ProcId procId, Exception e) {
+	public synchronized void procNotFound(ProcId procId) {
 	    proc = null;
 	    procSearchFinished = true;
 	    notifyAll();
@@ -85,7 +85,7 @@ class AttachCommand extends ParameterizedCommand {
 	for (int i = 0; i < cmd.size(); i++) {
 	    int pid = Integer.parseInt(cmd.parameter(i));
 	    ProcFinder findProc = new ProcFinder();
-	    Manager.host.requestFindProc(new ProcId(pid), findProc);
+	    Manager.host.requestProc(new ProcId(pid), findProc);
 	    synchronized (findProc) {
 		while (!findProc.procSearchFinished) {
 		    try {
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 0361312..c87fb9c 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-07  Andrew Cagney  <cagney@redhat.com>
+
+	* AttachCommand.java: Update; use Host.requestProc(ProcId,FindProc).
+	* TestLib.java: Ditto.
+
 2008-01-03  Tim Moore  <timoore@redhat.com>
     
     	* BreakpointCommand.java (interpret): Throw error if no arguments
diff --git a/frysk-core/frysk/hpd/TestLib.java b/frysk-core/frysk/hpd/TestLib.java
index 6d8abe5..c8d45d7 100644
--- a/frysk-core/frysk/hpd/TestLib.java
+++ b/frysk-core/frysk/hpd/TestLib.java
@@ -77,19 +77,18 @@ class TestLib
 
 	    Proc proc;
 
-	    public void procFound(ProcId procId) {
-		proc = Manager.host.getProc(procId);
+	    public void procFound(Proc proc) {
+		this.proc = proc;
 		Manager.eventLoop.requestStop();
 	    }
-
-	    public void procNotFound(ProcId procId, Exception e) {
+	    public void procNotFound(ProcId procId) {
 		fail("Couldn't find child process");
 	    }
 
 	}
 
 	Finder finder = new Finder();
-	Manager.host.requestFindProc(new ProcId(pid.hashCode()), finder);
+	Manager.host.requestProc(new ProcId(pid.hashCode()), finder);
 	Manager.eventLoop.run();
 	return finder.proc;
     }
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 2715e70..ac4351a 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,20 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* Host.java requestProc(ProcId,FindProc): Make abstract.
+	(sendRefresh(ProcId,FindProc)): Delete.
+	
+	* FindProc.java (procFound(Proc)): Replace procFound(ProcId).
+	(procNotFound(ProcId)): Replace
+	procNotFound(ProcId,RuntimeException).
+	* Host.java (requestProc(ProcId,FindProc)): Rename
+	requestFindProc.
+	* TestTaskSyscallObserver.java: Update.
+	* TestSyscallRunning.java: Update.
+	* ProcBlockAction.java: Update.
+	* TestBreakpoints.java: Update.
+	* TestFindProc.java: Ditto.
+	* TestSyscallSignal.java: Update.
+
 	* Proc.java (getOutOfLineAddress()): Move to
 	frysk.proc.live.LinuxPtraceProc.
 	(breakpoints): Ditto.
diff --git a/frysk-core/frysk/proc/FindProc.java b/frysk-core/frysk/proc/FindProc.java
index 518120d..84ea46d 100644
--- a/frysk-core/frysk/proc/FindProc.java
+++ b/frysk-core/frysk/proc/FindProc.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, 2006, 2007, Red Hat Inc.
+// Copyright 2005, 2006, 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -43,20 +43,18 @@ package frysk.proc;
  * Interface to be used with Host.requestFindProc.
  */
 
-public interface FindProc
-{
+public interface FindProc {
     
     /**
      * The process was successfully found and added to the Host's list
      * of processes.
-     * @param procId the procId that was found.
+     * @param proc the Proc that was found.
      */
-    void procFound (ProcId procId);
+    void procFound(Proc proc);
 
     /**
      * The process with the given ID was not found.
      * @param procId the procId that was not found.
-     * @param e The exception that occurred.
      */
-    void procNotFound (ProcId procId, Exception e);    
+    void procNotFound(ProcId procId);    
 }
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index 946e901..421e1e0 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -115,9 +115,6 @@ public abstract class Host {
 	return (Proc) procPool.get(id);
     }
 
-    // Refresh the list of processes.
-    protected abstract void sendRefresh(ProcId procId, FindProc finder);
-    
     /**
      * Request that the Host scan the system's process tables
      * refreshing the internal structure to match.  Optionally refresh
@@ -128,13 +125,7 @@ public abstract class Host {
     /**
      * Find a specifc process from its Id.
      */
-    public void requestFindProc(final ProcId procId, final FindProc finder) {
-	Manager.eventLoop.add(new HostEvent("FindProc") {
-		public void execute() {
-		    logger.log(Level.FINE, "{0} handleRefresh\n", Host.this); 
-		    Host.this.sendRefresh (procId, finder);
-		}});
-    }
+    public abstract void requestProc(ProcId procId, FindProc finder);
     
     /**
      * Tell the host to create a running child process.
diff --git a/frysk-core/frysk/proc/ProcBlockAction.java b/frysk-core/frysk/proc/ProcBlockAction.java
index 080b92e..477c150 100644
--- a/frysk-core/frysk/proc/ProcBlockAction.java
+++ b/frysk-core/frysk/proc/ProcBlockAction.java
@@ -155,22 +155,16 @@ public class ProcBlockAction
   {
     logger.log(Level.FINE, "{0} new\n", this);
     
-    Manager.host.requestFindProc(procId, new FindProc() {
-
-      public void procFound (ProcId procId)
-      {
-        proc = Manager.host.getProc(procId);
-        taskList = proc.getTasks();
-        requestAdd();
-      }
-
-      public void procNotFound (ProcId procId, Exception e)
-      {
-        throw new RuntimeException("Proc not found " + procId.intValue());
-      }
-      
-    });
-    
+    Manager.host.requestProc(procId, new FindProc() {
+	    public void procFound(Proc proc) {
+		ProcBlockAction.this.proc = proc;
+		taskList = proc.getTasks();
+		requestAdd();
+	    }
+	    public void procNotFound(ProcId procId) {
+		throw new RuntimeException("Proc not found " + procId.intValue());
+	    }
+	});
   }
   
   public ProcBlockAction (File coreFile) {
diff --git a/frysk-core/frysk/proc/TestBreakpoints.java b/frysk-core/frysk/proc/TestBreakpoints.java
index f629bef..5d53858 100644
--- a/frysk-core/frysk/proc/TestBreakpoints.java
+++ b/frysk-core/frysk/proc/TestBreakpoints.java
@@ -93,14 +93,14 @@ public class TestBreakpoints
     out = new DataOutputStream(process.out.getOutputStream());
     
     // Make sure the core knows about it.
-    Manager.host.requestFindProc
+    Manager.host.requestProc
 	(new ProcId(process.pid.hashCode()),
 	 new FindProc() {
-	     public void procFound (ProcId procId) {
-		 proc = Manager.host.getProc(procId);
+	     public void procFound(Proc proc) {
+		 TestBreakpoints.this.proc = proc;
 		 Manager.eventLoop.requestStop();
 	     }
-	     public void procNotFound (ProcId procId, Exception e) {
+	     public void procNotFound(ProcId procId) {
 		 fail("proc not found");
 	     }
 	 });
diff --git a/frysk-core/frysk/proc/TestFindProc.java b/frysk-core/frysk/proc/TestFindProc.java
index 69b00be..45c5229 100644
--- a/frysk-core/frysk/proc/TestFindProc.java
+++ b/frysk-core/frysk/proc/TestFindProc.java
@@ -44,7 +44,6 @@ import java.util.Observable;
 import java.util.logging.Level;
 import java.util.Observer;
 import frysk.testbed.TestLib;
-import frysk.event.RequestStopEvent;
 import frysk.testbed.SlaveOffspring;
 
 public class TestFindProc
@@ -66,30 +65,23 @@ public class TestFindProc
     }
   }
 
-  class MyFinder implements FindProc
-  {
-    ProcId expectedId;
-    
-    public MyFinder (ProcId pid)
-    {
-      expectedId = pid;
-    }
-    public void procFound (ProcId procId)
-    {
-      Proc proc = Manager.host.getProc(procId);
-      logger.log(Level.FINE, "proc: {0} proc parent: {1} \n",
-                 new Object[] { proc, proc.getParent() });
-      assertEquals (expectedId, procId);
-      Manager.eventLoop.add(new RequestStopEvent(Manager.eventLoop));
+    class MyFinder implements FindProc {
+	private final ProcId expectedId;
+	public MyFinder (ProcId pid) {
+	    expectedId = pid;
+	}
+	public void procFound(Proc proc) {
+	    logger.log(Level.FINE, "proc: {0} proc parent: {1} \n",
+		       new Object[] { proc, proc.getParent() });
+	    assertEquals("procId", expectedId, proc.getId());
+	    Manager.eventLoop.requestStop();
+	}
+	public void procNotFound(ProcId procId) {
+	    logger.log(Level.FINE, "{0} procId\n", procId);
+	    fail("Could not find process with ID" + procId.id);
+	}
     }
 
-    public void procNotFound (ProcId procId, Exception e)
-    {
-      logger.log(Level.FINE, "{0} procId\n", procId);
-      fail("Could not find process with ID" + procId.id);
-    }
-  }
-
   public void testFindProcDetached ()
   {
     SlaveOffspring ackProc = SlaveOffspring.createChild();
@@ -130,7 +122,7 @@ public class TestFindProc
      * Should be just the one.
      */
     FindProc finder = new MyFinder(new ProcId(ackProc.getPid()));
-    Manager.host.requestFindProc(new ProcId(ackProc.getPid()), finder);
+    Manager.host.requestProc(new ProcId(ackProc.getPid()), finder);
     assertRunUntilStop("testFindProc");
 
     int postFind = o.getCount();
@@ -143,21 +135,18 @@ public class TestFindProc
   {
     FindProc finder = new FindProc()
     {
-      public void procFound (ProcId procId)
-      {
-        logger.log(Level.FINE, "{0} procId\n", procId);
+      public void procFound(Proc proc) {
+        logger.log(Level.FINE, "{0} procId\n", proc);
         fail("Found proc 0, should have failed.");
       }
 
-      public void procNotFound (ProcId procId, Exception e)
-      {
+      public void procNotFound(ProcId procId) {
         logger.log(Level.FINE, "{0} procId\n", procId);
-        Manager.eventLoop.add(new RequestStopEvent(Manager.eventLoop));
-
+        Manager.eventLoop.requestStop();
       }
     };
 
-    Manager.host.requestFindProc(new ProcId(0), finder);
+    Manager.host.requestProc(new ProcId(0), finder);
     assertRunUntilStop("testFindFailed");
 
   }
diff --git a/frysk-core/frysk/proc/TestSyscallRunning.java b/frysk-core/frysk/proc/TestSyscallRunning.java
index 1e73ad7..a6decd4 100644
--- a/frysk-core/frysk/proc/TestSyscallRunning.java
+++ b/frysk-core/frysk/proc/TestSyscallRunning.java
@@ -91,16 +91,15 @@ public class TestSyscallRunning
     out = new DataOutputStream(process.out.getOutputStream());
 
     // Make sure the core knows about it.
-    Manager.host.requestFindProc(new ProcId(process.pid.hashCode()),
-				 new FindProc()
+    Manager.host.requestProc(new ProcId(process.pid.hashCode()),
+			     new FindProc()
 	{
-	    public void procFound (ProcId procId)
-	    {
-		proc = Manager.host.getProc(procId);
+	    public void procFound(Proc p) {
+		proc = p;
 		Manager.eventLoop.requestStop();
 	    }
-	    public void procNotFound (ProcId procId, Exception e)
-	    {
+	    public void procNotFound(ProcId procId) {
+		fail("proc not found");
 	    }
 	});
     assertRunUntilStop("finding proc");
diff --git a/frysk-core/frysk/proc/TestSyscallSignal.java b/frysk-core/frysk/proc/TestSyscallSignal.java
index 6170eff..3ec90c3 100644
--- a/frysk-core/frysk/proc/TestSyscallSignal.java
+++ b/frysk-core/frysk/proc/TestSyscallSignal.java
@@ -92,16 +92,14 @@ public class TestSyscallSignal
     out = new DataOutputStream(process.out.getOutputStream());
 
     // Make sure the core knows about it.
-    Manager.host.requestFindProc(new ProcId(pid.hashCode()),
-				 new FindProc()
+    Manager.host.requestProc(new ProcId(pid.hashCode()), new FindProc()
 	{
-	    public void procFound (ProcId procId)
-	    {
-		proc = Manager.host.getProc(procId);
+	    public void procFound(Proc p) {
+		proc = p;
 		Manager.eventLoop.requestStop();
 	    }
-	    public void procNotFound (ProcId procId, Exception e)
-	    {
+	    public void procNotFound (ProcId procId) {
+		fail("proc not found");
 	    }
 	});
     assertRunUntilStop("finding proc");
diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
index bb73dd3..3e83170 100644
--- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java
+++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
@@ -547,34 +547,25 @@ public class TestTaskSyscallObserver
 
     TestSyscallInterruptXXX (final int pid)
     {
-      Manager.host.requestFindProc(new ProcId(pid), new FindProc()
+      Manager.host.requestProc(new ProcId(pid), new FindProc()
       {
 
-        public void procFound (ProcId procId)
-        {
-          Proc p = host.getProc(new ProcId(pid));
-          if (p != null)
-            {
-              List tasks = p.getTasks();
-              for (Iterator i = tasks.iterator(); i.hasNext();)
-                {
-                  Task t = (Task) i.next();
-                  if (t.getTaskId().hashCode() == pid)
-                    {
-                      syscallObserver = new SyscallInterruptObserver(t);
-                      t.requestAddSyscallsObserver(syscallObserver);
-                      assertRunUntilStop("Add syscallObservers");
-                      t.requestAddSignaledObserver(syscallObserver);
-                      assertRunUntilStop("Add signaledObservers");
-                    }
-                }
-            }
-
-          Manager.eventLoop.requestStop();
+        public void procFound(Proc p) {
+	    List tasks = p.getTasks();
+	    for (Iterator i = tasks.iterator(); i.hasNext();) {
+		Task t = (Task) i.next();
+		if (t.getTaskId().hashCode() == pid) {
+		    syscallObserver = new SyscallInterruptObserver(t);
+		    t.requestAddSyscallsObserver(syscallObserver);
+		    assertRunUntilStop("Add syscallObservers");
+		    t.requestAddSignaledObserver(syscallObserver);
+		    assertRunUntilStop("Add signaledObservers");
+		}
+	    }
+	    Manager.eventLoop.requestStop();
         }
-
-        public void procNotFound (ProcId procId, Exception e)
-        {
+        public void procNotFound (ProcId procId) {
+	    fail("proc not found");
         }
       });
       Manager.eventLoop.run();


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]