From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2941 invoked by alias); 11 Mar 2008 01:06:03 -0000 Received: (qmail 2912 invoked by uid 367); 11 Mar 2008 01:06:02 -0000 Date: Tue, 11 Mar 2008 01:06:00 -0000 Message-ID: <20080311010602.2897.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Force the initialization of EventLogger. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 888e1d2496bced5836e9662d640fcb2055fa61a1 X-Git-Newrev: 10919301c6d65e57871bc6710e3db46fbf244ab9 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/msg00324.txt.bz2 The branch, master has been updated via 10919301c6d65e57871bc6710e3db46fbf244ab9 (commit) via b78490d82083f7eb82d8c67c4d4c74fea25cf256 (commit) from 888e1d2496bced5836e9662d640fcb2055fa61a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 10919301c6d65e57871bc6710e3db46fbf244ab9 Author: Andrew Cagney Date: Mon Mar 10 21:04:23 2008 -0400 Force the initialization of EventLogger. frysk-gui/ChangeLog 2008-03-10 Andrew Cagney * frysk/EventLogger.java (getLogger()): New. frysk-gui/frysk/gui/ChangeLog 2008-03-10 Andrew Cagney * Gui.java: Use EventLogger.getLogger(). commit b78490d82083f7eb82d8c67c4d4c74fea25cf256 Author: Andrew Cagney Date: Mon Mar 10 20:22:33 2008 -0400 Delete unused MemoryMap fields. frysk-core/frysk/proc/ChangeLog 2008-03-10 Andrew Cagney * MemoryMap.java (pathnameOffset): Delete. (pathnameLength): Delete. * TestMapGet.java: Update. frysk-core/frysk/proc/dead/ChangeLog 2008-03-10 Andrew Cagney * LinuxCoreInfo.java: Update to match MemoryMap. * LinuxExeFactory.java: Ditto. frysk-core/frysk/proc/live/ChangeLog 2008-03-10 Andrew Cagney * LinuxPtraceProc.java: Update to match MemoryMap. frysk-core/frysk/solib/ChangeLog 2008-03-10 Andrew Cagney * MemoryMapFactory.java: Update to match MemoryMap. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 6 +++ frysk-core/frysk/proc/MemoryMap.java | 38 +++++++++------------- frysk-core/frysk/proc/TestMapGet.java | 4 -- frysk-core/frysk/proc/dead/ChangeLog | 3 ++ frysk-core/frysk/proc/dead/LinuxCoreInfo.java | 2 +- frysk-core/frysk/proc/dead/LinuxExeFactory.java | 2 +- frysk-core/frysk/proc/live/ChangeLog | 4 ++ frysk-core/frysk/proc/live/LinuxPtraceProc.java | 7 ++-- frysk-core/frysk/solib/ChangeLog | 2 + frysk-core/frysk/solib/MemoryMapFactory.java | 3 +- frysk-gui/ChangeLog | 4 ++ frysk-gui/frysk/EventLogger.java | 4 ++ frysk-gui/frysk/gui/ChangeLog | 4 ++ frysk-gui/frysk/gui/Gui.java | 9 ++--- 14 files changed, 53 insertions(+), 39 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index db646f0..a1bb1c3 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,3 +1,9 @@ +2008-03-10 Andrew Cagney + + * MemoryMap.java (pathnameOffset): Delete. + (pathnameLength): Delete. + * TestMapGet.java: Update. + 2008-03-04 Andrew Cagney * Host.java (requestCreateAttachedProc(...)): Add File exe arg. diff --git a/frysk-core/frysk/proc/MemoryMap.java b/frysk-core/frysk/proc/MemoryMap.java index f7ecd00..5a033b7 100644 --- a/frysk-core/frysk/proc/MemoryMap.java +++ b/frysk-core/frysk/proc/MemoryMap.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 @@ -58,30 +58,24 @@ public class MemoryMap public final int devMajor; public final int devMinor; public final int inode; - public final int pathnameOffset; - public final int pathnameLength; public final String name; public MemoryMap(long addressLow, long addressHigh, - boolean permRead, boolean permWrite, - boolean permExecute, boolean shared, - long offset, int devMajor, int devMinor, - int inode, int pathnameOffset, - int pathnameLength, String name) - { - this.addressLow = addressLow; - this.addressHigh = addressHigh; - this.permRead = permRead; - this.permWrite = permWrite; - this.permExecute = permExecute; - this.shared = shared; - this.offset = offset; - this.devMajor = devMajor; - this.devMinor = devMinor; - this.inode = inode; - this.pathnameOffset = pathnameOffset; - this.pathnameLength = pathnameLength; - this.name = name; + boolean permRead, boolean permWrite, + boolean permExecute, boolean shared, + long offset, int devMajor, int devMinor, + int inode, String name) { + this.addressLow = addressLow; + this.addressHigh = addressHigh; + this.permRead = permRead; + this.permWrite = permWrite; + this.permExecute = permExecute; + this.shared = shared; + this.offset = offset; + this.devMajor = devMajor; + this.devMinor = devMinor; + this.inode = inode; + this.name = name; } public String toString() diff --git a/frysk-core/frysk/proc/TestMapGet.java b/frysk-core/frysk/proc/TestMapGet.java index a09f507..0199600 100644 --- a/frysk-core/frysk/proc/TestMapGet.java +++ b/frysk-core/frysk/proc/TestMapGet.java @@ -109,10 +109,6 @@ public class TestMapGet testMaps[i].devMinor, devMinor); assertEquals("Testing inode map " + i, testMaps[i].inode, inode); - assertEquals("Testing pathnameOffset map " + i, - testMaps[i].pathnameOffset, pathnameOffset); - assertEquals("Testing pathnameLength map " + i, - testMaps[i].pathnameLength, pathnameLength); i++; } } diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index 8587cc3..5a4db36 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,5 +1,8 @@ 2008-03-10 Andrew Cagney + * LinuxCoreInfo.java: Update to match MemoryMap. + * LinuxExeFactory.java: Ditto. + * LinuxCoreInfo.java (addEnhancedMapData): Use MemoryMapFactory. * SOLibMapBuilder.java: Move to frysk.solib. diff --git a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java index a31c4cf..bd8a80e 100644 --- a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java +++ b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java @@ -228,7 +228,7 @@ class LinuxCoreInfo { map.permRead, map.permWrite, map.permExecute, false, map.solibOffset, - -1, -1, -1, -1, -1, + -1, -1, -1, map.name)); } MemoryMap[] memoryMaps = new MemoryMap[maps.size()]; diff --git a/frysk-core/frysk/proc/dead/LinuxExeFactory.java b/frysk-core/frysk/proc/dead/LinuxExeFactory.java index 255719d..1e7c45f 100644 --- a/frysk-core/frysk/proc/dead/LinuxExeFactory.java +++ b/frysk-core/frysk/proc/dead/LinuxExeFactory.java @@ -64,7 +64,7 @@ public class LinuxExeFactory { long offset, String name, long align) { metaData.add(new MemoryMap(addrLow, addrHigh, permRead, permWrite, permExecute, false, - offset, -1, -1, -1, -1, -1, + offset, -1, -1, -1, exeFile.getAbsolutePath())); } MemoryMap[] getMemoryMaps() { diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index 796b279..ccde76a 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,3 +1,7 @@ +2008-03-10 Andrew Cagney + + * LinuxPtraceProc.java: Update to match MemoryMap. + 2008-03-04 Andrew Cagney * LinuxPtraceHost.java: Update to match Host. diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java index c2c2379..3de3a07 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java @@ -146,13 +146,12 @@ public class LinuxPtraceProc extends LiveProc { int inode, int pathnameOffset, int pathnameLength) { byte[] mapFilename = new byte[pathnameLength]; - System.arraycopy(mapsLocalArray, pathnameOffset, mapFilename, 0, - pathnameLength); + System.arraycopy(mapsLocalArray, pathnameOffset, mapFilename, + 0, pathnameLength); MemoryMap map = new MemoryMap(addressLow, addressHigh, permRead, permWrite, permExecute, shared, offset, - devMajor, devMinor, inode, pathnameOffset, - pathnameLength, new String(mapFilename)); + devMajor, devMinor, inode, new String(mapFilename)); mapsList.add(map); } } diff --git a/frysk-core/frysk/solib/ChangeLog b/frysk-core/frysk/solib/ChangeLog index 0d3705e..c1f7205 100644 --- a/frysk-core/frysk/solib/ChangeLog +++ b/frysk-core/frysk/solib/ChangeLog @@ -1,5 +1,7 @@ 2008-03-10 Andrew Cagney + * MemoryMapFactory.java: Update to match MemoryMap. + * MemoryMapFactory.java: Extract from frysk.proc.dead.LinuxCoreInfo. * SOLibMapBuilder.java: Move to here from frysk.proc.dead. diff --git a/frysk-core/frysk/solib/MemoryMapFactory.java b/frysk-core/frysk/solib/MemoryMapFactory.java index 432ccff..87b694b 100644 --- a/frysk-core/frysk/solib/MemoryMapFactory.java +++ b/frysk-core/frysk/solib/MemoryMapFactory.java @@ -56,8 +56,7 @@ public class MemoryMapFactory { permRead, permWrite, permExecute, false, // shared offset, - 0, 0, 0, // major/minor - 0, 0, // path offset/length + 0, 0, 0, // major/minor/inode name)); } } diff --git a/frysk-gui/ChangeLog b/frysk-gui/ChangeLog index cd33fbb..b263fc5 100644 --- a/frysk-gui/ChangeLog +++ b/frysk-gui/ChangeLog @@ -1,3 +1,7 @@ +2008-03-10 Andrew Cagney + + * frysk/EventLogger.java (getLogger()): New. + 2008-03-03 Andrew Cagney * frysk/EventLogger.java: Use frysk.config. diff --git a/frysk-gui/frysk/EventLogger.java b/frysk-gui/frysk/EventLogger.java index 36225ba..dbf8f15 100644 --- a/frysk-gui/frysk/EventLogger.java +++ b/frysk-gui/frysk/EventLogger.java @@ -73,6 +73,10 @@ public class EventLogger LogManager.getLogManager().addLogger(logger); } + public static Logger getLogger() { + return logger; + } + static private class EventFormatter extends Formatter { private EventFormatter() { super(); diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog index ae19c9b..b79e316 100644 --- a/frysk-gui/frysk/gui/ChangeLog +++ b/frysk-gui/frysk/gui/ChangeLog @@ -1,3 +1,7 @@ +2008-03-10 Andrew Cagney + + * Gui.java: Use EventLogger.getLogger(). + 2008-03-03 Andrew Cagney * test/GuiTestCase.java: Use frysk.config. diff --git a/frysk-gui/frysk/gui/Gui.java b/frysk-gui/frysk/gui/Gui.java index 75ae186..d471637 100644 --- a/frysk-gui/frysk/gui/Gui.java +++ b/frysk-gui/frysk/gui/Gui.java @@ -478,11 +478,10 @@ public class Gui implements LifeCycleListener, Saveable { * found in logging.properties */ private static void setupCoreLogging() { - // Get Core logger - - logger = LogManager.getLogManager().getLogger("frysk"); - Handler fileHandler - = EventLogger.getFileHandler("logs/", "frysk_core_event.log"); + // Get Core logger; ensure it is up and running. + logger = EventLogger.getLogger(); + Handler fileHandler + = EventLogger.getFileHandler("logs/", "frysk_core_event.log"); Handler consoleHandler = new ConsoleHandler(); Handler guiHandler = new CoreDebugHandler(); logger.addHandler(fileHandler); hooks/post-receive -- frysk system monitor/debugger