This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Delete fryks.sys.Signal.equals(int).
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 25 Jan 2008 15:00:45 -0000
- Subject: [SCM] master: Delete fryks.sys.Signal.equals(int).
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 2b961a0c0eb9539d3727f32cb7403a3e06e0c449 (commit)
from c7fee00e30f845e0c44c947aa480d0376a7c2b92 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 2b961a0c0eb9539d3727f32cb7403a3e06e0c449
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Fri Jan 25 10:00:27 2008 -0500
Delete fryks.sys.Signal.equals(int).
frysk-core/frysk/proc/ChangeLog
2008-01-25 Andrew Cagney <cagney@redhat.com>
* TestTaskObserver.java: Eliminate uses of
frysk.sys.Signal.equals(int).
frysk-core/frysk/proc/live/ChangeLog
2008-01-25 Andrew Cagney <cagney@redhat.com>
* TestTaskObserverCode.java: Eliminate uses of
frysk.sys.Signal.equals(int); import frysk.isa.signals.Signal
instead of frysk.sys.Signal.
frysk-sys/frysk/sys/ChangeLog
2008-01-25 Andrew Cagney <cagney@redhat.com>
* Signal.java-sh (equals(int)): Delete.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 5 ++
frysk-core/frysk/proc/TestTaskObserver.java | 5 +-
frysk-core/frysk/proc/live/ChangeLog | 6 +++
.../frysk/proc/live/TestTaskObserverCode.java | 42 ++++++++++---------
frysk-sys/frysk/sys/ChangeLog | 2 +
frysk-sys/frysk/sys/Signal.java-sh | 3 -
6 files changed, 38 insertions(+), 25 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 066d32b..75b82c3 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-25 Andrew Cagney <cagney@redhat.com>
+
+ * TestTaskObserver.java: Eliminate uses of
+ frysk.sys.Signal.equals(int).
+
2008-01-24 Andrew Cagney <cagney@redhat.com>
* TaskObserver.java (Signaled): Replace updateSignaled(Task,int)
diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java
index 428d222..92019cc 100644
--- a/frysk-core/frysk/proc/TestTaskObserver.java
+++ b/frysk-core/frysk/proc/TestTaskObserver.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
@@ -357,7 +357,8 @@ public class TestTaskObserver
public Action updateTerminating (Task task, boolean signal,
int val) {
assertTrue ("signal", signal);
- assertTrue("val", Signal.TERM.equals(val));
+ assertEquals("val", Signal.TERM.intValue(),
+ val);
Manager.eventLoop.requestStop ();
return Action.CONTINUE;
}
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 309e655..71ff7f4 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-25 Andrew Cagney <cagney@redhat.com>
+
+ * TestTaskObserverCode.java: Eliminate uses of
+ frysk.sys.Signal.equals(int); import frysk.isa.signals.Signal
+ instead of frysk.sys.Signal.
+
2008-01-24 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (notifySignaled(int)): Pass a
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverCode.java b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
index 68c28b8..577301a 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverCode.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
@@ -46,7 +46,7 @@ import frysk.testbed.TestLib;
import frysk.testbed.DaemonBlockedAtEntry;
import frysk.proc.Task;
import frysk.proc.Proc;
-import frysk.sys.Signal;
+import frysk.isa.signals.Signal;
import lib.dwfl.SymbolBuilder;
import lib.dwfl.Dwfl;
import lib.dwfl.DwflModule;
@@ -208,23 +208,25 @@ public class TestTaskObserverCode extends TestLib
task.requestUnblock(code);
assertRunUntilStop("signal and wait for signaled observer to hit");
assertFalse("not hit again (after second prof)", code.hit);
- assertTrue("Prof signaled", Signal.PROF.equals(signaled.sig));
+ assertEquals("Prof signaled", frysk.sys.Signal.PROF.intValue(),
+ signaled.sig.intValue());
- signaled.sig = -1;
+ signaled.sig = null;
task.requestUnblock(signaled);
assertRunUntilStop("wait for hit after sigprof");
assertTrue("hit again (after second prof)", code.hit);
- assertEquals("signaled not again", -1, signaled.sig);
+ assertEquals("signaled not again", null, signaled.sig);
// The TERM signal however isn't blocked. So making that pending
// will immediately jump into the signal handler, bypassing the
// step over the currently pending breakpoint. And will then kill
// the process when delivered.
code.hit = false;
- Signal.TERM.tkill(task.getTid());
+ frysk.sys.Signal.TERM.tkill(task.getTid());
task.requestUnblock(code);
assertRunUntilStop("wait for TERM signal");
- assertTrue("term signaled", Signal.TERM.equals(signaled.sig));
+ assertEquals("term signaled", frysk.sys.Signal.TERM.intValue(),
+ signaled.sig.intValue());
assertFalse("no hit after term", code.hit);
TerminatingObserver terminatingObserver = new TerminatingObserver();
@@ -373,32 +375,32 @@ public class TestTaskObserverCode extends TestLib
// jump), label name to put breakpoint on, expected signal and
// whether or not the exit will be clean.
String testName;
- Signal signal;
+ frysk.sys.Signal signal;
boolean cleanExit;
switch (argc) {
case 1:
testName = "div_zero";
- signal = Signal.FPE;
+ signal = frysk.sys.Signal.FPE;
cleanExit = false;
break;
case 2:
testName = "bad_addr_segv";
- signal = Signal.SEGV;
+ signal = frysk.sys.Signal.SEGV;
cleanExit = false;
break;
case 3:
testName = "bad_inst_ill";
- signal = Signal.ILL;
+ signal = frysk.sys.Signal.ILL;
cleanExit = false;
break;
case 4:
testName = "term_sig_hup";
- signal = Signal.HUP;
+ signal = frysk.sys.Signal.HUP;
cleanExit = false;
break;
case 5:
testName = "ign_sig_urg";
- signal = Signal.URG;
+ signal = frysk.sys.Signal.URG;
cleanExit = true;
break;
default:
@@ -435,7 +437,8 @@ public class TestTaskObserverCode extends TestLib
task.requestUnblock(code);
assertRunUntilStop("wait for signal observer hit");
- assertTrue("signal", signal.equals(so.sig));
+ assertEquals("signal", signal.intValue(),
+ so.sig.intValue());
TerminatingObserver to = new TerminatingObserver();
task.requestAddTerminatingObserver(to);
@@ -918,9 +921,9 @@ public class TestTaskObserverCode extends TestLib
assertEquals("task exit status", 0, terminatingObserver.value);
}
- // Tells the child to run the dummy () function
- // which calls bp1_func () and bp2_func ().
- static final Signal dummySig = Signal.PROF;
+ // Tells the child to run the dummy () function which calls
+ // bp1_func () and bp2_func ().
+ static final frysk.sys.Signal dummySig = frysk.sys.Signal.PROF;
/**
* Request that that the child runs its dummy function which will
@@ -1124,10 +1127,9 @@ public class TestTaskObserverCode extends TestLib
static class SignaledObserver implements TaskObserver.Signaled {
- int sig;
- public Action updateSignaled (Task task,
- frysk.isa.signals.Signal signal) {
- this.sig = signal.intValue();
+ Signal sig;
+ public Action updateSignaled (Task task, Signal signal) {
+ this.sig = signal;
Manager.eventLoop.requestStop();
return Action.BLOCK;
}
diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog
index 39912ff..eec082d 100644
--- a/frysk-sys/frysk/sys/ChangeLog
+++ b/frysk-sys/frysk/sys/ChangeLog
@@ -1,5 +1,7 @@
2008-01-25 Andrew Cagney <cagney@redhat.com>
+ * Signal.java-sh (equals(int)): Delete.
+
* Signal.java-sh (compareTo(Object)): Fix ordering.
* TestSignal.java (testCompareTo()): New.
* TestSignalSet.java (testSingleToString())
diff --git a/frysk-sys/frysk/sys/Signal.java-sh b/frysk-sys/frysk/sys/Signal.java-sh
index 3c5fa4a..c745b91 100644
--- a/frysk-sys/frysk/sys/Signal.java-sh
+++ b/frysk-sys/frysk/sys/Signal.java-sh
@@ -94,9 +94,6 @@ public class Signal implements Comparable {
return ((o instanceof Signal)
&& ((Signal) o).intValue() == this.intValue());
}
- public boolean equals(int sig) {
- return this.intValue() == sig;
- }
public int compareTo(Object o) {
Signal rhs = (Signal)o; // exception ok
return this.intValue() - rhs.intValue();
hooks/post-receive
--
frysk system monitor/debugger