From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9933 invoked by alias); 24 Jan 2008 21:02:46 -0000 Received: (qmail 9904 invoked by uid 367); 24 Jan 2008 21:02:44 -0000 Date: Thu, 24 Jan 2008 21:02:00 -0000 Message-ID: <20080124210244.9889.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use frysk.isa.signals.Signal. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f44baadbb992bcba1baf30048084c1ed94b9d6a9 X-Git-Newrev: b1204beec55a35ac0c18d37519cd55c70bd33fb8 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00119.txt.bz2 The branch, master has been updated via b1204beec55a35ac0c18d37519cd55c70bd33fb8 (commit) from f44baadbb992bcba1baf30048084c1ed94b9d6a9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit b1204beec55a35ac0c18d37519cd55c70bd33fb8 Author: Andrew Cagney Date: Thu Jan 24 16:02:24 2008 -0500 Use frysk.isa.signals.Signal. frysk-gui/frysk/gui/monitor/ChangeLog 2008-01-24 Andrew Cagney * observers/TaskSignaledObserver.java: Update to match TaskObserver.Signaled.updateSignaled(Task,Signal). ----------------------------------------------------------------------- Summary of changes: frysk-gui/frysk/gui/monitor/ChangeLog | 3 + .../monitor/observers/TaskSignaledObserver.java | 45 ++++++++++---------- 2 files changed, 26 insertions(+), 22 deletions(-) First 500 lines of diff: diff --git a/frysk-gui/frysk/gui/monitor/ChangeLog b/frysk-gui/frysk/gui/monitor/ChangeLog index 123b2ee..4c91d20 100644 --- a/frysk-gui/frysk/gui/monitor/ChangeLog +++ b/frysk-gui/frysk/gui/monitor/ChangeLog @@ -1,5 +1,8 @@ 2008-01-24 Andrew Cagney + * observers/TaskSignaledObserver.java: Update to match + TaskObserver.Signaled.updateSignaled(Task,Signal). + * observers/SysCallUtilyInfo.java: Update; Syscall moved to frysk.isa.syscalls. * observers/TaskSyscallObserver.java: Ditto. diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java index c9c8854..f402abd 100644 --- a/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java +++ b/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java @@ -48,7 +48,7 @@ import frysk.proc.Action; import frysk.proc.Manager; import frysk.proc.Task; import frysk.proc.TaskObserver; -import frysk.sys.Signal; +import frysk.isa.signals.Signal; public class TaskSignaledObserver extends TaskObserverRoot implements TaskObserver.Signaled { @@ -107,23 +107,25 @@ public class TaskSignaledObserver extends TaskObserverRoot implements task.requestDeleteSignaledObserver(this); } - /* (non-Javadoc) - * @see frysk.proc.TaskObserver$Signaled#updateSignaled(frysk.proc.Task, int)\] - * - */ - public Action updateSignaled(final Task task, final int signal) { - org.gnu.glib.CustomEvents.addEvent(new Runnable() { - public void run() { - bottomHalf(task, signal); - } - }); - return Action.BLOCK; - } + /* (non-Javadoc) + * @see + * frysk.proc.TaskObserver$Signaled#updateSignaled(frysk.proc.Task, + * int)\] + * + */ + public Action updateSignaled(final Task task, final Signal signal) { + org.gnu.glib.CustomEvents.addEvent(new Runnable() { + public void run() { + bottomHalf(task, signal); + } + }); + return Action.BLOCK; + } - private void bottomHalf(final Task task, final int signal) { + private void bottomHalf(final Task task, final Signal signal) { setInfo(getName() + ": " + "PID: " + task.getProc().getPid() + " TID: " + task.getTid() + " Event: has pending signal: " - + Signal.toHostStringFIXME(signal) + + signal + " Host: " + Manager.host.getName()); if (runFilters(task, signal)) { this.runActions(task, signal); @@ -135,20 +137,19 @@ public class TaskSignaledObserver extends TaskObserverRoot implements } } - private void runActions(final Task task, int signal) { + private void runActions(final Task task, Signal signal) { // XXX: This is the host and not target signal - Event event = new Event("signaled " + Signal.toHostStringFIXME(signal), - "task recieved signal " - + Signal.toHostStringFIXME(signal), + Event event = new Event("signaled " + signal, + "task recieved signal " + signal, GuiTask.GuiTaskFactory.getGuiTask(task), this); super.runActions(); taskActionPoint.runActions(task, this, event); EventManager.theManager.addEvent(event); } - private boolean runFilters(final Task task, int signal) { - return filter(task); - } + private boolean runFilters(final Task task, Signal signal) { + return filter(task); + } protected GuiObject getCopy() { return new TaskSignaledObserver(this); hooks/post-receive -- frysk system monitor/debugger