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

svn commit: r1682 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core test/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 03 May '08

03 May '08

Author: ceki Date: Sat May 3 21:45:44 2008 New Revision: 1682 Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/StopWatch.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Log: - stopwatch code moved to logback-classic

1 0

svn commit: r1681 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch
by noreply.ceki＠qos.ch 03 May '08

03 May '08

Author: ceki Date: Sat May 3 21:45:11 2008 New Revision: 1681 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/DurationUnit.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Profiler.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/StopWatch.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Util.java Log: - ongoing work on StopWatch and poor man's profiler functionality Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/DurationUnit.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/DurationUnit.java Sat May 3 21:45:11 2008 @@ -0,0 +1,5 @@ +package ch.qos.logback.classic.stopwatch; + +public enum DurationUnit { + NANOSECOND, MICROSECOND, MILLISSECOND, SECOND; +} \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Profiler.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Profiler.java Sat May 3 21:45:11 2008 @@ -0,0 +1,93 @@ +package ch.qos.logback.classic.stopwatch; + +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; + +import ch.qos.logback.core.pattern.SpacePadder; + +/* + + Profiler [BAS] + |-- elapsed time [doX] 0 milliseconds. + |-- elapsed time [doYYYYY] 56 milliseconds. + |--+ Profiler Y + |-- elapsed time [doZ] 21 milliseconds. + |-- elapsed time [doZ] 21 milliseconds. + |-- Total elapsed time [Y] 78 milliseconds. + |-- elapsed time [doZ] 21 milliseconds. + |-- Total elapsed time [BAS] 78 milliseconds. +*/ + +public class Profiler { + + final static int MIN_SW_NAME_LENGTH = 10; + final static int MIN_SW_ELAPSED_TIME_NUMBER_LENGTH = 5; + + final String name; + final StopWatch globalStopWatch; + + List<StopWatch> stopwatchList = new ArrayList<StopWatch>(); + + public Profiler(String name) { + this.name = name; + this.globalStopWatch = new StopWatch(name); + } + + public void start(String name) { + stopLastStopWatch(); + StopWatch newSW = new StopWatch(name); + stopwatchList.add(newSW); + } + + StopWatch getLastStopWatch() { + if (stopwatchList.size() > 0) { + return stopwatchList.get(stopwatchList.size() - 1); + } else { + return null; + } + } + + void stopLastStopWatch() { + StopWatch last = getLastStopWatch(); + if (last != null) { + last.stop(); + } + } + + public void stop() { + stopLastStopWatch(); + globalStopWatch.stop(); + DurationUnit du = Util.selectDurationUnitForDisplay(globalStopWatch); + for (StopWatch sw : stopwatchList) { + printChildStopWatch(System.out, sw, du); + } + printGlobalSW(System.out, globalStopWatch, du); + } + + static void printChildStopWatch(PrintStream ps, StopWatch sw, DurationUnit du) { + StringBuffer buf = new StringBuffer(); + buf.append(" |-"); + buf.append(" elapsed time "); + SpacePadder.leftPad(buf, "["+sw.getName()+"]", MIN_SW_NAME_LENGTH); + buf.append(" "); + String timeStr = Util.durationInDunrationUnitsAsStr(sw.getResultInNanos(), du); + SpacePadder.leftPad(buf, timeStr, MIN_SW_ELAPSED_TIME_NUMBER_LENGTH); + buf.append(" "); + Util.appendDurationUnitAsStr(buf, du); + ps.println(buf.toString()); + } + + private static void printGlobalSW(PrintStream ps, StopWatch sw, DurationUnit du) { + StringBuffer buf = new StringBuffer(); + buf.append(" +-"); + buf.append(" Total elapsed time "); + SpacePadder.leftPad(buf, "["+sw.getName()+"]", MIN_SW_NAME_LENGTH); + buf.append(" "); + String timeStr = Util.durationInDunrationUnitsAsStr(sw.getResultInNanos(), du); + SpacePadder.leftPad(buf, timeStr, MIN_SW_ELAPSED_TIME_NUMBER_LENGTH); + buf.append(" "); + Util.appendDurationUnitAsStr(buf, du); + ps.println(buf.toString()); + } + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/StopWatch.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/StopWatch.java Sat May 3 21:45:11 2008 @@ -0,0 +1,68 @@ +package ch.qos.logback.classic.stopwatch; + + +public class StopWatch { + + + enum Status { + STARTED, STOPPED; + } + + final String name; + final long startTime; + long stopTime; + Status status; + + public StopWatch(String name) { + this.name = name; + this.startTime = System.nanoTime(); + this.status = Status.STARTED; + } + + public String getName() { + return name; + } + + public StopWatch stop() { + if(status == Status.STOPPED) { + return this; + } + return stop(System.nanoTime()); + } + + public StopWatch stop(long stopTime) { + this.status = Status.STOPPED; + this.stopTime = stopTime; + return this; + } + + @Override + public String toString() { + StringBuffer buf = new StringBuffer(); + buf.append("StopWatch ["); + buf.append(name); + buf.append("] "); + + switch (status) { + case STARTED: + buf.append("STARTED"); + break; + case STOPPED: + buf.append("elapsed time: "); + buf.append(Util.nanosInDurationUnitAsStr(this)); + break; + default: + new IllegalStateException("Status " + status + " is not expected"); + } + return buf.toString(); + } + + public final long getResultInNanos() { + if (status == Status.STARTED) { + return 0; + } else { + return stopTime - startTime; + } + } + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Util.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopWatch/Util.java Sat May 3 21:45:11 2008 @@ -0,0 +1,81 @@ +package ch.qos.logback.classic.stopwatch; + +import java.text.DecimalFormat; + +class Util { + + static final long NANOS_IN_ONE_MICROSECOND = 1000; + static final long NANOS_IN_ONE_MILLISECOND = NANOS_IN_ONE_MICROSECOND * 1000; + static final long NANOS_IN_ONE_SECOND =NANOS_IN_ONE_MILLISECOND * 1000; + private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("0.000"); + + static DurationUnit selectDurationUnitForDisplay(StopWatch sw) { + return selectDurationUnitForDisplay(sw.getResultInNanos()); + } + + static DurationUnit selectDurationUnitForDisplay(long durationInNanos) { + if (durationInNanos < 10*NANOS_IN_ONE_MICROSECOND) { + return DurationUnit.NANOSECOND; + } else if (durationInNanos < 10*NANOS_IN_ONE_MILLISECOND) { + return DurationUnit.MICROSECOND; + } else if (durationInNanos < NANOS_IN_ONE_SECOND) { + return DurationUnit.MILLISSECOND; + } else { + return DurationUnit.SECOND; + } + } + + static public long convertToMicros(long nanos) { + return nanos / NANOS_IN_ONE_MICROSECOND; + } + + static public long convertToMillis(long nanos) { + return nanos / NANOS_IN_ONE_MILLISECOND; + } + + static public double convertToSeconds(long nanos) { + return ((double) nanos / NANOS_IN_ONE_SECOND); + } + + static String durationInDunrationUnitsAsStr(StringBuffer buf, StopWatch sw) { + DurationUnit du = selectDurationUnitForDisplay(sw); + return durationInDunrationUnitsAsStr(sw.getResultInNanos(), du); + } + + static String durationInDunrationUnitsAsStr(long nanos, DurationUnit durationUnit) { + StringBuffer buf = new StringBuffer(); + switch (durationUnit) { + case NANOSECOND: + buf.append(nanos); + break; + case MICROSECOND: + buf.append(convertToMicros(nanos)); + break; + case MILLISSECOND: + buf.append(convertToMillis(nanos)); + break; + case SECOND: + double seconds = convertToSeconds(nanos); + buf.append(DECIMAL_FORMAT.format(seconds)); + break; + } + return buf.toString(); + } + + static void appendDurationUnitAsStr(StringBuffer buf, DurationUnit durationUnit) { + switch (durationUnit) { + case NANOSECOND: + buf.append("nanoseconds."); + break; + case MICROSECOND: + buf.append("microseconds."); + break; + case MILLISSECOND: + buf.append("milliseconds."); + break; + case SECOND: + buf.append(" seconds."); + break; + } + } +}

