August 2008 - logback-dev - mailman3.qos.ch

svn commit: r1739 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 07 Aug '08

07 Aug '08

Author: ceki Date: Thu Aug 7 15:19:06 2008 New Revision: 1739 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Log: - clean up Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Thu Aug 7 15:19:06 2008 @@ -11,7 +11,6 @@ List<Status> list = new ArrayList<Status>(); public void addStatusEvent(Status status) { - System.out.println("xxxxx"+status); list.add(status); }

1 0

svn commit: r1738 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 07 Aug '08

07 Aug '08

Author: ceki Date: Thu Aug 7 10:26:22 2008 New Revision: 1738 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java Log: - removing superfluous synchronous keyword Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java Thu Aug 7 10:26:22 2008 @@ -63,7 +63,7 @@ } } - public synchronized List<Status> getCopyOfStatusList() { + public List<Status> getCopyOfStatusList() { synchronized (statusList) { return new ArrayList<Status>(statusList); }

1 0

Re: [logback-dev] svn commit: r1733 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/jmx logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/status logback-core/src/main/java/ch/qos/lo
by Jörn Huxhorn 07 Aug '08

07 Aug '08

On Wed, Aug 6, 2008 at 10:00 PM, Ceki Gulcu <listid(a)qos.ch> wrote: > > > Joern Huxhorn wrote: > > Hi Ceki, > > some comments on the latest commit: > > > statusList should be final if it's later used for synchronization. At > > As statusList, statusListenerList should be final. > > OK. > >> > >> - public Iterator<Status> iterator() { > >> - return statusList.iterator(); > >> + public synchronized List<Status> getCopyOfStatusList() { > >> + synchronized (statusList) { > >> + return new ArrayList<Status>(statusList); > >> + } > >> } > >> > > I guess the method shouldn't be synchronized anymore since > > synchronization is done on statusList. > > From what I can read from the ArrayList constructor taking a collection, > copying of the collection passed as parameter is not synchronized. > Moreover, the > mutex used by the SyncronizedArrayList is the object itself (the > SyncronizedArrayList instance), so synchronized(statusList){...} is > necessary. > Yes, definitely @ synchronized(statusList). I just think that public synchronized List<Status> getCopyOfStatusList() should be public List<Status> getCopyOfStatusList() so there is no risk of deadlock. I haven't checked if there *is* a risk of deadlock but there *could* be under certain circumstances, i.e. if there would be another place that synchronizes on statusList first and on Object later. I don't think there is such a piece of code but it's generally a good idea to not synchronize/holding two locks if not absolutely necessary. It's also a bit faster. > >> + public void remove(StatusListener listener) { > >> + statusListenerList.add(listener); > >> + } > >> > > Should be statusListenerList.remove(listener); > > Four eyes are better than two. thank you! > Your welcome, Joern.

2 1

svn commit: r1737 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 06 Aug '08

06 Aug '08

Author: ceki Date: Wed Aug 6 22:47:08 2008 New Revision: 1737 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Log: minor change Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Wed Aug 6 22:47:08 2008 @@ -14,9 +14,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; @@ -128,12 +126,4 @@ Integer i = (Integer) context.getObject(TouchAction.KEY); assertEquals(1, i.intValue()); } - - public static Test suite() { - TestSuite suite = new TestSuite(); - //suite.addTest(new SkippingInInterpreterTest("testSkipSiblings2")); - suite.addTestSuite(SkippingInInterpreterTest.class); - return suite; - } - }

1 0

svn commit: r1736 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core: . joran joran/action
by noreply.ceki＠qos.ch 06 Aug '08

06 Aug '08

Author: ceki Date: Wed Aug 6 22:14:52 2008 New Revision: 1736 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java Log: Relates to LBCLASSIC-59 LBCLASSIC-58 ongoing work on StatusListner support Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java Wed Aug 6 22:14:52 2008 @@ -27,13 +27,13 @@ // reading SynchronizedCollection the mutex is the returned // synchronized list, we make use of this fact in getCopyOfStatusList - List<Status> statusList = Collections + final List<Status> statusList = Collections .synchronizedList(new ArrayList<Status>()); int level = Status.INFO; // reading SynchronizedCollection the mutex is the returned // synchronized list, we make use of this fact in getCopyOfStatusListnerList - List<StatusListener> statusListenerList = Collections + final List<StatusListener> statusListenerList = Collections .synchronizedList(new ArrayList<StatusListener>()); /** @@ -52,6 +52,15 @@ level = newStatus.getLevel(); } statusList.add(newStatus); + fireStatusAddEvent(newStatus); + } + + private void fireStatusAddEvent(Status status) { + synchronized (statusListenerList) { + for(StatusListener sl : statusListenerList) { + sl.addStatusEvent(status); + } + } } public synchronized List<Status> getCopyOfStatusList() { @@ -73,7 +82,7 @@ } public void remove(StatusListener listener) { - statusListenerList.add(listener); + statusListenerList.remove(listener); } public List<StatusListener> getCopyOfStatusListenerList() { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Wed Aug 6 22:14:52 2008 @@ -17,12 +17,13 @@ import ch.qos.logback.core.joran.action.ActionConst; import ch.qos.logback.core.joran.action.AppenderAction; import ch.qos.logback.core.joran.action.AppenderRefAction; +import ch.qos.logback.core.joran.action.ContextPropertyAction; import ch.qos.logback.core.joran.action.ConversionRuleAction; -import ch.qos.logback.core.joran.action.NestedComplexPropertyIA; import ch.qos.logback.core.joran.action.NestedBasicPropertyIA; +import ch.qos.logback.core.joran.action.NestedComplexPropertyIA; import ch.qos.logback.core.joran.action.NewRuleAction; import ch.qos.logback.core.joran.action.ParamAction; -import ch.qos.logback.core.joran.action.ContextPropertyAction; +import ch.qos.logback.core.joran.action.StatusListenerAction; import ch.qos.logback.core.joran.action.SubstitutionPropertyAction; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; @@ -58,6 +59,9 @@ rs.addRule(new Pattern("configuration/conversionRule"), new ConversionRuleAction()); + rs.addRule(new Pattern("configuration/statusListener"), + new StatusListenerAction()); + rs.addRule(new Pattern("configuration/appender"), new AppenderAction()); rs.addRule(new Pattern("configuration/appender/appender-ref"), new AppenderRefAction()); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java Wed Aug 6 22:14:52 2008 @@ -34,12 +34,20 @@ @SuppressWarnings("unchecked") public void begin( InterpretationContext ec, String localName, Attributes attributes) throws ActionException { - String className = attributes.getValue(CLASS_ATTRIBUTE); - // We are just beginning, reset variables appender = null; inError = false; + String className = attributes.getValue(CLASS_ATTRIBUTE); + if(OptionHelper.isEmpty(className)) { + addError( + "Missing class name for appender. Near [" + + localName + "] line " + getLineNumber(ec)); + inError = true; + return; + } + + try { addInfo("About to instantiate appender of type ["+className+"]"); @@ -66,7 +74,6 @@ // add the appender just created to the appender bag. appenderBag.put(appenderName, appender); - //getLogger().debug("Pushing appender on to the object stack."); ec.pushObject(appender); } catch (Exception oops) { inError = true; Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/StatusListenerAction.java Wed Aug 6 22:14:52 2008 @@ -0,0 +1,72 @@ +/** + * LOGBack: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.core.joran.action; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.spi.LifeCycle; +import ch.qos.logback.core.status.StatusListener; +import ch.qos.logback.core.util.OptionHelper; + + +public class StatusListenerAction extends Action { + + + boolean inError = false; + StatusListener statusListener = null; + + public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { + inError = false; + String className = attributes.getValue(CLASS_ATTRIBUTE); + if(OptionHelper.isEmpty(className)) { + addError( + "Missing class name for statusListener. Near [" + + name + "] line " + getLineNumber(ec)); + inError = true; + return; + } + + try { + statusListener = (StatusListener) OptionHelper.instantiateByClassName( + className, StatusListener.class, context); + ec.getContext().getStatusManager().add(statusListener); + ec.pushObject(statusListener); + } catch (Exception e) { + inError = true; + addError( + "Could not create an StatusListener of type ["+className+"].", e); + throw new ActionException(ActionException.SKIP_CHILDREN, e); + } + + } + + public void finish(InterpretationContext ec) { + } + + public void end(InterpretationContext ec, String e) { + if (inError) { + return; + } + if (statusListener instanceof LifeCycle) { + ((LifeCycle) statusListener).start(); + } + Object o = ec.peekObject(); + if (o != statusListener) { + addWarn( + "The object at the of the stack is not the statusListener pushed earlier."); + } else { + ec.popObject(); + } + } +}

1 0

svn commit: r1735 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action
by noreply.ceki＠qos.ch 06 Aug '08

06 Aug '08

Author: ceki Date: Wed Aug 6 22:14:03 2008 New Revision: 1735 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LayoutAction.java Log: - removing commented out code Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LayoutAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LayoutAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LayoutAction.java Wed Aug 6 22:14:03 2008 @@ -5,9 +5,4 @@ public class LayoutAction extends AbstractLayoutAction<LoggingEvent> { - -// protected boolean isOfCorrectType(Layout layout) { -// return (layout instanceof ClassicLayout); -// } - }

1 0

svn commit: r1734 - in logback/trunk/logback-classic/src/test: input/joran java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 06 Aug '08

06 Aug '08

Author: ceki Date: Wed Aug 6 22:13:23 2008 New Revision: 1734 Added: logback/trunk/logback-classic/src/test/input/joran/statusListener.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log: Relates to LBCLASSIC-59 LBCLASSIC-58 test case for StatusListner support Added: logback/trunk/logback-classic/src/test/input/joran/statusListener.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/statusListener.xml Wed Aug 6 22:13:23 2008 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="false"> + + + <statusListener class="ch.qos.logback.classic.joran.TrivialStatusListener"/> + + <appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/> + <logger name="ch.qos.logback.classic.joran"> + <level value="INFO" /> + </logger> + + <root> + <level value="DEBUG" /> + <appender-ref ref="LIST" /> + </root> + +</configuration> + \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Wed Aug 6 22:13:23 2008 @@ -67,6 +67,15 @@ assertEquals(0, listAppender.list.size()); } + public void testStatusListener() throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + LoggerContext loggerContext = new LoggerContext(); + jc.setContext(loggerContext); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/statusListener.xml"); + + StatusPrinter.print(loggerContext); + } + public void testEval() throws JoranException { JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); @@ -199,8 +208,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(JoranConfiguratorTest.class); - //suite.addTest(new JoranConfiguratorTest("testEvaluatorFilter")); + //suite.addTestSuite(JoranConfiguratorTest.class); + suite.addTest(new JoranConfiguratorTest("testStatusListener")); return suite; } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/TrivialStatusListener.java Wed Aug 6 22:13:23 2008 @@ -0,0 +1,18 @@ +package ch.qos.logback.classic.joran; + +import java.util.ArrayList; +import java.util.List; + +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusListener; + +public class TrivialStatusListener implements StatusListener { + + List<Status> list = new ArrayList<Status>(); + + public void addStatusEvent(Status status) { + System.out.println("xxxxx"+status); + list.add(status); + } + +}

1 0

svn commit: r1733 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/jmx logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/status logback-core/src/main/java/ch/qos/logback/core/util logback-core/src/test/java/ch/qos/logback/core/joran/action logback-core/src/test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 06 Aug '08

06 Aug '08

Author: ceki Date: Wed Aug 6 18:51:10 2008 New Revision: 1733 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusListener.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusManager.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Log: Relates to LBCLASSIC-51 LBCLASSIC-59 LBCLASSIC-58 Fixed synchronization problems. The iterator() method has been removed from the StatusManager interface. It has been replaced by getCopyOfStatusList which, as the name indicates, returns a copy of the statusList contained in the StatusManager instance. This avoids concurrency problems encountered when the developer forget to synchronize on the statusManager before iterating on its status list. Added a listener interface to status manager as suggested in LBCLASSIC-59 by Anton Tagunov. Support for status listeners in Joran is still missing. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java Wed Aug 6 18:51:10 2008 @@ -143,7 +143,7 @@ public List<String> getStatuses() { List<String> list = new ArrayList<String>(); - Iterator<Status> it = context.getStatusManager().iterator(); + Iterator<Status> it = context.getStatusManager().getCopyOfStatusList().iterator(); while(it.hasNext()) { list.add(it.next().toString()); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java Wed Aug 6 18:51:10 2008 @@ -10,25 +10,39 @@ package ch.qos.logback.core; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Collections; import java.util.List; import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusListener; import ch.qos.logback.core.status.StatusManager; public class BasicStatusManager implements StatusManager { public static final int MAX_COUNT = 200; + // This method is synchronized on the instance. + // Code int count = 0; - List<Status> statusList = new ArrayList<Status>(); + + // reading SynchronizedCollection the mutex is the returned + // synchronized list, we make use of this fact in getCopyOfStatusList + List<Status> statusList = Collections + .synchronizedList(new ArrayList<Status>()); int level = Status.INFO; - // This method is synchronized on the instance. - // Code iterating on this.iterator is expected to - // also synchronize on this (the BasicStatusManager instance) - public synchronized void add(Status newStatus) { - // System.out.println(newStatus); + // reading SynchronizedCollection the mutex is the returned + // synchronized list, we make use of this fact in getCopyOfStatusListnerList + List<StatusListener> statusListenerList = Collections + .synchronizedList(new ArrayList<StatusListener>()); + + /** + * Add a new status object. + * + * @param Status + * the status message to add + */ + public void add(Status newStatus) { if (count > MAX_COUNT) { return; } @@ -40,8 +54,10 @@ statusList.add(newStatus); } - public Iterator<Status> iterator() { - return statusList.iterator(); + public synchronized List<Status> getCopyOfStatusList() { + synchronized (statusList) { + return new ArrayList<Status>(statusList); + } } public int getLevel() { @@ -52,4 +68,18 @@ return count; } + public void add(StatusListener listener) { + statusListenerList.add(listener); + } + + public void remove(StatusListener listener) { + statusListenerList.add(listener); + } + + public List<StatusListener> getCopyOfStatusListenerList() { + synchronized (statusListenerList) { + return new ArrayList<StatusListener>(statusListenerList); + } + } + } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusListener.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusListener.java Wed Aug 6 18:51:10 2008 @@ -0,0 +1,5 @@ +package ch.qos.logback.core.status; + +public interface StatusListener { + void addStatusEvent(Status status); +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusManager.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusManager.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/StatusManager.java Wed Aug 6 18:51:10 2008 @@ -9,16 +9,52 @@ */ package ch.qos.logback.core.status; -import java.util.Iterator; - +import java.util.List; +/** + * Internal error messages (statii) are managed by instances of this interface. + * + * @author Ceki Gulcu + */ public interface StatusManager { + + /** + * Add a new status message. + * + * @param status + */ public void add(Status status); - public Iterator<Status> iterator(); + + /** + * Obtain a copy of the status list maintained by this StatusManager. + * + * @return + */ + public List<Status> getCopyOfStatusList(); + + /** + * Return the highest level of all the statii. + * + * @return + */ public int getLevel(); + /** - * Return the number of entries. + * Return the number of status entries. + * * @return */ public int getCount(); + + public void add(StatusListener listener); + + public void remove(StatusListener listener); + + /** + * Obtain a copy of the status listener list maintained by this StatusManager + * + * @return + */ + public List<StatusListener> getCopyOfStatusListenerList(); + } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Wed Aug 6 18:51:10 2008 @@ -55,13 +55,10 @@ } public static void buildStr(StringBuilder sb, StatusManager sm) { - - synchronized (sm) { - Iterator it = sm.iterator(); - while (it.hasNext()) { - Status s = (Status) it.next(); - buildStr(sb, "", s); - } + Iterator it = sm.getCopyOfStatusList().iterator(); + while (it.hasNext()) { + Status s = (Status) it.next(); + buildStr(sb, "", s); } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java Wed Aug 6 18:51:10 2008 @@ -83,13 +83,13 @@ } private boolean checkError() { - Iterator it = context.getStatusManager().iterator(); + Iterator it = context.getStatusManager().getCopyOfStatusList().iterator(); ErrorStatus es = (ErrorStatus)it.next(); return PropertyAction.INVALID_ATTRIBUTES.equals(es.getMessage()); } private boolean checkFileErrors() { - Iterator it = context.getStatusManager().iterator(); + Iterator it = context.getStatusManager().getCopyOfStatusList().iterator(); ErrorStatus es1 = (ErrorStatus)it.next(); boolean result1 = "Could not read properties file [toto].".equals(es1.getMessage()); ErrorStatus es2 = (ErrorStatus)it.next(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Wed Aug 6 18:51:10 2008 @@ -16,42 +16,39 @@ import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; - public class StatusChecker { StatusManager sm; - + public StatusChecker(StatusManager sm) { this.sm = sm; } - + public boolean containsMatch(String regex) { - + Pattern p = Pattern.compile(regex); - - - Iterator stati = sm.iterator(); - while(stati.hasNext()) { + + Iterator stati = sm.getCopyOfStatusList().iterator(); + while (stati.hasNext()) { Status status = (Status) stati.next(); String msg = status.getMessage(); Matcher matcher = p.matcher(msg); - if(matcher.lookingAt()) { + if (matcher.lookingAt()) { return true; } else { - System.out.println("no match:"+msg); - System.out.println("regex :"+regex); + System.out.println("no match:" + msg); + System.out.println("regex :" + regex); } } return false; } - - + public boolean containsException(Class exceptionType) { - Iterator stati = sm.iterator(); - while(stati.hasNext()) { + Iterator stati = sm.getCopyOfStatusList().iterator(); + while (stati.hasNext()) { Status status = (Status) stati.next(); Throwable t = status.getThrowable(); - if(t != null && t.getClass().getName().equals(exceptionType.getName())) { + if (t != null && t.getClass().getName().equals(exceptionType.getName())) { return true; } }

3 2

svn commit: r1732 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 04 Aug '08

04 Aug '08

Author: ceki Date: Mon Aug 4 23:27:46 2008 New Revision: 1732 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java Log: more debug info Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java Mon Aug 4 23:27:46 2008 @@ -83,6 +83,7 @@ double ajustedDuration = adjustExpectedDuration(referenceDuraion, referenceBIPS); + System.out.println("raw="+currentDuration); if (currentDuration > ajustedDuration * SLACK) { throw new AssertionFailedError(currentDuration + " exceeded expected " + ajustedDuration + " (adjusted), " + referenceDuraion + " (raw)");

1 0

svn commit: r1731 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util
by noreply.ceki＠qos.ch 04 Aug '08

04 Aug '08

Author: ceki Date: Mon Aug 4 23:23:37 2008 New Revision: 1731 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java Log: BogoPerf outputs data for debugging purposes Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/BogoPerf.java Mon Aug 4 23:23:37 2008 @@ -15,17 +15,17 @@ private static int SLACK = 2; static { - System.out.println("Host runs at "+INITIAL_BOGO_IPS + " BIPS"); + System.out.println("Host runs at " + INITIAL_BOGO_IPS + " BIPS"); } - + /** * Compute bogoInstructions per second * * on a 3.2 Ghz Pentium D CPU (around 2007), we obtain about 10'000 bogoIPS. * * @param N - * number of bogoInstructions to average over in order to - * compute the result + * number of bogoInstructions to average over in order to compute the + * result * @return bogo Instructions Per Second */ private static double computeBogoIPS(int N) { @@ -70,8 +70,8 @@ } /** - * Assertion used for values that decrease with faster CPUs, - * typically the time (duration) needed to perform a task. + * Assertion used for values that decrease with faster CPUs, typically + * the time (duration) needed to perform a task. * * @param currentDuration * @param referenceDuraion @@ -79,17 +79,28 @@ * @throws AssertionFailedError */ public static void assertDuration(double currentDuration, - long referenceDuraion, double referenceBIPS) - throws AssertionFailedError { + long referenceDuraion, double referenceBIPS) throws AssertionFailedError { double ajustedDuration = adjustExpectedDuration(referenceDuraion, referenceBIPS); + if (currentDuration > ajustedDuration * SLACK) { throw new AssertionFailedError(currentDuration + " exceeded expected " + ajustedDuration + " (adjusted), " + referenceDuraion + " (raw)"); } } + + private static double adjustExpectedDuration(long referenceDuration, + double referenceBIPS) { + double currentBIPS = currentBIPS(); + double adjusted = referenceDuration * (referenceBIPS / currentBIPS); + System.out.println("currentBIPS=" + currentBIPS + ", referenceBIPS=" + + referenceBIPS + ", adjustedDur=" + adjusted + ", referenceDur=" + + referenceDuration); + return adjusted; + } + /** - * Assertion used for values that increase with faster CPUs, typically + * Assertion used for values that increase with faster CPUs, typically * the number of operations accomplished per unit of time. * * @param currentPerformance @@ -102,21 +113,16 @@ throws AssertionFailedError { double ajustedPerf = adjustExpectedPerformance(referencePerformance, referenceBIPS); - if (currentPerformance*SLACK < ajustedPerf) { + if (currentPerformance * SLACK < ajustedPerf) { throw new AssertionFailedError(currentPerformance + " below expected " + ajustedPerf + " (adjusted), " + referencePerformance + " (raw)"); } } - + private static double adjustExpectedPerformance(long referenceDuration, double referenceBIPS) { double currentBIPS = currentBIPS(); - return referenceDuration * (currentBIPS/referenceBIPS); - } - - private static double adjustExpectedDuration(long referenceDuration, - double referenceBIPS) { - double currentBIPS = currentBIPS(); - return referenceDuration * (referenceBIPS / currentBIPS); + return referenceDuration * (currentBIPS / referenceBIPS); } + }

1 0