From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29483 invoked by alias); 27 Feb 2008 05:46:55 -0000 Received: (qmail 29458 invoked by uid 367); 27 Feb 2008 05:46:55 -0000 Date: Wed, 27 Feb 2008 05:46:00 -0000 Message-ID: <20080227054655.29443.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete Util.getProcFromCoreFile. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 090326a700daee630229c0654a16884fe6816223 X-Git-Newrev: 7c91f509e932f930be40dd3187bca84b2a1a44ad 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/msg00263.txt.bz2 The branch, master has been updated via 7c91f509e932f930be40dd3187bca84b2a1a44ad (commit) from 090326a700daee630229c0654a16884fe6816223 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 7c91f509e932f930be40dd3187bca84b2a1a44ad Author: Andrew Cagney Date: Wed Feb 27 00:45:46 2008 -0500 Delete Util.getProcFromCoreFile. frysk-core/frysk/proc/dead/ChangeLog 2008-02-27 Andrew Cagney * TestCoreRegs.java: Use LinuxCoreFactory. frysk-core/frysk/testbed/ChangeLog 2008-02-27 Andrew Cagney * TestCorefileFactory.java: Use LinuxCoreFactory. frysk-core/frysk/util/ChangeLog 2008-02-27 Andrew Cagney * Util.java (getProcFromCoreFile(File)): Delete. (getProcFromCoreFile(File,File)): Delete. frysk-gui/frysk/gui/srcwin/ChangeLog 2008-02-27 Andrew Cagney * SourceWindowFactory.java: Use LinuxCoreFactory. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/dead/ChangeLog | 4 ++++ frysk-core/frysk/proc/dead/TestCoreRegs.java | 3 +-- frysk-core/frysk/testbed/ChangeLog | 4 ++++ frysk-core/frysk/testbed/TestCorefileFactory.java | 4 ++-- frysk-core/frysk/util/ChangeLog | 3 +++ frysk-core/frysk/util/Util.java | 19 ------------------- frysk-gui/frysk/gui/srcwin/ChangeLog | 4 ++++ .../frysk/gui/srcwin/SourceWindowFactory.java | 7 +++---- 8 files changed, 21 insertions(+), 27 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index 5984330..ae17b0a 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,3 +1,7 @@ +2008-02-27 Andrew Cagney + + * TestCoreRegs.java: Use LinuxCoreFactory. + 2008-02-26 Andrew Cagney * LinuxCoreFactory.java (createProc(File,boolean)): New. diff --git a/frysk-core/frysk/proc/dead/TestCoreRegs.java b/frysk-core/frysk/proc/dead/TestCoreRegs.java index a2fd3fb..c738c5e 100644 --- a/frysk-core/frysk/proc/dead/TestCoreRegs.java +++ b/frysk-core/frysk/proc/dead/TestCoreRegs.java @@ -43,7 +43,6 @@ import frysk.isa.registers.Register; import frysk.testbed.RegsCase; import frysk.proc.Proc; import frysk.testbed.CorefileFactory; -import frysk.util.Util; import java.io.File; /** @@ -58,7 +57,7 @@ public class TestCoreRegs extends RegsCase { Proc proc = task().getProc(); File exe = new File(proc.getExe()); File core = CorefileFactory.constructCore(proc); - Proc coreProc = Util.getProcFromCoreFile(core, exe); + Proc coreProc = LinuxCoreFactory.createProc(core, exe); setTask(coreProc.getMainTask()); } diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog index 18e1cd1..acce90b 100644 --- a/frysk-core/frysk/testbed/ChangeLog +++ b/frysk-core/frysk/testbed/ChangeLog @@ -1,3 +1,7 @@ +2008-02-27 Andrew Cagney + + * TestCorefileFactory.java: Use LinuxCoreFactory. + 2008-02-26 Teresa Thomas * TestCoredumpAction.java: Move from frysk.util. diff --git a/frysk-core/frysk/testbed/TestCorefileFactory.java b/frysk-core/frysk/testbed/TestCorefileFactory.java index be1f078..3442316 100644 --- a/frysk-core/frysk/testbed/TestCorefileFactory.java +++ b/frysk-core/frysk/testbed/TestCorefileFactory.java @@ -42,14 +42,14 @@ package frysk.testbed; import java.io.File; import frysk.Config; import frysk.proc.Proc; -import frysk.util.Util; import frysk.proc.Task; +import frysk.proc.dead.LinuxCoreFactory; public class TestCorefileFactory extends TestLib { public void testCoreFileAtSignal() { File coreExe = Config.getPkgLibFile("funit-asm"); File coreFile = CorefileFactory.constructCoreAtSignal(coreExe); - Proc coreProc = Util.getProcFromCoreFile(coreFile, coreExe); + Proc coreProc = LinuxCoreFactory.createProc(coreFile, coreExe); Task coreTask = coreProc.getMainTask(); FryskAsm regs = FryskAsm.createFryskAsm(coreTask.getISA()); assertEquals("REG0", 1, coreTask.getRegister(regs.REG0)); diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog index 02f6317..df737d5 100644 --- a/frysk-core/frysk/util/ChangeLog +++ b/frysk-core/frysk/util/ChangeLog @@ -1,5 +1,8 @@ 2008-02-27 Andrew Cagney + * Util.java (getProcFromCoreFile(File)): Delete. + (getProcFromCoreFile(File,File)): Delete. + * CommandlineParser.java (parseCommandFIXME(String[])): Delete. 2008-02-26 Andrew Cagney diff --git a/frysk-core/frysk/util/Util.java b/frysk-core/frysk/util/Util.java index f3c1de3..562da9c 100644 --- a/frysk-core/frysk/util/Util.java +++ b/frysk-core/frysk/util/Util.java @@ -40,10 +40,8 @@ package frysk.util; import gnu.classpath.tools.getopt.OptionException; -import java.io.File; import frysk.proc.FindProc; import frysk.proc.Manager; -import frysk.proc.dead.LinuxCoreFactory; import frysk.proc.Proc; public class Util @@ -54,23 +52,6 @@ public class Util } /** - * Return the Proc associated with a coreFile. - * @param coreFile the given coreFile. - * @return The Proc for the given coreFile. - */ - public static Proc getProcFromCoreFile(File coreFile) { - Proc proc = LinuxCoreFactory.createProc(coreFile); - if (proc == null) - throw new RuntimeException("Core file contains no proc."); - return proc; - } - - public static Proc getProcFromCoreFile(File coreFile, File exeFile) { - Proc proc = LinuxCoreFactory.createProc(coreFile, exeFile); - return proc; - } - - /** * Return a Proc associated with the given pid. * @param procId The given pid. * @return A Proc for the given pid. diff --git a/frysk-gui/frysk/gui/srcwin/ChangeLog b/frysk-gui/frysk/gui/srcwin/ChangeLog index f5142f2..93f91a8 100644 --- a/frysk-gui/frysk/gui/srcwin/ChangeLog +++ b/frysk-gui/frysk/gui/srcwin/ChangeLog @@ -1,3 +1,7 @@ +2008-02-27 Andrew Cagney + + * SourceWindowFactory.java: Use LinuxCoreFactory. + 2008-02-07 Andrew Cagney * SourceWindowFactory.java (attachToPID(int)): Delete. diff --git a/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java b/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java index a14446c..bfd2d6c 100644 --- a/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java +++ b/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java @@ -50,7 +50,7 @@ import org.gnu.gtk.event.LifeCycleEvent; import org.gnu.gtk.event.LifeCycleListener; import org.jdom.output.Format; import org.jdom.output.XMLOutputter; - +import frysk.proc.dead.LinuxCoreFactory; import frysk.Config; import frysk.debuginfo.DebugInfoFrame; import frysk.debuginfo.DebugInfoStackFactory; @@ -166,9 +166,8 @@ public class SourceWindowFactory srcWin.grabFocus(); } - public static void attachToCore(File coreFile) - { - Proc proc = frysk.util.Util.getProcFromCoreFile(coreFile); + public static void attachToCore(File coreFile) { + Proc proc = LinuxCoreFactory.createProc(coreFile); LinkedList tasks = proc.getTasks(); DebugInfoFrame[] framez = new DebugInfoFrame[tasks.size()]; hooks/post-receive -- frysk system monitor/debugger