1 0

svn commit: r1680 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . stopwatch
by noreply.ceki＠qos.ch 03 May '08

03 May '08

Author: ceki Date: Sat May 3 21:44:52 2008 New Revision: 1680 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ProfilerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java - copied, changed from r1666, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Log: - ongoing work on StopWatch and poor man's profiler functionality Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Sat May 3 21:44:52 2008 @@ -31,6 +31,7 @@ suite.addTest(ch.qos.logback.classic.db.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.spi.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.turbo.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.stopwatch.PackageTest.suite()); return suite; } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/PackageTest.java Sat May 3 21:44:52 2008 @@ -0,0 +1,23 @@ +/** + * Logback: the reliable, generic, 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.classic.stopwatch; + + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(StopWatchTest.class); + suite.addTest(new JUnit4TestAdapter(ProfilerTest.class)); + return suite; + } +} \ No newline at end of file Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ProfilerTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ProfilerTest.java Sat May 3 21:44:52 2008 @@ -0,0 +1,82 @@ +package ch.qos.logback.classic.stopwatch; + + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ch.qos.logback.core.BasicStatusManager; +import ch.qos.logback.core.status.ErrorStatus; +import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.util.StatusPrinter; + +public class ProfilerTest { + + Logger logger = LoggerFactory.getLogger(ProfilerTest.class); + + @Test + public void smoke() { + Profiler profiler = new Profiler("SMOKE"); + System.out.println("Hello"); + profiler.stop(); + } + + @Test + public void X() { + StatusManager sm = new BasicStatusManager(); + Status g = new InfoStatus("global", this); + Status g1 = new InfoStatus("g1", this); + Status g2 = new InfoStatus("g2", this); + Status g11 = new InfoStatus("g11", this); + Status g12 = new InfoStatus("g11", this); + Status g21 = new InfoStatus("g21", this); + + + g.add(g1); + g.add(g2); + + g1.add(g11); + g1.add(g12); + g2.add(g21); + + sm.add(g); + StatusPrinter.print(sm); + + } + @Test + public void testBasicProfiling() { + Profiler profiler = new Profiler("BAS"); + + profiler.start("doX"); + doX(1); + + profiler.start("doYYYYY"); + for(int i = 0; i < 5; i++) { + doY(i); + } + profiler.start("doZ"); + doZ(2); + profiler.stop(); + } + + void doX(int millis) { + delay(millis); + } + + void doY(int millis) { + delay(millis); + } + + void doZ(int millis) { + delay(millis); + } + + void delay(int millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + } + } +} Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java (from r1666, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/StopWatchTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java Sat May 3 21:44:52 2008 @@ -1,4 +1,4 @@ -package ch.qos.logback.core; +package ch.qos.logback.classic.stopwatch; import junit.framework.TestCase; @@ -26,42 +26,36 @@ } { - long d = sw.startTime+9*StopWatch.NANOS_IN_ONE_MICROSECOND; + long d = sw.startTime+9*Util.NANOS_IN_ONE_MICROSECOND; String s = sw.stop(d).toString(); assertTrue(s.endsWith("9000 nanoseconds.")); } { - long d = sw.startTime+11*StopWatch.NANOS_IN_ONE_MICROSECOND; + long d = sw.startTime+11*Util.NANOS_IN_ONE_MICROSECOND; String s = sw.stop(d).toString(); assertTrue(s.endsWith("11 microseconds.")); } { - long d = sw.startTime+9*StopWatch.NANOS_IN_ONE_MILLISECOND; + long d = sw.startTime+9*Util.NANOS_IN_ONE_MILLISECOND; String s = sw.stop(d).toString(); assertTrue(s.endsWith("9000 microseconds.")); } { - long d = sw.startTime+3*StopWatch.NANOS_IN_ONE_SECOND; + long d = sw.startTime+3*Util.NANOS_IN_ONE_SECOND; String s = sw.stop(d).toString(); - assertTrue(s.endsWith("3000 milliseconds.")); - } - { - long d = sw.startTime+6*StopWatch.NANOS_IN_ONE_SECOND; - String s = sw.stop(d).toString(); - assertTrue(s.endsWith("6.000 seconds.")); - } + System.out.println(s); + assertTrue(s.endsWith("3.000 seconds.")); + } } public void testSelectDurationUnitForDisplay() throws InterruptedException { - StopWatch sw = new StopWatch("testBasic"); - assertEquals(StopWatch.DurationUnit.NANOSECOND, sw.selectDurationUnitForDisplay(10)); - assertEquals(StopWatch.DurationUnit.NANOSECOND, sw.selectDurationUnitForDisplay(9*StopWatch.NANOS_IN_ONE_MICROSECOND)); - assertEquals(StopWatch.DurationUnit.MICROSECOND, sw.selectDurationUnitForDisplay(11*StopWatch.NANOS_IN_ONE_MICROSECOND)); - assertEquals(StopWatch.DurationUnit.MICROSECOND, sw.selectDurationUnitForDisplay(9*StopWatch.NANOS_IN_ONE_MILLISECOND)); - assertEquals(StopWatch.DurationUnit.MILLISSECOND, sw.selectDurationUnitForDisplay(11*StopWatch.NANOS_IN_ONE_MILLISECOND)); - assertEquals(StopWatch.DurationUnit.MILLISSECOND, sw.selectDurationUnitForDisplay(3*StopWatch.NANOS_IN_ONE_SECOND)); - assertEquals(StopWatch.DurationUnit.SECOND, sw.selectDurationUnitForDisplay(6*StopWatch.NANOS_IN_ONE_SECOND)); + assertEquals(DurationUnit.NANOSECOND, Util.selectDurationUnitForDisplay(10)); + assertEquals(DurationUnit.NANOSECOND, Util.selectDurationUnitForDisplay(9*Util.NANOS_IN_ONE_MICROSECOND)); + assertEquals(DurationUnit.MICROSECOND, Util.selectDurationUnitForDisplay(11*Util.NANOS_IN_ONE_MICROSECOND)); + assertEquals(DurationUnit.MICROSECOND, Util.selectDurationUnitForDisplay(9*Util.NANOS_IN_ONE_MILLISECOND)); + assertEquals(DurationUnit.MILLISSECOND, Util.selectDurationUnitForDisplay(11*Util.NANOS_IN_ONE_MILLISECOND)); + assertEquals(DurationUnit.SECOND, Util.selectDurationUnitForDisplay(3*Util.NANOS_IN_ONE_SECOND)); } }

