public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Fix merge problems.
@ 2008-01-25 19:01 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-01-25 19:01 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 66747abdd1148466ac14af8e1c2b2920f65978ca (commit)
via 9c8328be8287795be8c2f1a53012e17b641960b0 (commit)
from a548829d7ca92f9c2853d83dcf9781ce7a56a488 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 66747abdd1148466ac14af8e1c2b2920f65978ca
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Fri Jan 25 13:57:37 2008 -0500
Fix merge problems.
frysk-core/frysk/proc/live/ChangeLog
2008-01-25 Andrew Cagney <cagney@redhat.com>
* TestTaskObserverCode.java: Fix a merge botch.
frysk-gui/frysk/gui/monitor/ChangeLog
2008-01-25 Andrew Cagney <cagney@redhat.com>
* actions/RunExternal.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int).
* GuiTask.java: Ditto.
* observers/TaskTerminatingObserver.java: Ditto for terminating.
commit 9c8328be8287795be8c2f1a53012e17b641960b0
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Fri Jan 25 12:45:49 2008 -0500
Pass a Signal to terminating and terminated observers.
frysk-core/frysk/bindir/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* fstep.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int).
frysk-core/frysk/ftrace/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* MappingGuard.java: Update to match
TaskObserver.Terminating.updateTerminating(Task,Signal,int).
* Ftrace.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int).
frysk-core/frysk/proc/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* TaskObserver.java (Terminated): Replace
updateTerminated(Task,boolean,int) with
updateTerminated(Task,Signal,int).
(Terminating): Replace updateTerminating(Task,boolean,int) with
updateTerminating(Task,Signal,int).
* TestTaskObserverInstructionSigReturn.java: Update.
* TestTaskTerminateObserver.java: Update.
* TestTaskObserver.java: Update.
* TestMemory.java: Update.
* TestBreakpoints.java: Update.
* TestTaskObserverInstructionAndCode.java: Update.
* ProcBlockAction.java: Update.
* ProcTasksObserver.java: Update.
frysk-core/frysk/proc/live/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (notifyTerminating(boolean,int))
(notifyTerminated(boolean,int)): Pass frysk.isa.signals.Signal to
observers.
* TestTaskObserverCode.java: Update.
frysk-core/frysk/rt/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* ProcTaskIDManager.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int).
* TestUpdatingDisplayValue.java: Ditto.
* UpdatingDisplayValue.java: Ditto.
frysk-core/frysk/stepping/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* SteppingEngine.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int) and
TaskObserverTerminating.updateTerminating(Task,Signal,int).
frysk-core/frysk/testbed/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* DaemonBlockedAtSignal.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int).
frysk-core/frysk/util/ChangeLog
2008-01-24 Andrew Cagney <cagney@redhat.com>
* FCatch.java: Update to match
TaskObserver.Terminated.updateTerminated(Task,Signal,int) and
TaskObserver.Terminating.updateTerminating(Task,Signal,int).
* TestFCatch.java: Ditto.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/bindir/ChangeLog | 3 +
frysk-core/frysk/bindir/fstep.java | 33 ++++----
frysk-core/frysk/ftrace/ChangeLog | 5 +
frysk-core/frysk/ftrace/Ftrace.java | 16 +---
frysk-core/frysk/ftrace/MappingGuard.java | 6 +-
frysk-core/frysk/proc/ChangeLog | 14 +++
frysk-core/frysk/proc/ProcBlockAction.java | 15 ++--
frysk-core/frysk/proc/ProcTasksObserver.java | 5 +-
frysk-core/frysk/proc/TaskObserver.java | 26 ++----
frysk-core/frysk/proc/TestBreakpoints.java | 14 ++--
frysk-core/frysk/proc/TestMemory.java | 13 ++--
frysk-core/frysk/proc/TestTaskObserver.java | 44 +++++-----
.../proc/TestTaskObserverInstructionAndCode.java | 24 +++---
.../proc/TestTaskObserverInstructionSigReturn.java | 20 ++---
.../frysk/proc/TestTaskTerminateObserver.java | 45 ++++------
frysk-core/frysk/proc/live/ChangeLog | 7 ++
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 73 +++++++++++-----
.../frysk/proc/live/TestTaskObserverCode.java | 59 ++++++-------
frysk-core/frysk/rt/ChangeLog | 7 ++
frysk-core/frysk/rt/ProcTaskIDManager.java | 5 +-
frysk-core/frysk/rt/TestUpdatingDisplayValue.java | 8 +-
frysk-core/frysk/rt/UpdatingDisplayValue.java | 13 +--
frysk-core/frysk/stepping/ChangeLog | 4 +
frysk-core/frysk/stepping/SteppingEngine.java | 56 ++++++------
frysk-core/frysk/stepping/TestSteppingEngine.java | 14 ++--
frysk-core/frysk/testbed/ChangeLog | 3 +
.../frysk/testbed/DaemonBlockedAtSignal.java | 8 +-
frysk-core/frysk/util/ChangeLog | 5 +
frysk-core/frysk/util/FCatch.java | 4 +-
frysk-core/frysk/util/TestFCatch.java | 25 +++---
frysk-gui/frysk/gui/monitor/ChangeLog | 7 ++
frysk-gui/frysk/gui/monitor/GuiTask.java | 46 +++++-----
.../frysk/gui/monitor/actions/RunExternal.java | 47 ++++------
.../monitor/observers/TaskTerminatingObserver.java | 91 +++++++++-----------
34 files changed, 390 insertions(+), 375 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index 3c04859..c951672 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,5 +1,8 @@
2008-01-25 Andrew Cagney <cagney@redhat.com>
+ * fstep.java: Update to match
+ TaskObserver.Terminated.updateTerminated(Task,Signal,int).
+
* TestFdebuginfo.java (testPathListing()): Mark as unresolved; bug
5671.
diff --git a/frysk-core/frysk/bindir/fstep.java b/frysk-core/frysk/bindir/fstep.java
index 315e73c..05bdc6d 100644
--- a/frysk-core/frysk/bindir/fstep.java
+++ b/frysk-core/frysk/bindir/fstep.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2006, 2007, Red Hat Inc.
+// Copyright 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
@@ -39,6 +39,7 @@
package frysk.bindir;
+import frysk.isa.signals.Signal;
import frysk.proc.FindProc;
import java.util.List;
import frysk.proc.Auxv;
@@ -277,22 +278,20 @@ public class fstep
}
- // TaskObserver.Terminated interface
- public Action updateTerminated(Task task, boolean signal, int exit)
- {
- int tid = task.getTid();
- long steps = ((Long) tasks.get(task)).longValue();
- System.err.println("Total steps [" + tid + "]: " + steps);
- if (signal)
- System.err.println("[" + tid + "] Terminated by signal: " + exit);
- else
- System.err.println("[" + tid + "] Exited: " + exit);
-
- tasks.remove(task);
- if (tasks.isEmpty())
- Manager.eventLoop.requestStop();
- return Action.CONTINUE;
- }
+ // TaskObserver.Terminated interface
+ public Action updateTerminated(Task task, Signal signal, int exit) {
+ int tid = task.getTid();
+ long steps = ((Long) tasks.get(task)).longValue();
+ System.err.println("Total steps [" + tid + "]: " + steps);
+ if (signal != null)
+ System.err.println("[" + tid + "] Terminated by signal: " + signal);
+ else
+ System.err.println("[" + tid + "] Exited: " + exit);
+ tasks.remove(task);
+ if (tasks.isEmpty())
+ Manager.eventLoop.requestStop();
+ return Action.CONTINUE;
+ }
// TaskObserver.Instruction interface
public Action updateExecuted(Task task)
diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog
index dd7975b..03a0511 100644
--- a/frysk-core/frysk/ftrace/ChangeLog
+++ b/frysk-core/frysk/ftrace/ChangeLog
@@ -1,5 +1,10 @@
2008-01-24 Andrew Cagney <cagney@redhat.com>
+ * MappingGuard.java: Update to match
+ TaskObserver.Terminating.updateTerminating(Task,Signal,int).
+ * Ftrace.java: Update to match
+ TaskObserver.Terminated.updateTerminated(Task,Signal,int).
+
* IA32Arch.java: Update; Register moved to frysk.isa.registers.
* X8664Arch.java: Ditto.
diff --git a/frysk-core/frysk/ftrace/Ftrace.java b/frysk-core/frysk/ftrace/Ftrace.java
index 2f1d7d8..c2b14be 100644
--- a/frysk-core/frysk/ftrace/Ftrace.java
+++ b/frysk-core/frysk/ftrace/Ftrace.java
@@ -50,8 +50,7 @@ import frysk.proc.ProcTasksObserver;
import frysk.proc.Task;
import frysk.proc.TaskObserver;
import frysk.isa.syscalls.Syscall;
-import frysk.sys.Signal;
-
+import frysk.isa.signals.Signal;
import inua.util.PrintWriter;
import java.util.HashMap;
import java.util.HashSet;
@@ -547,17 +546,12 @@ public class Ftrace
}
TaskObserver.Cloned clonedObserver = new MyClonedObserver();
- class MyTerminatedObserver
- implements TaskObserver.Terminated
- {
- public Action updateTerminated (Task task, boolean signal,
- int value)
- {
- if (signal)
- reporter.eventSingle(task, "killed by " + Signal.toHostStringFIXME(value));
+ class MyTerminatedObserver implements TaskObserver.Terminated {
+ public Action updateTerminated (Task task, Signal signal, int value) {
+ if (signal != null)
+ reporter.eventSingle(task, "killed by " + signal);
else
reporter.eventSingle(task, "exited with status " + value);
-
return Action.CONTINUE;
}
diff --git a/frysk-core/frysk/ftrace/MappingGuard.java b/frysk-core/frysk/ftrace/MappingGuard.java
index de5b744..222132e 100644
--- a/frysk-core/frysk/ftrace/MappingGuard.java
+++ b/frysk-core/frysk/ftrace/MappingGuard.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007, Red Hat Inc.
+// Copyright 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
@@ -39,6 +39,7 @@
package frysk.ftrace;
+import frysk.isa.signals.Signal;
import java.util.Iterator;
import java.util.HashMap;
import java.util.Map;
@@ -336,8 +337,7 @@ class MappingGuard
return Action.CONTINUE;
}
- public Action updateTerminating (Task task, boolean signal, int value)
- {
+ public Action updateTerminating(Task task, Signal signal, int value) {
logger.log(Level.FINE, "The task is terminating.");
updateMapping(task, true);
return Action.CONTINUE;
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 246cbdc..c0389da 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,19 @@
2008-01-25 Andrew Cagney <cagney@redhat.com>
+ * TaskObserver.java (Terminated): Replace
+ updateTerminated(Task,boolean,int) with
+ updateTerminated(Task,Signal,int).
+ (Terminating): Replace updateTerminating(Task,boolean,int) with
+ updateTerminating(Task,Signal,int).
+ * TestTaskObserverInstructionSigReturn.java: Update.
+ * TestTaskTerminateObserver.java: Update.
+ * TestTaskObserver.java: Update.
+ * TestMemory.java: Update.
+ * TestBreakpoints.java: Update.
+ * TestTaskObserverInstructionAndCode.java: Update.
+ * ProcBlockAction.java: Update.
+ * ProcTasksObserver.java: Update.
+
* TestSyscallRunning.java: Use IsaTestbed to get the isa.
* TestSyscallSignal.java: Ditto.
* TestTaskSyscallObserver.java: Ditto.
diff --git a/frysk-core/frysk/proc/ProcBlockAction.java b/frysk-core/frysk/proc/ProcBlockAction.java
index 11cec04..83f410c 100644
--- a/frysk-core/frysk/proc/ProcBlockAction.java
+++ b/frysk-core/frysk/proc/ProcBlockAction.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
@@ -45,7 +45,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.logging.Level;
import java.util.logging.Logger;
-
+import frysk.isa.signals.Signal;
import frysk.event.Event;
import frysk.proc.dead.LinuxCoreHost;
@@ -117,12 +117,11 @@ public class ProcBlockAction
{
}
- public Action updateTerminated (Task task, boolean signal, int value)
- {
- action.taskAddFailed(task, new RuntimeException("Task terminated"));
- checkFinish(task);
- return Action.BLOCK;
- }
+ public Action updateTerminated (Task task, Signal signal, int value) {
+ action.taskAddFailed(task, new RuntimeException("Task terminated"));
+ checkFinish(task);
+ return Action.BLOCK;
+ }
}
diff --git a/frysk-core/frysk/proc/ProcTasksObserver.java b/frysk-core/frysk/proc/ProcTasksObserver.java
index 8551709..075bbdc 100644
--- a/frysk-core/frysk/proc/ProcTasksObserver.java
+++ b/frysk-core/frysk/proc/ProcTasksObserver.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, 2006, Red Hat Inc.
+// Copyright 2005, 2006, 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
@@ -39,6 +39,7 @@
package frysk.proc;
+import frysk.isa.signals.Signal;
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -157,7 +158,7 @@ public final class ProcTasksObserver
procTasksObserver.deletedFrom(observable);
}
- public Action updateTerminated(Task task, boolean signal, int value) {
+ public Action updateTerminated(Task task, Signal signal, int value) {
procTasksObserver.taskRemoved(task);
return Action.CONTINUE;
}
diff --git a/frysk-core/frysk/proc/TaskObserver.java b/frysk-core/frysk/proc/TaskObserver.java
index 4222f6f..2371e8a 100644
--- a/frysk-core/frysk/proc/TaskObserver.java
+++ b/frysk-core/frysk/proc/TaskObserver.java
@@ -106,35 +106,29 @@ public interface TaskObserver
/**
* Interface used to notify of a Task that is terminating.
*/
- public interface Terminating
- extends TaskObserver
- {
+ public interface Terminating extends TaskObserver {
/**
* Called while the Task is terminating; while the process
* still exists not much other than examining it can be
- * performed. If SIGNAL, the termination was forced using
- * signal VALUE, otherwize the termination is due to an
- * _exit(2) call.
+ * performed. If SIGNAL is non-NULL it is the signal causing
+ * the termination, else STATUS is the exit value passed to
+ * _exit(2).
*/
- Action updateTerminating (Task task, boolean signal,
- int value);
+ Action updateTerminating (Task task, Signal signal, int status);
}
/**
* Interface used to notify that Task has terminated (the task no
* longer exits).
*/
- public interface Terminated
- extends TaskObserver
- {
+ public interface Terminated extends TaskObserver {
/**
* Called once the Task has terminated; the process no longer
- * exists. If SIGNAL, the termination was forced using signal
- * VALUE, otherwize the termination is due to an _exit(2)
- * call.
+ * exists. If SIGNAL is non-NULL it is the signal causing the
+ * termination, else STATUS is the exit value passed to
+ * _exit(2).
*/
- Action updateTerminated (Task task, boolean signal,
- int value);
+ Action updateTerminated(Task task, Signal signal, int value);
}
/**
diff --git a/frysk-core/frysk/proc/TestBreakpoints.java b/frysk-core/frysk/proc/TestBreakpoints.java
index 5d53858..51ccafb 100644
--- a/frysk-core/frysk/proc/TestBreakpoints.java
+++ b/frysk-core/frysk/proc/TestBreakpoints.java
@@ -1,7 +1,7 @@
// This file is part of the program FRYSK.
//
+// Copyright 2006, 2007, 2008 Red Hat Inc.
// Copyright 2007 Oracle Corporation.
-// Copyright 2006, 2007 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
@@ -40,6 +40,7 @@
package frysk.proc;
+import frysk.isa.signals.Signal;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.InputStreamReader;
@@ -207,7 +208,7 @@ public class TestBreakpoints
assertRunUntilStop ("terminating");
assertEquals("exitValue", 0, terminatingObserver.exitValue);
- assertFalse("exitSignal", terminatingObserver.exitSignal);
+ assertNull("exitSignal", terminatingObserver.exitSignal);
}
public void testSteppingtestHitAndRun() throws IOException
@@ -310,7 +311,7 @@ public class TestBreakpoints
assertRunUntilStop ("terminating");
assertEquals("exitValue", 0, terminatingObserver.exitValue);
- assertFalse("exitSignal", terminatingObserver.exitSignal);
+ assertNull("exitSignal", terminatingObserver.exitSignal);
assertEquals(8, code1.getTriggered());
assertEquals(3, code2.getTriggered());
@@ -410,7 +411,7 @@ public class TestBreakpoints
assertRunUntilStop("terminating");
assertEquals("exitValue", 0, terminatingObserver.exitValue);
- assertFalse("exitSignal", terminatingObserver.exitSignal);
+ assertNull("exitSignal", terminatingObserver.exitSignal);
for (int i = 0; i < 1512; i++)
{
@@ -455,10 +456,9 @@ public class TestBreakpoints
{
// How the process exits.
boolean terminating;
- boolean exitSignal;
+ Signal exitSignal;
int exitValue;
- public Action updateTerminating (Task task, boolean signal, int value)
- {
+ public Action updateTerminating(Task task, Signal signal, int value) {
terminating = true;
exitValue = value;
exitSignal = signal;
diff --git a/frysk-core/frysk/proc/TestMemory.java b/frysk-core/frysk/proc/TestMemory.java
index 99e382f..b672f32 100644
--- a/frysk-core/frysk/proc/TestMemory.java
+++ b/frysk-core/frysk/proc/TestMemory.java
@@ -41,7 +41,7 @@ package frysk.proc;
import frysk.Config;
import java.util.Observer;
-import frysk.sys.Signal;
+import frysk.isa.signals.Signal;
import java.util.Observable;
import inua.eio.ArrayByteBuffer;
import inua.eio.ByteBuffer;
@@ -85,9 +85,8 @@ public class TestMemory
class TaskEventObserver extends TaskObserverBase
implements TaskObserver.Signaled
{
- public Action updateSignaled(Task task,
- frysk.isa.signals.Signal sig) {
- if (sig.intValue() == Signal.SEGV.intValue()) {
+ public Action updateSignaled(Task task, Signal sig) {
+ if (sig.intValue() == frysk.sys.Signal.SEGV.intValue()) {
ByteBuffer b;
long memAddr;
long addr;
@@ -168,9 +167,9 @@ public class TestMemory
extends TaskObserverBase
implements TaskObserver.Terminated
{
- public Action updateTerminated (Task task, boolean signal, int value)
- {
- if (!signal) {
+ public Action updateTerminated(Task task, Signal signal,
+ int value) {
+ if (signal == null) {
exitedTaskEventStatus = value;
exited = true;
}
diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java
index 92019cc..95180b0 100644
--- a/frysk-core/frysk/proc/TestTaskObserver.java
+++ b/frysk-core/frysk/proc/TestTaskObserver.java
@@ -41,7 +41,7 @@ package frysk.proc;
import java.util.Observer;
import java.util.Observable;
-import frysk.sys.Signal;
+import frysk.isa.signals.Signal;
import frysk.sys.Errno;
import frysk.event.TimerEvent;
import frysk.testbed.TestLib;
@@ -94,19 +94,16 @@ public class TestTaskObserver
* Send .theSig to .thePid, and then keep probeing .thePid until
* it no longer exists.
*/
- private void assertTaskGone (final int thePid, final Signal theSig)
- {
- Manager.eventLoop.add (new TimerEvent (0, 50)
- {
+ private void assertTaskGone(final int thePid,
+ final frysk.sys.Signal theSig) {
+ Manager.eventLoop.add (new TimerEvent (0, 50) {
int pid = thePid;
- Signal sig = theSig;
- public void execute ()
- {
+ frysk.sys.Signal sig = theSig;
+ public void execute () {
try {
sig.tkill(pid);
- sig = Signal.NONE;
- }
- catch (Errno.Esrch e) {
+ sig = frysk.sys.Signal.NONE;
+ } catch (Errno.Esrch e) {
Manager.eventLoop.requestStop ();
}
}
@@ -178,7 +175,7 @@ public class TestTaskObserver
// Finally, prove that the process really is detached - send
// it a kill and then probe (using kill) the process until
// that fails.
- assertTaskGone (tasks[0].getProc().getPid (), Signal.KILL);
+ assertTaskGone(tasks[0].getProc().getPid (), frysk.sys.Signal.KILL);
// Check that while the process has gone, <em>frysk</em>
// hasn't noticed.
@@ -247,7 +244,7 @@ public class TestTaskObserver
// detaching the task. This results in the task in the
// detaching state getting the terminating event instead of
// the more typical stopped.
- Signal.KILL.kill(task.getTid());
+ frysk.sys.Signal.KILL.kill(task.getTid());
detach (new Task[] { task }, attachedObserver, false);
}
@@ -278,7 +275,7 @@ public class TestTaskObserver
// Blow away the task; make certain that the Proc's task list
// is refreshed so that the task is no longer present.
- assertTaskGone (task.getTid (), Signal.KILL);
+ assertTaskGone(task.getTid (), frysk.sys.Signal.KILL);
task.getProc().sendRefresh ();
assertEquals ("task count", 0, task.getProc().getTasks ().size ());
@@ -311,10 +308,10 @@ public class TestTaskObserver
// Blow away the task.
if (main)
- assertTaskGone (task.getTid (), Signal.KILL);
+ assertTaskGone(task.getTid (), frysk.sys.Signal.KILL);
else {
child.assertSendDelCloneWaitForAcks ();
- assertTaskGone (task.getTid (), Signal.NONE);
+ assertTaskGone(task.getTid (), frysk.sys.Signal.NONE);
}
// Try to add the observer to the now defunct task. Should
@@ -350,15 +347,14 @@ public class TestTaskObserver
implements TaskObserver.Terminating
{
Offspring c = child;
- public void addedTo (Object o)
- {
- c.signal (Signal.TERM);
+ public void addedTo (Object o) {
+ c.signal(frysk.sys.Signal.TERM);
}
- public Action updateTerminating (Task task, boolean signal,
- int val) {
- assertTrue ("signal", signal);
- assertEquals("val", Signal.TERM.intValue(),
- val);
+ public Action updateTerminating(Task task, Signal signal,
+ int val) {
+ assertNotNull("signal", signal);
+ assertEquals("val", frysk.sys.Signal.TERM.intValue(),
+ signal.intValue());
Manager.eventLoop.requestStop ();
return Action.CONTINUE;
}
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java b/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
index 3a01d68..69b4297 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
@@ -1,6 +1,6 @@
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-25 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-25 19:01 [SCM] master: Fix merge problems 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).