public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: cagney@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: Delete Signal.kill(int); paper over fallout.
Date: Wed, 13 Feb 2008 15:51:00 -0000 [thread overview]
Message-ID: <20080213155128.14705.qmail@sourceware.org> (raw)
The branch, master has been updated
via 851f377ecd437051bb64bf347ba1b18e9d16170e (commit)
from dc39ca4ad561e54129250ab87bf412f8aaf2c802 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 851f377ecd437051bb64bf347ba1b18e9d16170e
Author: Andrew Cagney <cagney@redhat.com>
Date: Wed Feb 13 10:49:09 2008 -0500
Delete Signal.kill(int); paper over fallout.
frysk-core/frysk/hpd/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* QuitCommand.java: Update to match frysk.sys.Signal.
frysk-core/frysk/proc/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* Proc.java: Update to match frysk.sys.Signal.
* TestSyscallSignal.java: Ditto.
* TestProcTasksObserver.java: Ditto.
* TestTaskObserver.java: Ditto.
* TestTaskSyscallObserver.java: Ditto.
frysk-core/frysk/proc/live/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (tid): Make package private.
* LinuxPtraceTaskState.java: Update to match frysk.sys.Signal.
* TestProcStopped.java: Ditto.
frysk-core/frysk/stepping/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* SteppingEngine.java: Update to match frysk.sys.Signal.
* TestSteppingEngine.java: Ditto.
frysk-core/frysk/util/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* TestFCatch.java: Update to match frysk.sys.Signal.
frysk-gui/frysk/gui/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* Gui.java: Update to match frysk.sys.Signal.
frysk-gui/frysk/gui/monitor/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* MainWindow.java: Update to match frysk.sys.Signal.
frysk-sys/frysk/sys/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* Signal.java-sh (kill(int)): Delete.
(tkill(int)): Delete.
(tkill(int,int)): Make private.
* ProcessIdentifier.java: Update.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/hpd/ChangeLog | 5 ++++-
frysk-core/frysk/hpd/QuitCommand.java | 7 ++++++-
frysk-core/frysk/proc/ChangeLog | 8 ++++++++
frysk-core/frysk/proc/Proc.java | 7 +++++--
frysk-core/frysk/proc/TestProcTasksObserver.java | 10 +++++++---
frysk-core/frysk/proc/TestSyscallSignal.java | 4 +++-
frysk-core/frysk/proc/TestTaskObserver.java | 9 +++++++--
frysk-core/frysk/proc/TestTaskSyscallObserver.java | 5 ++++-
frysk-core/frysk/proc/live/ChangeLog | 6 ++++++
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 2 +-
.../frysk/proc/live/LinuxPtraceTaskState.java | 4 ++--
frysk-core/frysk/proc/live/TestProcStopped.java | 7 ++++++-
.../frysk/proc/live/TestTaskObserverCode.java | 12 +++++++++---
frysk-core/frysk/stepping/ChangeLog | 5 +++++
frysk-core/frysk/stepping/SteppingEngine.java | 7 +++++--
frysk-core/frysk/stepping/TestSteppingEngine.java | 7 +++++--
frysk-core/frysk/util/ChangeLog | 4 ++++
frysk-core/frysk/util/TestFCatch.java | 5 ++++-
frysk-gui/frysk/gui/ChangeLog | 4 ++++
frysk-gui/frysk/gui/Gui.java | 9 ++++++---
frysk-gui/frysk/gui/monitor/ChangeLog | 4 ++++
frysk-gui/frysk/gui/monitor/MainWindow.java | 9 ++++++---
frysk-sys/frysk/sys/ChangeLog | 7 +++++++
frysk-sys/frysk/sys/ProcessIdentifier.java | 4 ++--
frysk-sys/frysk/sys/Signal.java-sh | 14 +-------------
25 files changed, 121 insertions(+), 44 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 0af5c04..393aebf 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * QuitCommand.java: Update to match frysk.sys.Signal.
+
2008-02-11 Rick Moseley <rmoseley@redhat.com>
* UnloadCommand.java: New to unload loaded processes.
@@ -8,7 +12,6 @@
* CLI.java: Fix call to duplicate method.
* StartRun.java: Fix error in looping for start/run.
-
2008-02-08 Stan Cox <scox@redhat.com>
* TestListCommand.java (testListFrames): Tweak the expect output.
diff --git a/frysk-core/frysk/hpd/QuitCommand.java b/frysk-core/frysk/hpd/QuitCommand.java
index 5d08f31..eeedb50 100644
--- a/frysk-core/frysk/hpd/QuitCommand.java
+++ b/frysk-core/frysk/hpd/QuitCommand.java
@@ -47,6 +47,8 @@ import frysk.proc.Proc;
import frysk.sys.Signal;
import frysk.util.CountDownLatch;
import java.util.List;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
class QuitCommand extends ParameterizedCommand {
// Do the killing in the event loop in order to not invalidate
@@ -66,7 +68,10 @@ class QuitCommand extends ParameterizedCommand {
for (Iterator iterator = cli.runningProcs.iterator();
iterator.hasNext();) {
Proc p = (Proc) iterator.next();
- Signal.KILL.kill(p.getPid());
+ // FIXME: Should be sending the kill request to the
+ // host; which then passes it down to back-end code.
+ ProcessIdentifier pid = ProcessIdentifierFactory.create(p.getPid());
+ Signal.KILL.kill(pid);
}
// Throw the countDown on the queue so that the command
// thread will wait until events provoked by Signal.kill()
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index e6104c5..b4d272c 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * Proc.java: Update to match frysk.sys.Signal.
+ * TestSyscallSignal.java: Ditto.
+ * TestProcTasksObserver.java: Ditto.
+ * TestTaskObserver.java: Ditto.
+ * TestTaskSyscallObserver.java: Ditto.
+
2008-02-12 Andrew Cagney <cagney@redhat.com>
* TestHostGet.java: Update to match frysk.sys.Pid.
diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java
index 9539182..2e87a8e 100644
--- a/frysk-core/frysk/proc/Proc.java
+++ b/frysk-core/frysk/proc/Proc.java
@@ -50,7 +50,8 @@ import java.util.Observer;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import frysk.util.CountDownLatch;
import frysk.event.Event;
import frysk.sys.Signal;
@@ -198,7 +199,9 @@ public abstract class Proc implements Comparable {
*/
public void requestKill() {
- Signal.KILL.kill(this.getPid());
+ // FIXME: Should be handled by lower-level code.
+ ProcessIdentifier pid = ProcessIdentifierFactory.create(this.getPid());
+ Signal.KILL.kill(pid);
// Throw the countDown on the queue so that the command
// thread will wait until events provoked by Signal.kill()
// are handled.
diff --git a/frysk-core/frysk/proc/TestProcTasksObserver.java b/frysk-core/frysk/proc/TestProcTasksObserver.java
index 8db1922..955d3c5 100644
--- a/frysk-core/frysk/proc/TestProcTasksObserver.java
+++ b/frysk-core/frysk/proc/TestProcTasksObserver.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
@@ -39,6 +39,8 @@
package frysk.proc;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import java.util.logging.Level;
import frysk.sys.Signal;
import frysk.testbed.TestLib;
@@ -187,7 +189,8 @@ public class TestProcTasksObserver extends TestLib {
//Delete a clone.
Task task = ackProcess.findTaskUsingRefresh(false);
- Signal.BUS.tkill(task.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ Signal.BUS.tkill(tid);
assertRunUntilStop("delete 2");
@@ -226,7 +229,8 @@ public class TestProcTasksObserver extends TestLib {
ackProcess.assertSendAddCloneWaitForAcks();
Task task = ackProcess.findTaskUsingRefresh(false);
- Signal.BUS.tkill(task.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ Signal.BUS.tkill(tid);
assertRunUntilStop("clone then kill 2");
diff --git a/frysk-core/frysk/proc/TestSyscallSignal.java b/frysk-core/frysk/proc/TestSyscallSignal.java
index 4cf5f44..3f634d4 100644
--- a/frysk-core/frysk/proc/TestSyscallSignal.java
+++ b/frysk-core/frysk/proc/TestSyscallSignal.java
@@ -53,6 +53,7 @@ import frysk.isa.syscalls.SyscallTableFactory;
import frysk.testbed.TearDownProcess;
import frysk.Config;
import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
/**
* XXX: This code should be simplified, eliminating local parallelism
@@ -133,7 +134,8 @@ public class TestSyscallSignal
assertRunUntilStop ("syso entered is 42");
// Now send a signal to the process while blocked. Then unblock.
- Signal.HUP.tkill(task.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ Signal.HUP.tkill(tid);
task.requestUnblock(syso);
// Sanity check that the functions have actually been run.
diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java
index 95180b0..09e7b51 100644
--- a/frysk-core/frysk/proc/TestTaskObserver.java
+++ b/frysk-core/frysk/proc/TestTaskObserver.java
@@ -48,6 +48,8 @@ import frysk.testbed.TestLib;
import frysk.testbed.Offspring;
import frysk.testbed.SlaveOffspring;
import frysk.testbed.TaskObserverBase;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
/**
* Generic observer tests - that the framework functions ok.
@@ -101,7 +103,9 @@ public class TestTaskObserver
frysk.sys.Signal sig = theSig;
public void execute () {
try {
- sig.tkill(pid);
+ ProcessIdentifier id
+ = ProcessIdentifierFactory.create(pid);
+ sig.tkill(id);
sig = frysk.sys.Signal.NONE;
} catch (Errno.Esrch e) {
Manager.eventLoop.requestStop ();
@@ -244,7 +248,8 @@ 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.
- frysk.sys.Signal.KILL.kill(task.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ frysk.sys.Signal.KILL.kill(tid);
detach (new Task[] { task }, attachedObserver, false);
}
diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
index 9cd9f45..7f6250e 100644
--- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java
+++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
@@ -39,6 +39,8 @@
package frysk.proc;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import frysk.isa.syscalls.Syscall;
import frysk.isa.syscalls.SyscallTable;
import frysk.isa.syscalls.SyscallTableFactory;
@@ -541,7 +543,8 @@ public class TestTaskSyscallObserver
throw new RuntimeException("read exited without signal");
// We want to signal the process so it will interrupt the
// read.
- Signal.USR1.tkill(task.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ Signal.USR1.tkill(tid);
}
}
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 127754e..fc67d84 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * LinuxPtraceTask.java (tid): Make package private.
+ * LinuxPtraceTaskState.java: Update to match frysk.sys.Signal.
+ * TestProcStopped.java: Ditto.
+
2008-02-12 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java: Update to match frysk.sys.Pid.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index a9a6b51..16dcd60 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -75,7 +75,7 @@ import frysk.isa.banks.RegisterBanks;
*/
public class LinuxPtraceTask extends LiveTask {
- private final ProcessIdentifier tid;
+ final ProcessIdentifier tid;
/**
* Create a new unattached Task.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index aa1b4cd..08dd7a2 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -192,7 +192,7 @@ class LinuxPtraceTaskState extends State {
// differentiates between STOPPED an TRACED.
logger.log(Level.FINE,
"{0} wake the suspended process", task);
- Signal.CONT.tkill(task.getTid());
+ Signal.CONT.tkill(task.tid);
return new Attaching(true);
} else {
return new Attaching(false);
@@ -226,7 +226,7 @@ class LinuxPtraceTaskState extends State {
for (int i = 0; i < sigs.length; i++) {
logger.log(Level.FINE, "{0} re-sending {1}\n",
new Object[] { this, sigs[i] });
- sigs[i].tkill(task.getTid());
+ sigs[i].tkill(task.tid);
}
// And convert the CONT back into a STOP.
signal = Signal.STOP;
diff --git a/frysk-core/frysk/proc/live/TestProcStopped.java b/frysk-core/frysk/proc/live/TestProcStopped.java
index 13d0773..3033ad4 100644
--- a/frysk-core/frysk/proc/live/TestProcStopped.java
+++ b/frysk-core/frysk/proc/live/TestProcStopped.java
@@ -52,6 +52,8 @@ import frysk.proc.Proc;
import frysk.proc.Task;
import frysk.proc.ProcObserver;
import frysk.proc.ProcBlockAction;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
public class TestProcStopped extends TestLib {
@@ -170,7 +172,10 @@ public class TestProcStopped extends TestLib {
ackProc.signal(Signal.TERM);
class Signaled extends TaskObserverBase implements TaskObserver.Signaled {
public void addedTo(Object o) {
- Signal.CONT.tkill(((Task)o).getTid());
+ // FIXME: Should use HOST or similar to send the signal.
+ ProcessIdentifier pid =
+ ProcessIdentifierFactory.create(((Task) o).getTid());
+ Signal.CONT.tkill(pid);
}
public Action updateSignaled(Task task,
frysk.isa.signals.Signal signal) {
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverCode.java b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
index 0c35eaf..f4ab4eb 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverCode.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
@@ -39,6 +39,8 @@
package frysk.proc.live;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import lib.dwfl.DwarfCommand;
import lib.dwfl.ElfCommand;
import frysk.dwfl.DwflCache;
@@ -222,7 +224,9 @@ public class TestTaskObserverCode extends TestLib
// step over the currently pending breakpoint. And will then kill
// the process when delivered.
code.hit = false;
- frysk.sys.Signal.TERM.tkill(task.getTid());
+ // FIXME: Should send the request to the host.
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(task.getTid());
+ frysk.sys.Signal.TERM.tkill(tid);
task.requestUnblock(code);
assertRunUntilStop("wait for TERM signal");
assertEquals("term signaled", frysk.sys.Signal.TERM.intValue(),
@@ -934,7 +938,8 @@ public class TestTaskObserverCode extends TestLib
}
void requestDummyRun(Task t) {
- dummySig.tkill(t.getTid());
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(t.getTid());
+ dummySig.tkill(tid);
}
/**
@@ -944,7 +949,8 @@ public class TestTaskObserverCode extends TestLib
* a code observer on the dummy (), pb1_func () and/or pb2_func ()
* functions.
*/
- void requestDummyRun(int tid) {
+ void requestDummyRun(int id) {
+ ProcessIdentifier tid = ProcessIdentifierFactory.create(id);
dummySig.tkill(tid);
}
diff --git a/frysk-core/frysk/stepping/ChangeLog b/frysk-core/frysk/stepping/ChangeLog
index 9f8285d..3ad6a77 100644
--- a/frysk-core/frysk/stepping/ChangeLog
+++ b/frysk-core/frysk/stepping/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * SteppingEngine.java: Update to match frysk.sys.Signal.
+ * TestSteppingEngine.java: Ditto.
+
2008-02-12 Andrew Cagney <cagney@redhat.com>
* TestStepping.java: Update to match frysk.sys.Pid.
diff --git a/frysk-core/frysk/stepping/SteppingEngine.java b/frysk-core/frysk/stepping/SteppingEngine.java
index 13224ff..e23e2d3 100644
--- a/frysk-core/frysk/stepping/SteppingEngine.java
+++ b/frysk-core/frysk/stepping/SteppingEngine.java
@@ -50,7 +50,8 @@ import java.util.Observable;
import java.util.Observer;
import java.util.logging.Level;
import java.util.logging.Logger;
-
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import lib.dwfl.DwflLine;
import frysk.debuginfo.DebugInfoFrame;
import frysk.event.RequestStopEvent;
@@ -1252,7 +1253,9 @@ public class SteppingEngine {
contextMap.put(task.getProc(), new Integer(i));
} else {
contextMap.remove(task.getProc());
- frysk.sys.Signal.KILL.kill(task.getProc().getPid());
+ ProcessIdentifier pid
+ = ProcessIdentifierFactory.create(task.getProc().getPid());
+ frysk.sys.Signal.KILL.kill(pid);
}
}
}
diff --git a/frysk-core/frysk/stepping/TestSteppingEngine.java b/frysk-core/frysk/stepping/TestSteppingEngine.java
index a7aaa85..149f739 100644
--- a/frysk-core/frysk/stepping/TestSteppingEngine.java
+++ b/frysk-core/frysk/stepping/TestSteppingEngine.java
@@ -44,7 +44,8 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Observable;
import java.util.Observer;
-
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import frysk.scopes.SourceLocation;
import frysk.sys.Signal;
import frysk.testbed.Offspring;
@@ -649,7 +650,9 @@ public class TestSteppingEngine extends TestLib {
}
public void addedTo(Object observable) {
- Signal.KILL.kill(((Task) observable).getProc().getPid());
+ ProcessIdentifier pid
+ = ProcessIdentifierFactory.create(((Task)observable).getProc().getPid());
+ Signal.KILL.kill(pid);
}
public void addFailed(Object observable, Throwable w) {
diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog
index 21a7569..626b380 100644
--- a/frysk-core/frysk/util/ChangeLog
+++ b/frysk-core/frysk/util/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * TestFCatch.java: Update to match frysk.sys.Signal.
+
2008-02-07 Andrew Cagney <cagney@redhat.com>
* FCatch.java: Update to match Host.requestProc(int,FindProc).
diff --git a/frysk-core/frysk/util/TestFCatch.java b/frysk-core/frysk/util/TestFCatch.java
index 8b2b783..81892fd 100644
--- a/frysk-core/frysk/util/TestFCatch.java
+++ b/frysk-core/frysk/util/TestFCatch.java
@@ -40,6 +40,8 @@
package frysk.util;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Iterator;
@@ -79,7 +81,8 @@ public class TestFCatch
assertRunUntilStop("Adding all observers");
- frysk.sys.Signal.SEGV.kill(proc.getPid());
+ ProcessIdentifier pid = ProcessIdentifierFactory.create(proc.getPid());
+ frysk.sys.Signal.SEGV.kill(pid);
assertRunUntilStop("Building stacktrace");
diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog
index 247fa8a..5cc23e2 100644
--- a/frysk-gui/frysk/gui/ChangeLog
+++ b/frysk-gui/frysk/gui/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * Gui.java: Update to match frysk.sys.Signal.
+
2008-02-07 Andrew Cagney <cagney@redhat.com>
* Gui.java: Delete call to Host.requestRefreshXXX().
diff --git a/frysk-gui/frysk/gui/Gui.java b/frysk-gui/frysk/gui/Gui.java
index 04ce0ba..97014d1 100644
--- a/frysk-gui/frysk/gui/Gui.java
+++ b/frysk-gui/frysk/gui/Gui.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
@@ -58,7 +58,8 @@ import java.util.logging.LogManager;
import java.util.logging.Logger;
import java.util.prefs.InvalidPreferencesFormatException;
import java.util.prefs.Preferences;
-
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import org.gnu.gdk.Color;
import org.gnu.glade.GladeXMLException;
import org.gnu.glade.LibGlade;
@@ -310,7 +311,9 @@ public class Gui implements LifeCycleListener, Saveable {
= Integer.parseInt(contents[i].getName()
.substring(4));
try {
- Signal.USR1.kill(currentlyRunningPID);
+ ProcessIdentifier pid
+ = ProcessIdentifierFactory.create(currentlyRunningPID);
+ Signal.USR1.kill(pid);
} catch (Exception e) {
/* The lock file shouldn't be there */
contents[i].delete();
diff --git a/frysk-gui/frysk/gui/monitor/ChangeLog b/frysk-gui/frysk/gui/monitor/ChangeLog
index edebf53..a8309a3 100644
--- a/frysk-gui/frysk/gui/monitor/ChangeLog
+++ b/frysk-gui/frysk/gui/monitor/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13 Andrew Cagney <cagney@redhat.com>
+
+ * MainWindow.java: Update to match frysk.sys.Signal.
+
2008-01-25 Andrew Cagney <cagney@redhat.com>
* actions/RunExternal.java: Update to match
diff --git a/frysk-gui/frysk/gui/monitor/MainWindow.java b/frysk-gui/frysk/gui/monitor/MainWindow.java
index 3f6050f..57e9ef6 100644
--- a/frysk-gui/frysk/gui/monitor/MainWindow.java
+++ b/frysk-gui/frysk/gui/monitor/MainWindow.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 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
@@ -42,7 +42,8 @@ import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.prefs.Preferences;
-
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
import org.gnu.gdk.Color;
import org.gnu.glade.LibGlade;
hooks/post-receive
--
frysk system monitor/debugger
reply other threads:[~2008-02-13 15:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080213155128.14705.qmail@sourceware.org \
--to=cagney@sourceware.org \
--cc=frysk-cvs@sourceware.org \
--cc=frysk@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).