1 0

svn commit: r1679 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/pattern test/java/ch/qos/logback/core/pattern
by noreply.ceki＠qos.ch 03 May '08

03 May '08

Author: ceki Date: Sat May 3 21:43:34 2008 New Revision: 1679 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/SpacePadder.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/SpacePadderTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/PackageTest.java Log: - refactoring space padding code Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/FormattingConverter.java Sat May 3 21:43:34 2008 @@ -42,7 +42,7 @@ if (s == null) { if (0 < min) - spacePad(buf, min); + SpacePadder.spacePad(buf, min); return; } @@ -56,34 +56,12 @@ } } else if (len < min) { if (formattingInfo.isLeftPad()) { - spacePad(buf, min - len); - buf.append(s); + SpacePadder.leftPad(buf, s, min); } else { - buf.append(s); - spacePad(buf, min - len); + SpacePadder.rightPad(buf, s, min); } } else { buf.append(s); } } - - final static String[] SPACES = { " ", " ", " ", " ", // 1,2,4,8 spaces - " ", // 16 spaces - " " }; // 32 spaces - - /** - * Fast space padding method. - */ - static public void spacePad(StringBuffer sbuf, int length) { - while (length >= 32) { - sbuf.append(SPACES[5]); - length -= 32; - } - - for (int i = 4; i >= 0; i--) { - if ((length & (1 << i)) != 0) { - sbuf.append(SPACES[i]); - } - } - } } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/SpacePadder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/SpacePadder.java Sat May 3 21:43:34 2008 @@ -0,0 +1,60 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2008, 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.pattern; + +public class SpacePadder { + + final static String[] SPACES = { " ", " ", " ", " ", // 1,2,4,8 + // spaces + " ", // 16 spaces + " " }; // 32 spaces + + final static public void leftPad(StringBuffer buf, String s, int desiredLength) { + int actualLen = 0; + if (s != null) { + actualLen = s.length(); + } + if (actualLen < desiredLength) { + spacePad(buf, desiredLength - actualLen); + } + if (s != null) { + buf.append(s); + } + } + + final static public void rightPad(StringBuffer buf, String s, int desiredLength) { + int actualLen = 0; + if (s != null) { + actualLen = s.length(); + } + if (s != null) { + buf.append(s); + } + if (actualLen < desiredLength) { + spacePad(buf, desiredLength - actualLen); + } + } + + /** + * Fast space padding method. + */ + final static public void spacePad(StringBuffer sbuf, int length) { + while (length >= 32) { + sbuf.append(SPACES[5]); + length -= 32; + } + + for (int i = 4; i >= 0; i--) { + if ((length & (1 << i)) != 0) { + sbuf.append(SPACES[i]); + } + } + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/PackageTest.java Sat May 3 21:43:34 2008 @@ -1,5 +1,6 @@ package ch.qos.logback.core.pattern; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -8,6 +9,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); + suite.addTest(new JUnit4TestAdapter(ch.qos.logback.core.pattern.SpacePadderTest.class)); suite.addTest(ch.qos.logback.core.pattern.parser.PackageTest.suite()); return suite; } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/SpacePadderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/SpacePadderTest.java Sat May 3 21:43:34 2008 @@ -0,0 +1,94 @@ +package ch.qos.logback.core.pattern; + +import static org.junit.Assert.assertEquals; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class SpacePadderTest { + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void smoke() { + { + StringBuffer buf = new StringBuffer(); + String s = "a"; + SpacePadder.leftPad(buf, s, 4); + assertEquals(" a", buf.toString()); + } + { + StringBuffer buf = new StringBuffer(); + String s = "a"; + SpacePadder.rightPad(buf, s, 4); + assertEquals("a ", buf.toString()); + } + } + + @Test + public void nullString() { + String s = null; + { + StringBuffer buf = new StringBuffer(); + SpacePadder.leftPad(buf, s, 2); + assertEquals(" ", buf.toString()); + } + { + StringBuffer buf = new StringBuffer(); + SpacePadder.rightPad(buf, s, 2); + assertEquals(" ", buf.toString()); + } + } + + @Test + public void longString() { + { + StringBuffer buf = new StringBuffer(); + String s = "abc"; + SpacePadder.leftPad(buf, s, 2); + assertEquals(s, buf.toString()); + } + + { + StringBuffer buf = new StringBuffer(); + String s = "abc"; + SpacePadder.rightPad(buf, s, 2); + assertEquals(s, buf.toString()); + } + } + + @Test + public void lengthyPad() { + { + StringBuffer buf = new StringBuffer(); + String s = "abc"; + SpacePadder.leftPad(buf, s, 33); + assertEquals(" abc", buf.toString()); + } + { + StringBuffer buf = new StringBuffer(); + String s = "abc"; + SpacePadder.rightPad(buf, s, 33); + assertEquals("abc ", buf.toString()); + } + + } + +}

1 0

svn commit: r1678 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 03 May '08

03 May '08

Author: ceki Date: Sat May 3 19:27:39 2008 New Revision: 1678 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java Log: - clearing turbofilterChain in LoggerContext after the shutdownAndReset method is called. Problem reported by Julia Hu [1]. [1] http://www.qos.ch/pipermail/logback-dev/2008-May/002506.html Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Sat May 3 19:27:39 2008 @@ -187,6 +187,7 @@ public void shutdownAndReset() { root.recursiveReset(); + clearAllTurboFilters(); fireOnReset(); } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TurboFilteringInLoggerTest.java Sat May 3 19:27:39 2008 @@ -131,6 +131,12 @@ assertFalse(logger.isDebugEnabled(blueMarker)); } + public void testLoggingContextShutdownAndReset() { + addYesFilter(); + assertNotNull(context.getFirstTurboFilter()); + context.shutdownAndReset(); + assertNull(context.getFirstTurboFilter()); + } }

1 0

[Bug 150] New: LogbackMDCAdapter allocates new HashMap for every MDC call
by bugzilla-daemon＠pixie.qos.ch 01 May '08

01 May '08

http://bugzilla.qos.ch/show_bug.cgi?id=150 Summary: LogbackMDCAdapter allocates new HashMap for every MDC call Product: logback-core Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: qosbugzilla(a)bitcount.com A new HashMap is allocated in logback's MDC implementation for every call to MDC.put and MDC.remove. This can lead to excessive garbage collector load in performance critical code that makes very frequent use of MDC, such as asynchronous network and file IO code. For certain programs it is critical to have MDC capability in code hotspots, where MDC is a valuable debugging tool as applied to TRACE and DEBUG statements. The current implementation causes a load on the garbage collector even when logging is turned off. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 1