From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29249 invoked by alias); 28 Feb 2008 21:56:00 -0000 Received: (qmail 29223 invoked by uid 367); 28 Feb 2008 21:56:00 -0000 Date: Thu, 28 Feb 2008 21:56:00 -0000 Message-ID: <20080228215600.29208.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use frysk.rsl. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 058aac11987b42390a7a179274227d4735d41f19 X-Git-Newrev: 3ec2bf69a2a1fc202195b58f1289cafec543a6f6 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/msg00282.txt.bz2 The branch, master has been updated via 3ec2bf69a2a1fc202195b58f1289cafec543a6f6 (commit) via a58aed732db4d12c364098c809b6b8561145087f (commit) from 058aac11987b42390a7a179274227d4735d41f19 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 3ec2bf69a2a1fc202195b58f1289cafec543a6f6 Author: Andrew Cagney Date: Thu Feb 28 16:44:56 2008 -0500 Use frysk.rsl. frysk-core/frysk/debuginfo/ChangeLog 2008-02-28 Andrew Cagney * gen-type-expect-tests.py: Ditto. * TestFrameDebugInfo.java: Delete unused logger. * TestLocationExpression.java: Ditto. frysk-core/frysk/event/ChangeLog 2008-02-28 Andrew Cagney * EventLoop.java: Use frysk.rsl. * TimerEvent.java: Ditto. * WaitEventLoop.java: Ditto. * PollEventLoop.java: Ditto. frysk-core/frysk/hpd/ChangeLog 2008-02-28 Andrew Cagney * HardList.java: Use frysk.rsl. frysk-core/frysk/rt/ChangeLog 2008-02-28 Andrew Cagney * Breakpoint.java: Use frysk.rsl. * BreakpointManager.java: Ditto. * LineBreakpoint.java: Ditto. frysk-core/frysk/stack/ChangeLog 2008-02-28 Andrew Cagney * LibunwindAddressSpace.java: Use frysk.rsl. * TestFrame.java: Ditto. * LibunwindFrame.java: Ditto. frysk-core/frysk/stepping/ChangeLog 2008-02-28 Andrew Cagney * SteppingEngine.java: Use frysk.rsl. frysk-core/frysk/testbed/ChangeLog 2008-02-28 Andrew Cagney * CoredumpAction.java: Use frysk.rsl. * TestLib.java: Delete unused logger. frysk-core/frysk/util/ChangeLog 2008-02-28 Andrew Cagney * FCatch.java: Use frysk.rsl. * TestStackTraceAction.java: Ditto. * TestFCatch.java: Ditto. * StacktraceAction.java: Ditto. * StressTestStackTraceAction.java: Ditto. frysk-sys/frysk/rsl/ChangeLog 2008-02-28 Andrew Cagney * Log.java: Add more loggers. commit a58aed732db4d12c364098c809b6b8561145087f Author: Andrew Cagney Date: Thu Feb 28 15:12:16 2008 -0500 Switch to frysk.rsl. frysk-core/frysk/bindir/ChangeLog 2008-02-28 Andrew Cagney * fcatch.java: Delete unused logger. * fstack.java: Ditto. * fcore.java: Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 6 ++ frysk-core/frysk/bindir/fcatch.java | 5 +-- frysk-core/frysk/bindir/fcore.java | 7 +-- frysk-core/frysk/bindir/fstack.java | 8 +-- frysk-core/frysk/debuginfo/ChangeLog | 6 ++ frysk-core/frysk/debuginfo/TestFrameDebugInfo.java | 9 +--- .../frysk/debuginfo/TestLocationExpression.java | 8 +-- .../frysk/debuginfo/gen-type-expect-tests.py | 9 +--- frysk-core/frysk/event/ChangeLog | 7 +++ frysk-core/frysk/event/EventLoop.java | 53 +++++++++---------- frysk-core/frysk/event/PollEventLoop.java | 23 ++++---- frysk-core/frysk/event/TimerEvent.java | 24 ++++----- frysk-core/frysk/event/WaitEventLoop.java | 24 +++----- frysk-core/frysk/hpd/ChangeLog | 4 ++ frysk-core/frysk/hpd/HardList.java | 11 ++-- frysk-core/frysk/rt/Breakpoint.java | 33 ++++-------- frysk-core/frysk/rt/BreakpointManager.java | 17 ++---- frysk-core/frysk/rt/ChangeLog | 6 ++ frysk-core/frysk/rt/LineBreakpoint.java | 26 +++------- frysk-core/frysk/stack/ChangeLog | 6 ++ frysk-core/frysk/stack/LibunwindAddressSpace.java | 46 ++++++---------- frysk-core/frysk/stack/LibunwindFrame.java | 17 +++---- frysk-core/frysk/stack/TestFrame.java | 16 ++---- frysk-core/frysk/stepping/ChangeLog | 4 ++ frysk-core/frysk/stepping/SteppingEngine.java | 26 +++------- frysk-core/frysk/testbed/ChangeLog | 5 ++ frysk-core/frysk/testbed/CoredumpAction.java | 11 ++--- frysk-core/frysk/testbed/TestLib.java | 2 - frysk-core/frysk/util/ChangeLog | 8 +++ frysk-core/frysk/util/FCatch.java | 55 ++++++++----------- frysk-core/frysk/util/StacktraceAction.java | 32 +++++------- .../frysk/util/StressTestStackTraceAction.java | 12 ++--- frysk-core/frysk/util/TestFCatch.java | 41 +++++++-------- frysk-core/frysk/util/TestStackTraceAction.java | 9 ++-- frysk-sys/frysk/rsl/ChangeLog | 2 + frysk-sys/frysk/rsl/Log.java | 30 +++++++++++ 36 files changed, 281 insertions(+), 327 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 2f6f7a1..087b7af 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,9 @@ +2008-02-28 Andrew Cagney + + * fcatch.java: Delete unused logger. + * fstack.java: Ditto. + * fcore.java: Ditto. + 2008-02-28 Phil Muldoon * fcore.xml: Add --segments option. Delete diff --git a/frysk-core/frysk/bindir/fcatch.java b/frysk-core/frysk/bindir/fcatch.java index 6bc7dfd..ed5f6cf 100644 --- a/frysk-core/frysk/bindir/fcatch.java +++ b/frysk-core/frysk/bindir/fcatch.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,7 +39,6 @@ package frysk.bindir; -import java.util.logging.Logger; import frysk.util.Util; import frysk.util.CommandlineParser; import frysk.util.FCatch; @@ -51,8 +50,6 @@ public class fcatch { FCatch catcher = new FCatch(); - protected static final Logger logger = Logger.getLogger("frysk"); - private boolean requestedPid = false; private static StringBuffer argString; diff --git a/frysk-core/frysk/bindir/fcore.java b/frysk-core/frysk/bindir/fcore.java index dc81c90..a5d8862 100644 --- a/frysk-core/frysk/bindir/fcore.java +++ b/frysk-core/frysk/bindir/fcore.java @@ -39,7 +39,6 @@ package frysk.bindir; -import java.util.logging.Logger; import frysk.event.ProcEvent; import frysk.proc.Proc; @@ -52,14 +51,14 @@ import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; -public class fcore -{ +public class fcore { + private static String matchingRegEx = ""; + private static String filename = "core"; private static boolean writeAllMaps = false; private static int mapOptionCount = 0; - protected static final Logger logger = Logger.getLogger("frysk"); /** * Entry function. Starts the fcore dump process. Belongs in bindir/fcore. But diff --git a/frysk-core/frysk/bindir/fstack.java b/frysk-core/frysk/bindir/fstack.java index d439236..bbf949e 100644 --- a/frysk-core/frysk/bindir/fstack.java +++ b/frysk-core/frysk/bindir/fstack.java @@ -41,8 +41,6 @@ package frysk.bindir; import java.io.PrintWriter; import java.util.StringTokenizer; -import java.util.logging.Logger; - import frysk.debuginfo.PrintStackOptions; import frysk.event.Event; import frysk.event.RequestStopEvent; @@ -55,14 +53,12 @@ import frysk.util.StacktraceAction; import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; -public final class fstack -{ +public final class fstack { + private static StacktraceAction stacker; private static CommandlineParser parser; - protected static final Logger logger = Logger.getLogger("frysk"); - private static PrintWriter printWriter = new PrintWriter(System.out); static PrintStackOptions options = new PrintStackOptions(); diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog index f8e2f9b..289d3cf 100644 --- a/frysk-core/frysk/debuginfo/ChangeLog +++ b/frysk-core/frysk/debuginfo/ChangeLog @@ -1,3 +1,9 @@ +2008-02-28 Andrew Cagney + + * gen-type-expect-tests.py: Ditto. + * TestFrameDebugInfo.java: Delete unused logger. + * TestLocationExpression.java: Ditto. + 2008-02-27 Sami Wagiaalla * PrintStackOptions.java: New. diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java index 11b906b..fbd9f36 100644 --- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java +++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java @@ -43,10 +43,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Iterator; import java.util.LinkedList; -import java.util.logging.Logger; - import javax.naming.NameNotFoundException; - import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; import lib.dwfl.Dwfl; @@ -63,11 +60,7 @@ import frysk.testbed.DaemonBlockedAtSignal; import frysk.testbed.TestLib; import frysk.value.Variable; -public class TestFrameDebugInfo - extends TestLib -{ - /// I am not looking at what you are typing. I just have to see ya type - Logger logger = Logger.getLogger("frysk"); +public class TestFrameDebugInfo extends TestLib { public void testFrameDebugInfoStackTrace() { diff --git a/frysk-core/frysk/debuginfo/TestLocationExpression.java b/frysk-core/frysk/debuginfo/TestLocationExpression.java index fab2328..d1e1a75 100644 --- a/frysk-core/frysk/debuginfo/TestLocationExpression.java +++ b/frysk-core/frysk/debuginfo/TestLocationExpression.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 @@ -39,7 +39,6 @@ package frysk.debuginfo; -import java.util.logging.Logger; import java.util.ArrayList; import java.util.List; import java.util.Iterator; @@ -54,10 +53,7 @@ import lib.dwfl.DwOp; import lib.dwfl.DwarfDie; import lib.dwfl.DwarfOp; -public class TestLocationExpression - extends TestLib -{ - Logger logger = Logger.getLogger("frysk"); +public class TestLocationExpression extends TestLib { /* * Test for DW_OP_breg3/DW_OP_breg5 and DW_OP_dup diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py index 5daa7a5..9a5917c 100644 --- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py +++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py @@ -2,7 +2,7 @@ # 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 @@ -56,7 +56,6 @@ class j: package frysk.debuginfo; import java.io.*; -import java.util.logging.Logger; import lib.dwfl.DwarfDie; import lib.dwfl.Dwfl; import lib.dwfl.DwflDieBias; @@ -134,12 +133,6 @@ public class %s extends TestLib { } ''') - print(''' - - Logger logger = Logger.getLogger("frysk"); - -''') - def start_test(self, executable, name): print(" public void test_%s () {" % (name)) tokens = os.path.splitext(os.path.abspath(executable)) diff --git a/frysk-core/frysk/event/ChangeLog b/frysk-core/frysk/event/ChangeLog index 073394e..60a7513 100644 --- a/frysk-core/frysk/event/ChangeLog +++ b/frysk-core/frysk/event/ChangeLog @@ -1,3 +1,10 @@ +2008-02-28 Andrew Cagney + + * EventLoop.java: Use frysk.rsl. + * TimerEvent.java: Ditto. + * WaitEventLoop.java: Ditto. + * PollEventLoop.java: Ditto. + 2008-02-26 Andrew Cagney * ProcEvent.java (executeDead(Proc)): Replace executeDead(Proc,File). diff --git a/frysk-core/frysk/event/EventLoop.java b/frysk-core/frysk/event/EventLoop.java index 22630c0..e70573a 100644 --- a/frysk-core/frysk/event/EventLoop.java +++ b/frysk-core/frysk/event/EventLoop.java @@ -49,17 +49,14 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import java.util.logging.Level; -import java.util.logging.Logger; +import frysk.rsl.Log; /** * Implements an event loop. */ -public abstract class EventLoop - extends Thread -{ - protected static Logger logger = Logger.getLogger("frysk"); +public abstract class EventLoop extends Thread { + private static final Log fine = Log.fine(EventLoop.class); /** * The EventLoop uses Signal.IO to wake up, or unblock, the @@ -71,7 +68,7 @@ public abstract class EventLoop // Signal.IO is used to wake up a blocked event loop when an // asynchronous event arrives. signalAdd(Signal.IO); - logger.log (Level.FINE, "{0} new\n", this); + fine.log(this, "new"); } @@ -147,7 +144,7 @@ public abstract class EventLoop */ private synchronized void wakeupIfBlocked () { - logger.log (Level.FINEST, "{0} wakeupIfBlocked\n", this); + fine.log(this, "wakeupIfBlocked"); if (isGoingToBlock) { wakeupBlockedEventLoop(); isGoingToBlock = false; @@ -167,7 +164,7 @@ public abstract class EventLoop */ public synchronized void add (TimerEvent t) { - logger.log (Level.FINEST, "{0} add TimerEvent\n", this); + fine.log(this, "add TimerEvent"); timerEvents.put (t, t); wakeupIfBlocked (); } @@ -176,7 +173,7 @@ public abstract class EventLoop */ public synchronized void remove (TimerEvent t) { - logger.log (Level.FINEST, "{0} remove TimerEvent\n", this); + fine.log(this, "remove TimerEvent"); timerEvents.remove (t); pendingEvents.remove (t); } @@ -209,7 +206,7 @@ public abstract class EventLoop */ private synchronized void checkForTimerEvents () { - logger.log (Level.FINEST, "{0} checkForTimerEvents\n", this); + fine.log(this, "checkForTimerEvents"); long time = java.lang.System.currentTimeMillis (); while (!timerEvents.isEmpty ()) { TimerEvent timer = (TimerEvent) timerEvents.firstKey (); @@ -236,8 +233,7 @@ public abstract class EventLoop */ public synchronized void add (SignalEvent signalEvent) { - logger.log (Level.FINEST, "{0} add SignalEvent {1}\n", - new Object[] { this, signalEvent }); + fine.log(this, "add SignalEvent", signalEvent); Object old = signalHandlers.put (signalEvent.getSignal(), signalEvent); if (old == null) // New signal, tell Poll. @@ -250,7 +246,7 @@ public abstract class EventLoop */ public synchronized void remove (SignalEvent signalEvent) { - logger.log (Level.FINE, "{0} remove SignalEvent\n", this); + fine.log(this, "remove SignalEvent", signalEvent); signalHandlers.remove (signalEvent.getSignal()); // XXX: Poll.SignalSet.remove (sig.signal); } @@ -261,7 +257,7 @@ public abstract class EventLoop * longer going to block. */ protected synchronized void processSignal(Signal sig) { - logger.log (Level.FINEST, "{0} processSignal Sig\n", this); + fine.log(this, "processSignal", sig); SignalEvent handler = (SignalEvent) signalHandlers.get (sig); if (handler != null) pendingEvents.add (handler); @@ -279,7 +275,7 @@ public abstract class EventLoop */ public synchronized void add (Event e) { - logger.log (Level.FINEST, "{0} add Event\n {1}", new Object[] {this, e}); + fine.log(this, "add Event", e); pendingEvents.add (e); wakeupIfBlocked (); } @@ -288,7 +284,7 @@ public abstract class EventLoop */ public synchronized void remove (Event e) { - logger.log (Level.FINE, "{0} remove Event\n", this); + fine.log(this, "remove Event", e); pendingEvents.remove (e); } /** @@ -334,14 +330,14 @@ public abstract class EventLoop */ private synchronized Event remove () { - logger.log (Level.FINEST, "{0} remove\n", this); + fine.log(this, "remove ..."); if (pendingEvents.isEmpty ()) { isGoingToBlock = true; return null; } else { Event removed = (Event) pendingEvents.remove (0); - logger.log (Level.FINEST, "... return {0}\n", removed); + fine.log(this, "remove ... return", removed); return removed; } } @@ -358,15 +354,14 @@ public abstract class EventLoop */ private void runEventLoop (boolean pendingOnly) { - logger.log (Level.FINEST, "{0} runEventLoop\n", this); + fine.log(this, "runEventLoop pendingOnly", pendingOnly); try { // Assert: isGoingToBlock == false stop = pendingOnly; while (true) { // Drain any pending events. for (Event e = remove (); e != null; e = remove ()) { - logger.logp(Level.FINEST, "EventLoop", "runEventLoop", - "executing {0}\n", e); + fine.log(this, "runEventLoop executing", e); e.execute (); } // {@link #remove()} will have set {@link @@ -392,7 +387,7 @@ public abstract class EventLoop */ public void requestStop () { - logger.log (Level.FINEST, "{0} requestStop\n", this); + fine.log(this, "requestStop"); stop = true; wakeupIfBlocked (); } @@ -410,7 +405,7 @@ public abstract class EventLoop */ public final void runPending () { - logger.log (Level.FINE, "{0} runPending\n", this); + fine.log(this, "runPending"); updateTid(); runEventLoop (true); } @@ -430,7 +425,7 @@ public abstract class EventLoop */ public final boolean runPolling (long timeout) { - logger.log (Level.FINE, "{0} runPolling long\n", this); + fine.log(this, "runPolling timeout", timeout); updateTid(); class Timeout extends TimerEvent @@ -438,12 +433,12 @@ public abstract class EventLoop Timeout (long timeout) { super (timeout); - logger.log (Level.FINE, "{0} timeout\n", this); + fine.log(this, "timeout"); } boolean expired = false; public void execute () { - logger.log (Level.FINE, "{0} execute\n", this); + fine.log(this, "execute"); expired = true; requestStop (); } @@ -476,7 +471,7 @@ public abstract class EventLoop public final void run () { - logger.log (Level.FINE, "{0} run\n", this); + fine.log(this, "run"); // Finish initializing, and then ack that the thread is // running. synchronized (running) { @@ -492,7 +487,7 @@ public abstract class EventLoop */ public synchronized void start() { - logger.log (Level.FINE, "{0} start\n", this); + fine.log(this, "start"); synchronized (running) { setDaemon(true); super.start(); diff --git a/frysk-core/frysk/event/PollEventLoop.java b/frysk-core/frysk/event/PollEventLoop.java index 91e06bb..8b841f9 100644 --- a/frysk-core/frysk/event/PollEventLoop.java +++ b/frysk-core/frysk/event/PollEventLoop.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 @@ -44,15 +44,15 @@ import frysk.sys.PollBuilder; import frysk.sys.Signal; import frysk.sys.Wait; import frysk.sys.WaitBuilder; -import java.util.logging.Level; +import frysk.rsl.Log; /** * Implements an event loop. */ -class PollEventLoop - extends EventLoop -{ +class PollEventLoop extends EventLoop { + private static final Log fine = Log.fine(PollEventLoop.class); + protected void signalEmpty() { Poll.empty (); @@ -66,7 +66,7 @@ class PollEventLoop */ public synchronized void add (PollEvent fd) { - logger.log (Level.FINE, "{0} add PollEvent\n", this); + fine.log(this, "add PollEvent", fd); throw new RuntimeException ("not implemented"); } @@ -90,11 +90,11 @@ class PollEventLoop { super(Signal.CHLD); this.waitBuilder = waitBuilder; - logger.log(Level.FINE, "{0} PollWaitOnSigChld\n", this); + fine.log(this, "PollWaitOnSigChld"); } public final void execute () { - logger.log(Level.FINE, "{0} execute\n", this); + fine.log(this, "execute"); Wait.waitAllNoHang(waitBuilder); } } @@ -108,7 +108,7 @@ class PollEventLoop return ("{" + super.toString () + "}"); } public void signal(Signal sig) { - logger.log (Level.FINEST, "{0} PollBuilder.signal Sig\n", this); + fine.log(this, "PollBuilder.signal Sig", sig); processSignal (sig); } hooks/post-receive -- frysk system monitor/debugger