This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: syscallEvent, stopped, terminated, and disappeared take a ProcessIdentifier.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 7 Feb 2008 15:36:45 -0000
- Subject: [SCM] master: syscallEvent, stopped, terminated, and disappeared take a ProcessIdentifier.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via f0af780514b6076f72a50c4b76cabf13437fa51e (commit)
via 27339bfb101c271d65f952ae9dd7fe393951e9b0 (commit)
via 4d85de07fe975d07f09a54e6fa9a891079d6cc6d (commit)
from aa5fe5607833c6aa8117b82cfe2532b721d1939f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit f0af780514b6076f72a50c4b76cabf13437fa51e
Author: Andrew Cagney <cagney@redhat.com>
Date: Wed Feb 6 20:21:05 2008 -0500
syscallEvent, stopped, terminated, and disappeared take a ProcessIdentifier.
frysk-core/frysk/proc/live/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* LinuxWaitBuilder.java: Update to match WaitBuilder's
disappeared, syscallEvent, stopped, terminated.
frysk-core/frysk/testbed/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* LegacyOffspring.java: Update to match WaitBuilder's terminated.
* SlaveOffspring.java: Ditto.
frysk-sys/frysk/expunit/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitObserver.java: Update to match WaitBuilder's disappeared,
terminated, stopped, and syscallEvent.
frysk-sys/frysk/sys/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitBuilder.java (syscallEvent(ProcessIdentifier)): Replace
syscallEvent(int).
(stopped(ProcessIdentifier,Signal)): Replace stopped(int,Signal).
(terminated(ProcessIdentifier,Signal,int,boolean)): Replace
terminated(int,Signal,int,boolean).
(disappeared(ProcessIdentifier,Throwable)): Replace
disappeard(int,Throwable).
* cni/Wait.cxx (processStatus): Update.
* TestWait.java: Update.
* TestFork.java: Update.
* UnhandledWaitBuilder.java: Update.
* TestPipePair.java: Update.
* TestPtrace.java: Update.
frysk-sys/frysk/testbed/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* TearDownProcess.java: Update to match WaitBuilder's stopped,
syscallEvent, terminated, and disappeared.
* AttachedSelf.java: Ditto.
* TestTearDownProcess.java: Ditto.
commit 27339bfb101c271d65f952ae9dd7fe393951e9b0
Author: Andrew Cagney <cagney@redhat.com>
Date: Wed Feb 6 18:17:29 2008 -0500
exitEvent and execEvent pass a ProcessIdentifier.
frysk-core/frysk/proc/live/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* LinuxWaitBuilder.java: Update to match WaitBuilder's exitEvent
and execEvent.
frysk-sys/frysk/expunit/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitObserver.java: Update to match WaitBuilder's exitEvent and
execEvent.
frysk-sys/frysk/sys/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitBuilder.java (execEvent(ProcessIdentifier)): Replace
execEvent(int).
(exitEvent(ProcessIdentifier,Signal,int,boolean)): Replace
exitEvent(int,Signal,int,boolean).
* cni/Wait.cxx (processStatus): Update.
* UnhandledWaitBuilder.java: Update.
frysk-sys/frysk/testbed/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* TearDownProcess.java: Update to match WaitBuilder's execEvent
and exitEvent.
commit 4d85de07fe975d07f09a54e6fa9a891079d6cc6d
Author: Andrew Cagney <cagney@redhat.com>
Date: Wed Feb 6 15:09:21 2008 -0500
forkEvent and cloneEvent supply ProcessIdentifier.
frysk-core/frysk/proc/live/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceProc.java (LinuxPtraceProc(Task,ProcessIdentifier)):
Replace LinuxPtraceProc(Task,TaskId).
* LinuxPtraceHost.java: Update.
* LinuxPtraceTask.java (LinuxPtraceTask(Task,ProcessIdentifer)):
Replace LinuxPtraceTask(Task,TaskId).
* LinuxWaitBuilder.java: Update to match WaitBuilder.
frysk-sys/frysk/expunit/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitObserver.java: Update to match WaitBuilder.
frysk-sys/frysk/sys/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* WaitBuilder.java (cloneEvent(ProcessIdentifier,ProcessIdentifier)):
Replace cloneEvent(int,int).
* cni/Wait.cxx: Update.
* UnhandledWaitBuilder.java: Update.
(unhandled(String,ProcessIdentifier,String,Object)): New.
frysk-sys/frysk/testbed/ChangeLog
2008-02-06 Andrew Cagney <cagney@redhat.com>
* TearDownProcess.java: Update to match WaitBuilder.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/live/ChangeLog | 14 +++++
frysk-core/frysk/proc/live/LinuxPtraceHost.java | 2 +-
frysk-core/frysk/proc/live/LinuxPtraceProc.java | 5 +-
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 5 +-
frysk-core/frysk/proc/live/LinuxWaitBuilder.java | 53 ++++++++++-----------
frysk-core/frysk/testbed/ChangeLog | 3 +
frysk-core/frysk/testbed/LegacyOffspring.java | 5 +-
frysk-core/frysk/testbed/SlaveOffspring.java | 5 +-
frysk-sys/frysk/expunit/ChangeLog | 11 ++++
frysk-sys/frysk/expunit/WaitObserver.java | 17 ++++---
frysk-sys/frysk/sys/ChangeLog | 27 ++++++++++
frysk-sys/frysk/sys/TestFork.java | 8 ++--
frysk-sys/frysk/sys/TestPipePair.java | 8 ++--
frysk-sys/frysk/sys/TestPtrace.java | 57 ++++++++++------------
frysk-sys/frysk/sys/TestWait.java | 12 ++--
frysk-sys/frysk/sys/UnhandledWaitBuilder.java | 52 +++++++++-----------
frysk-sys/frysk/sys/WaitBuilder.java | 21 ++++----
frysk-sys/frysk/sys/cni/Wait.cxx | 57 ++++++++++++----------
frysk-sys/frysk/testbed/AttachedSelf.java | 38 +++++++--------
frysk-sys/frysk/testbed/ChangeLog | 11 ++++
frysk-sys/frysk/testbed/TearDownProcess.java | 43 +++++++----------
frysk-sys/frysk/testbed/TestTearDownProcess.java | 3 +-
22 files changed, 254 insertions(+), 203 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 01f0b15..73a40a1 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,19 @@
2008-02-06 Andrew Cagney <cagney@redhat.com>
+ * LinuxWaitBuilder.java: Update to match WaitBuilder's
+ disappeared, syscallEvent, stopped, terminated.
+
+ * LinuxWaitBuilder.java: Update to match WaitBuilder's exitEvent
+ and execEvent.
+
+ * LinuxPtraceProc.java (LinuxPtraceProc(Task,ProcessIdentifier)):
+ Replace LinuxPtraceProc(Task,TaskId).
+ * LinuxPtraceHost.java: Update.
+ * LinuxPtraceTask.java (LinuxPtraceTask(Task,ProcessIdentifer)):
+ Replace LinuxPtraceTask(Task,TaskId).
+ * LinuxWaitBuilder.java: Update to match WaitBuilder's cloneEvent
+ and forkEvent.
+
* LinuxPtraceHost.java: Update to match frysk.sys.Fork.
* TestRefresh.java: Ditto.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
index 14a7e16..cb4ff0e 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
@@ -255,7 +255,7 @@ public class LinuxPtraceHost extends LiveHost {
Proc myProc = getSelf();
myTask = new LinuxPtraceTask(myProc, myTaskId);
}
- LinuxPtraceProc proc = new LinuxPtraceProc (myTask, new ProcId(pid.intValue()));
+ LinuxPtraceProc proc = new LinuxPtraceProc(myTask, pid);
new LinuxPtraceTask(proc, attachedObserver);
}
});
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index 4a86392..3807703 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -52,6 +52,7 @@ import frysk.proc.MemoryMap;
import java.util.ArrayList;
import frysk.sys.proc.CmdLineBuilder;
import frysk.sys.proc.MapsBuilder;
+import frysk.sys.ProcessIdentifier;
import frysk.sys.proc.Status;
import java.util.logging.Level;
import frysk.sys.proc.ProcBuilder;
@@ -83,8 +84,8 @@ public class LinuxPtraceProc extends LiveProc {
* Create a new, definitely attached, definitely running fork of
* Task.
*/
- public LinuxPtraceProc(Task task, ProcId forkId) {
- super(task, forkId);
+ public LinuxPtraceProc(Task task, ProcessIdentifier fork) {
+ super(task, new ProcId(fork.intValue()));
this.newState = LinuxPtraceProcState.initial(true);
this.breakpoints = new BreakpointAddresses(this);
}
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index f590c49..494aede 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -59,6 +59,7 @@ import frysk.event.Event;
import inua.eio.ByteBuffer;
import inua.eio.ByteOrder;
import frysk.sys.Errno;
+import frysk.sys.ProcessIdentifier;
import frysk.sys.Ptrace;
import frysk.sys.Ptrace.AddressSpace;
import frysk.sys.Signal;
@@ -83,9 +84,9 @@ public class LinuxPtraceTask extends LiveTask {
/**
* Create a new attached clone of Task.
*/
- public LinuxPtraceTask(Task task, TaskId clone) {
+ public LinuxPtraceTask(Task task, ProcessIdentifier clone) {
// XXX: shouldn't need to grub around in the old task's state.
- super(task, clone);
+ super(task, new TaskId(clone.intValue()));
newState = LinuxPtraceTaskState.clonedState(((LinuxPtraceTask)task).getState ());
}
/**
diff --git a/frysk-core/frysk/proc/live/LinuxWaitBuilder.java b/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
index 1f142c0..f16d53e 100644
--- a/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
+++ b/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
@@ -48,8 +48,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import frysk.proc.TaskId;
import frysk.proc.Task;
-import frysk.proc.ProcId;
import frysk.proc.TaskObserver;
+import frysk.sys.ProcessIdentifier;
/**
* Handles wait events generated by the wait builder.
@@ -88,12 +88,12 @@ class LinuxWaitBuilder implements WaitBuilder {
* didn't exist) to the fscked-up list. Will get re-processed
* later.
*/
- private void saveFsckedOrderedKernelStoppedEvent(final int aPid,
+ private void saveFsckedOrderedKernelStoppedEvent(final ProcessIdentifier aPid,
final Signal aSignal) {
if (fsckedOrderedKernelEvents == null)
fsckedOrderedKernelEvents = new LinkedList();
- Event rescheduled = new Event () {
- final int pid = aPid;
+ Event rescheduled = new Event() {
+ final ProcessIdentifier pid = aPid;
final Signal signal = aSignal;
public void execute() {
LinuxWaitBuilder.this.stopped(pid, signal);
@@ -103,7 +103,7 @@ class LinuxWaitBuilder implements WaitBuilder {
}
};
logger.log(Level.FINE, "{0} rescheduled\n", rescheduled);
- fsckedOrderedKernelEvents.add (rescheduled);
+ fsckedOrderedKernelEvents.add(rescheduled);
}
// Hold onto a scratch ID; avoids overhead of allocating a new
@@ -119,33 +119,35 @@ class LinuxWaitBuilder implements WaitBuilder {
logger.log(Level.FINE, why, this);
return (LinuxPtraceTask) (host.get(this));
}
+ LinuxPtraceTask get(ProcessIdentifier pid, String why) {
+ logger.log(Level.FINE, why, pid);
+ return get(pid.intValue(), why);
+ }
}
private final SearchId searchId;
- private void logMissing(String what, int pid) {
+ private void logMissing(String what, ProcessIdentifier pid) {
logger.log(Level.WARNING,
"No task for {0} pid {1,number,integer};"
+ " possibly caused by earlier [test] code"
+ " failing to clean up all childen",
- new Object[] { what, new Integer(pid) });
-
+ new Object[] { what, pid });
}
- public void cloneEvent (int pid, int clonePid)
- {
+ public void cloneEvent(ProcessIdentifier pid,
+ ProcessIdentifier clonePid) {
// Find the task, create its new peer, and then tell the task
// what happened. Note that hot on the heels of this event is
// a clone.stopped event, and the clone Task must be created
// before that event arrives.
LinuxPtraceTask task = searchId.get(pid, "{0} cloneEvent\n");
// Create an attached, and running, clone of TASK.
- LinuxPtraceTask clone = new LinuxPtraceTask(task, new TaskId(clonePid));
+ LinuxPtraceTask clone = new LinuxPtraceTask(task, clonePid);
task.processClonedEvent(clone);
- attemptDeliveringFsckedKernelEvents ();
+ attemptDeliveringFsckedKernelEvents();
}
- public void forkEvent (int pid, int childPid)
- {
+ public void forkEvent(ProcessIdentifier pid, ProcessIdentifier fork) {
// Find the task, create the new process under it (well ok the
// task's process) and then notify the task of what
// happened. Note that hot on the heels of this fork event is
@@ -153,8 +155,7 @@ class LinuxWaitBuilder implements WaitBuilder {
// before that event arrives.
LinuxPtraceTask task = searchId.get(pid, "{0} forkEvent\n");
// Create an attached and running fork of TASK.
- ProcId forkId = new ProcId(childPid);
- LinuxPtraceProc forkProc = new LinuxPtraceProc(task, forkId);
+ LinuxPtraceProc forkProc = new LinuxPtraceProc(task, fork);
// The main task.
Task forkTask;
forkTask = new LinuxPtraceTask(forkProc, (TaskObserver.Attached) null);
@@ -162,9 +163,8 @@ class LinuxWaitBuilder implements WaitBuilder {
attemptDeliveringFsckedKernelEvents ();
}
- public void exitEvent(int pid, Signal signal, int status,
- boolean coreDumped)
- {
+ public void exitEvent(ProcessIdentifier pid, Signal signal,
+ int status, boolean coreDumped) {
LinuxPtraceTask task = searchId.get(pid, "{0} exitEvent\n");
if (task == null)
// Stray pid from uncontrolled fork.
@@ -173,14 +173,12 @@ class LinuxWaitBuilder implements WaitBuilder {
task.processTerminatingEvent(signal, status);
}
- public void execEvent (int pid)
- {
+ public void execEvent(ProcessIdentifier pid) {
LinuxPtraceTask task = searchId.get(pid, "{0} execEvent\n");
task.processExecedEvent();
}
- public void disappeared (int pid, Throwable w)
- {
+ public void disappeared(ProcessIdentifier pid, Throwable w) {
LinuxPtraceTask task = searchId.get(pid, "{0} disappeared\n");
// XXX Sometimes it seems it has already disappeared and this fails
// Catch the failure, but not sure what to do with the failure right now
@@ -190,13 +188,12 @@ class LinuxWaitBuilder implements WaitBuilder {
} catch (Exception e) {}
}
- public void syscallEvent (int pid)
- {
+ public void syscallEvent(ProcessIdentifier pid) {
LinuxPtraceTask task = searchId.get(pid, "{0} syscallEvent\n");
task.processSyscalledEvent();
}
- public void stopped(int pid, Signal sig) {
+ public void stopped(ProcessIdentifier pid, Signal sig) {
LinuxPtraceTask task = searchId.get(pid, "{0} stopped\n");
if (task == null) {
// If there's no Task corresponding to TID, assume that
@@ -210,8 +207,8 @@ class LinuxWaitBuilder implements WaitBuilder {
task.processStoppedEvent(sig);
}
- public void terminated(int pid, Signal signal, int status,
- boolean coreDumped) {
+ public void terminated(ProcessIdentifier pid, Signal signal,
+ int status, boolean coreDumped) {
LinuxPtraceTask task = searchId.get(pid, "{0} terminated\n");
if (task == null)
// Stray pid from uncontrolled fork.
diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog
index 265a881..2f76464 100644
--- a/frysk-core/frysk/testbed/ChangeLog
+++ b/frysk-core/frysk/testbed/ChangeLog
@@ -1,5 +1,8 @@
2008-02-06 Andrew Cagney <cagney@redhat.com>
+ * LegacyOffspring.java: Update to match WaitBuilder's terminated.
+ * SlaveOffspring.java: Ditto.
+
* OffspringType.java: Update to match frysk.sys.Fork.
* SynchronizedOffspring.java: Ditto.
diff --git a/frysk-core/frysk/testbed/LegacyOffspring.java b/frysk-core/frysk/testbed/LegacyOffspring.java
index 45aefba..d6147ff 100644
--- a/frysk-core/frysk/testbed/LegacyOffspring.java
+++ b/frysk-core/frysk/testbed/LegacyOffspring.java
@@ -39,6 +39,7 @@
package frysk.testbed;
+import frysk.sys.ProcessIdentifier;
import frysk.proc.Manager;
import frysk.junit.TestCase;
import frysk.sys.Pid;
@@ -237,8 +238,8 @@ public class LegacyOffspring
protected void unhandled (String why) {
TestCase.fail ("killing child (" + why + ")");
}
- public void terminated(int pid, Signal signal,
- int value,
+ public void terminated(ProcessIdentifier pid,
+ Signal signal, int value,
boolean coreDumped) {
// Termination with signal is ok.
TestCase.assertTrue("terminated with signal",
diff --git a/frysk-core/frysk/testbed/SlaveOffspring.java b/frysk-core/frysk/testbed/SlaveOffspring.java
index bd46a23..e7a2815 100644
--- a/frysk-core/frysk/testbed/SlaveOffspring.java
+++ b/frysk-core/frysk/testbed/SlaveOffspring.java
@@ -43,6 +43,7 @@ import frysk.proc.Manager;
import frysk.junit.TestCase;
import frysk.sys.Pid;
import frysk.sys.Signal;
+import frysk.sys.ProcessIdentifier;
import frysk.testbed.SignalWaiter;
import java.util.LinkedList;
import java.util.List;
@@ -244,8 +245,8 @@ public class SlaveOffspring
protected void unhandled (String why) {
TestCase.fail ("killing child (" + why + ")");
}
- public void terminated(int pid, Signal signal,
- int value,
+ public void terminated(ProcessIdentifier pid,
+ Signal signal, int value,
boolean coreDumped) {
// Termination with signal is ok.
TestCase.assertTrue("terminated with signal",
diff --git a/frysk-sys/frysk/expunit/ChangeLog b/frysk-sys/frysk/expunit/ChangeLog
index 6012b5b..84ddcbc 100644
--- a/frysk-sys/frysk/expunit/ChangeLog
+++ b/frysk-sys/frysk/expunit/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-06 Andrew Cagney <cagney@redhat.com>
+
+ * WaitObserver.java: Update to match WaitBuilder's disappeared,
+ terminated, stopped, and syscallEvent.
+
+ * WaitObserver.java: Update to match WaitBuilder's exitEvent and
+ execEvent.
+
+ * WaitObserver.java: Update to match WaitBuilder's forkEvent and
+ cloneEvent.
+
2008-01-25 Andrew Cagney <cagney@redhat.com>
* Expect.java: Split into Child.java.
diff --git a/frysk-sys/frysk/expunit/WaitObserver.java b/frysk-sys/frysk/expunit/WaitObserver.java
index 7ed630e..3ea8ce1 100644
--- a/frysk-sys/frysk/expunit/WaitObserver.java
+++ b/frysk-sys/frysk/expunit/WaitObserver.java
@@ -39,6 +39,7 @@
package frysk.expunit;
+import frysk.sys.ProcessIdentifier;
import frysk.sys.Signal;
import frysk.sys.WaitBuilder;
@@ -59,10 +60,10 @@ class WaitObserver implements WaitBuilder {
private RuntimeException terminationException(String msg) {
return new TerminationException(expectedSignal, expectedStatus, msg);
}
- public void disappeared(int pid, Throwable t) {
+ public void disappeared(ProcessIdentifier pid, Throwable t) {
throw terminationException("Process disappeared");
}
- public void terminated(int pid, Signal signal, int status,
+ public void terminated(ProcessIdentifier pid, Signal signal, int status,
boolean coreDumped) {
if (signal != null) {
if (signal != expectedSignal)
@@ -72,23 +73,23 @@ class WaitObserver implements WaitBuilder {
throw terminationException("Exited with status " + status);
}
}
- public void stopped(int pid, Signal signal) {
+ public void stopped(ProcessIdentifier pid, Signal signal) {
throw terminationException("Stopped with signal " + signal);
}
- public void syscallEvent (int pid) {
+ public void syscallEvent(ProcessIdentifier pid) {
throw terminationException("Stopped with syscall event");
}
- public void execEvent (int pid) {
+ public void execEvent(ProcessIdentifier pid) {
throw terminationException("Stopped with exec event");
}
- public void exitEvent(int pid, Signal signal,
+ public void exitEvent(ProcessIdentifier pid, Signal signal,
int status, boolean coreDumped) {
throw terminationException("Stopped with exit event");
}
- public void forkEvent (int pid, int offspring) {
+ public void forkEvent(ProcessIdentifier pid, ProcessIdentifier offspring) {
throw terminationException("Stopped with fork event");
}
- public void cloneEvent (int pid, int offspring) {
+ public void cloneEvent(ProcessIdentifier pid, ProcessIdentifier offspring) {
throw terminationException("Stopped with clone event");
}
}
diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog
index 366fbc7..573500a 100644
--- a/frysk-sys/frysk/sys/ChangeLog
+++ b/frysk-sys/frysk/sys/ChangeLog
@@ -1,5 +1,32 @@
2008-02-06 Andrew Cagney <cagney@redhat.com>
+ * WaitBuilder.java (syscallEvent(ProcessIdentifier)): Replace
+ syscallEvent(int).
+ (stopped(ProcessIdentifier,Signal)): Replace stopped(int,Signal).
+ (terminated(ProcessIdentifier,Signal,int,boolean)): Replace
+ terminated(int,Signal,int,boolean).
+ (disappeared(ProcessIdentifier,Throwable)): Replace
+ disappeard(int,Throwable).
+ * cni/Wait.cxx (processStatus): Update.
+ * TestWait.java: Update.
+ * TestFork.java: Update.
+ * UnhandledWaitBuilder.java: Update.
+ * TestPipePair.java: Update.
+ * TestPtrace.java: Update.
+
+ * WaitBuilder.java (execEvent(ProcessIdentifier)): Replace
+ execEvent(int).
+ (exitEvent(ProcessIdentifier,Signal,int,boolean)): Replace
+ exitEvent(int,Signal,int,boolean).
+ * cni/Wait.cxx (processStatus): Update.
+ * UnhandledWaitBuilder.java: Update.
+
+ * WaitBuilder.java (cloneEvent(ProcessIdentifier,ProcessIdentifier)):
+ Replace cloneEvent(int,int).
+ * cni/Wait.cxx: Update.
+ * UnhandledWaitBuilder.java: Update.
+ (unhandled(String,ProcessIdentifier,String,Object)): New.
+
* Wait.java (drain(ProcessIdentifier))
(drainNoHang(ProcessIdentifier))
(wait(ProcessIdentifier,WaitBuilder,SignalBuilder,long,boolean))
diff --git a/frysk-sys/frysk/sys/TestFork.java b/frysk-sys/frysk/sys/TestFork.java
index 0ab8809..ceaab25 100644
--- a/frysk-sys/frysk/sys/TestFork.java
+++ b/frysk-sys/frysk/sys/TestFork.java
@@ -86,11 +86,11 @@ public class TestFork
TearDownProcess.add(pid);
// Capture the child's status; to see if it was correct.
class ExitStatus extends UnhandledWaitBuilder {
- int pid;
+ ProcessIdentifier pid;
Signal signal;
int status;
- public void terminated(int pid, Signal signal, int status,
- boolean coreDumped) {
+ public void terminated(ProcessIdentifier pid, Signal signal,
+ int status, boolean coreDumped) {
logger.log(Level.FINE,
"exited with status {0,number,integer}\n",
new Integer(status));
@@ -112,7 +112,7 @@ public class TestFork
},
getTimeoutMilliseconds());
// (a timeout will also fail with the below)
- assertEquals("pid", pid.intValue(), exitStatus.pid);
+ assertSame("pid", pid, exitStatus.pid);
assertEquals("signal", null, exitStatus.signal);
assertEquals("status", 0, exitStatus.status);
}
diff --git a/frysk-sys/frysk/sys/TestPipePair.java b/frysk-sys/frysk/sys/TestPipePair.java
index 2c0f786..f03ce05 100644
--- a/frysk-sys/frysk/sys/TestPipePair.java
+++ b/frysk-sys/frysk/sys/TestPipePair.java
@@ -167,11 +167,11 @@ public class TestPipePair
pipe = new ChildPipePair(funitProcMask);
// Capture the child's output (look for
class ExitStatus extends UnhandledWaitBuilder {
- int pid;
+ ProcessIdentifier pid;
Signal signal;
int status;
- public void terminated(int pid, Signal signal, int status,
- boolean coreDumped) {
+ public void terminated(ProcessIdentifier pid, Signal signal,
+ int status, boolean coreDumped) {
logger.log(Level.FINE,
"exited with status {0,number,integer}\n",
new Integer(status));
@@ -193,7 +193,7 @@ public class TestPipePair
},
getTimeoutMilliseconds() * 10);
// (a timeout will also fail with the below)
- assertEquals("pid", pipe.pid.intValue(), exitStatus.pid);
+ assertEquals("pid", pipe.pid, exitStatus.pid);
assertEquals("signal", null, exitStatus.signal);
assertEquals("status", 0, exitStatus.status);
}
diff --git a/frysk-sys/frysk/sys/TestPtrace.java b/frysk-sys/frysk/sys/TestPtrace.java
index 7b9a8b8..9282fe6 100644
--- a/frysk-sys/frysk/sys/TestPtrace.java
+++ b/frysk-sys/frysk/sys/TestPtrace.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, 2007, Red Hat Inc.
+// Copyright 2005, 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
@@ -76,9 +76,9 @@ public class TestPtrace
protected void unhandled(String why) {
fail (why);
}
- public void stopped(int pid, Signal signal) {
- assertEquals("stopped pid", id.intValue(), pid);
- assertEquals("stopped sig", Signal.TRAP, signal);
+ public void stopped(ProcessIdentifier pid, Signal signal) {
+ assertSame("stopped pid", id, pid);
+ assertSame("stopped sig", Signal.TRAP, signal);
}
});
@@ -88,9 +88,9 @@ public class TestPtrace
protected void unhandled(String why) {
fail (why);
}
- public void stopped(int pid, Signal signal) {
- assertEquals("stopped pid", id.intValue(), pid);
- assertEquals("stopped sig", Signal.TRAP, signal);
+ public void stopped(ProcessIdentifier pid, Signal signal) {
+ assertSame("stopped pid", id, pid);
+ assertSame("stopped sig", Signal.TRAP, signal);
}
});
@@ -100,10 +100,10 @@ public class TestPtrace
protected void unhandled(String why) {
hooks/post-receive
--
frysk system monitor/debugger