- logback-dev - mailman3.qos.ch

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

04 May '08

Author: ceki Date: Sun May 4 20:17:08 2008 New Revision: 1683 Modified: 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 Log: - ongoing work on StopWatch and poor man's profiler functionality Modified: 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/ProfilerTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/ProfilerTest.java Sun May 4 20:17:08 2008 @@ -1,21 +1,14 @@ package ch.qos.logback.classic.stopwatch; - +import org.junit.Ignore; 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"); @@ -23,56 +16,62 @@ profiler.stop(); } + @Ignore @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); - + 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().print(); } + @Test - public void testBasicProfiling() { + public void testNestedProfiling() { Profiler profiler = new Profiler("BAS"); - + profiler.start("doX"); doX(1); - + profiler.start("doYYYYY"); - for(int i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { doY(i); } + Profiler nested = profiler.startNested("subtask"); + doSubtask(nested); profiler.start("doZ"); doZ(2); - profiler.stop(); + profiler.stop().print(); } - + void doX(int millis) { delay(millis); } + + public void doSubtask(Profiler nested) { + nested.start("n1"); + doX(1); + + nested.start("n2"); + doX(5); + nested.stop(); + } void doY(int millis) { - delay(millis); + delay(millis); } - + void doZ(int millis) { - delay(millis); + delay(millis); } - + void delay(int millis) { try { Thread.sleep(millis); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/stopwatch/StopWatchTest.java Sun May 4 20:17:08 2008 @@ -16,46 +16,13 @@ super.tearDown(); } - public void testBasic() throws InterruptedException { - StopWatch sw = new StopWatch("testBasic"); - - { - long d = sw.startTime+10; - String s = sw.stop(d).toString(); - assertTrue(s.endsWith("10 nanoseconds.")); - } - - { - 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*Util.NANOS_IN_ONE_MICROSECOND; - String s = sw.stop(d).toString(); - assertTrue(s.endsWith("11 microseconds.")); - } - { - 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*Util.NANOS_IN_ONE_SECOND; - String s = sw.stop(d).toString(); - System.out.println(s); - assertTrue(s.endsWith("3.000 seconds.")); - } - } - public void testSelectDurationUnitForDisplay() throws InterruptedException { 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)); + assertEquals(DurationUnit.SECOND, Util.selectDurationUnitForDisplay(11*Util.NANOS_IN_ONE_SECOND)); } }

1 0

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

svn commit: r1677 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/rolling main/java/ch/qos/logback/core/rolling/helper test/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core/rolling/helper
by noreply.ceki＠qos.ch 25 Apr '08

25 Apr '08

Author: ceki Date: Sat Apr 26 01:05:56 2008 New Revision: 1677 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionMode.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionRunnable.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java - copied, changed from r1666, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compress.java Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compress.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Log: - added support for asynchronous compression see also http://bugzilla.qos.ch/show_bug.cgi?id=55 http://bugzilla.qos.ch/show_bug.cgi?id=149 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Sat Apr 26 01:05:56 2008 @@ -11,7 +11,8 @@ import java.io.File; -import ch.qos.logback.core.rolling.helper.Compress; +import ch.qos.logback.core.rolling.helper.CompressionMode; +import ch.qos.logback.core.rolling.helper.Compressor; import ch.qos.logback.core.rolling.helper.FileNamePattern; import ch.qos.logback.core.rolling.helper.IntegerTokenConverter; import ch.qos.logback.core.rolling.helper.RenameUtil; @@ -32,7 +33,6 @@ int maxIndex; int minIndex; RenameUtil util = new RenameUtil(); - Compress compress = new Compress(); /** * It's almost always a bad idea to have a large window size, say over 12. @@ -47,8 +47,7 @@ public void start() { // set the LR for our utility object util.setContext(this.context); - compress.setContext(this.context); - + if (fileNamePatternStr != null) { fileNamePattern = new FileNamePattern(fileNamePatternStr, this.context); determineCompressionMode(); @@ -111,15 +110,23 @@ } // move active file name to min + Compressor compressor; switch (compressionMode) { - case Compress.NONE: - util.rename(getNewActiveFileName(), fileNamePattern.convertInt(minIndex)); + case NONE: + util.rename(getNewActiveFileName(), fileNamePattern + .convertInt(minIndex)); break; - case Compress.GZ: - compress.GZCompress(getNewActiveFileName(), fileNamePattern.convertInt(minIndex)); + case GZ: + compressor = new Compressor(CompressionMode.GZ, + getNewActiveFileName(), fileNamePattern.convertInt(minIndex)); + compressor.setContext(this.context); + compressor.compress(); break; - case Compress.ZIP: - compress.ZIPCompress(getNewActiveFileName(), fileNamePattern.convertInt(minIndex)); + case ZIP: + compressor = new Compressor(CompressionMode.ZIP, + getNewActiveFileName(), fileNamePattern.convertInt(minIndex)); + compressor.setContext(this.context); + compressor.compress(); break; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java Sat Apr 26 01:05:56 2008 @@ -10,7 +10,7 @@ package ch.qos.logback.core.rolling; import ch.qos.logback.core.FileAppender; -import ch.qos.logback.core.rolling.helper.Compress; +import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.FileNamePattern; import ch.qos.logback.core.spi.ContextAwareBase; @@ -24,7 +24,7 @@ * @author Ceki Gülcü */ public abstract class RollingPolicyBase extends ContextAwareBase implements RollingPolicy { - protected int compressionMode = Compress.NONE; + protected CompressionMode compressionMode = CompressionMode.NONE; protected FileNamePattern fileNamePattern; protected String fileNamePatternStr; @@ -42,13 +42,13 @@ protected void determineCompressionMode() { if (fileNamePatternStr.endsWith(".gz")) { addInfo("Will use gz compression"); - compressionMode = Compress.GZ; + compressionMode = CompressionMode.GZ; } else if (fileNamePatternStr.endsWith(".zip")) { addInfo("Will use zip compression"); - compressionMode = Compress.ZIP; + compressionMode = CompressionMode.ZIP; } else { addInfo("No compression will be used"); - compressionMode = Compress.NONE; + compressionMode = CompressionMode.NONE; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Sat Apr 26 01:05:56 2008 @@ -9,63 +9,63 @@ */ package ch.qos.logback.core.rolling; - import java.io.File; import java.util.Date; +import java.util.concurrent.Future; -import ch.qos.logback.core.rolling.helper.Compress; +import ch.qos.logback.core.rolling.helper.AsynchronousCompressor; +import ch.qos.logback.core.rolling.helper.Compressor; +import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.DateTokenConverter; import ch.qos.logback.core.rolling.helper.FileNamePattern; import ch.qos.logback.core.rolling.helper.RenameUtil; import ch.qos.logback.core.rolling.helper.RollingCalendar; /** - * <code>TimeBasedRollingPolicy</code> is both easy to configure and quite - * powerful. It allows the rollover to be made based on time conditions. - * It is possible to specify that the rollover must occur each day, or month, for example. + * <code>TimeBasedRollingPolicy</code> is both easy to configure and quite + * powerful. It allows the rollover to be made based on time conditions. It is + * possible to specify that the rollover must occur each day, or month, for + * example. * - * For more information about this policy, please refer to the online manual at - * http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy + * For more information about this policy, please refer to the online manual at + * http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy * * @author Ceki Gülcü */ -public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements TriggeringPolicy<E> { - static final String FNP_NOT_SET = - "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; - static final String SEE_FNP_NOT_SET = - "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; +public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements + TriggeringPolicy<E> { + static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; + static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; RollingCalendar rc; long currentTime; long nextCheck; - //indicate whether the time has been forced or not - boolean isTimeForced=false; + // indicate whether the time has been forced or not + boolean isTimeForced = false; Date lastCheck = new Date(); String elapsedPeriodsFileName; FileNamePattern activeFileNamePattern; RenameUtil util = new RenameUtil(); - Compress compress = new Compress(); String lastGeneratedFileName; - + Future<?> future; + public void setCurrentTime(long timeInMillis) { - currentTime = timeInMillis; - isTimeForced = true; + currentTime = timeInMillis; + isTimeForced = true; } - - public long getCurrentTime(){ - //if time is forced return the time set by user - if(isTimeForced){ - return currentTime; - } - else{ - return System.currentTimeMillis(); - } + + public long getCurrentTime() { + // if time is forced return the time set by user + if (isTimeForced) { + return currentTime; + } else { + return System.currentTimeMillis(); + } } - + public void start() { // set the LR for our utility object util.setContext(this.context); - compress.setContext(this.context); - + // find out period from the filename pattern if (fileNamePatternStr != null) { fileNamePattern = new FileNamePattern(fileNamePatternStr, this.context); @@ -79,103 +79,115 @@ DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); if (dtc == null) { - throw new IllegalStateException( - "FileNamePattern [" + fileNamePattern.getPattern() - + "] does not contain a valid DateToken"); + throw new IllegalStateException("FileNamePattern [" + + fileNamePattern.getPattern() + + "] does not contain a valid DateToken"); } int len = fileNamePatternStr.length(); - switch(compressionMode) { - case Compress.GZ: - activeFileNamePattern = - new FileNamePattern(fileNamePatternStr.substring(0, len - 3), this.context); - + switch (compressionMode) { + case GZ: + activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring( + 0, len - 3), this.context); + + break; + case ZIP: + activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring( + 0, len - 4), this.context); break; - case Compress.ZIP: - activeFileNamePattern = - new FileNamePattern(fileNamePatternStr.substring(0, len - 4), this.context); - break; - case Compress.NONE: - activeFileNamePattern = fileNamePattern; - } - addInfo("Will use the pattern "+activeFileNamePattern+" for the active file"); - + case NONE: + activeFileNamePattern = fileNamePattern; + } + addInfo("Will use the pattern " + activeFileNamePattern + + " for the active file"); + rc = new RollingCalendar(); rc.init(dtc.getDatePattern()); - addInfo("The date pattern is '"+dtc.getDatePattern()+"' from file name pattern '"+ - fileNamePattern.getPattern()+"'."); + addInfo("The date pattern is '" + dtc.getDatePattern() + + "' from file name pattern '" + fileNamePattern.getPattern() + "'."); rc.printPeriodicity(this); - //currentTime = System.currentTimeMillis(); + // currentTime = System.currentTimeMillis(); lastCheck.setTime(getCurrentTime()); nextCheck = rc.getNextCheckMillis(lastCheck); - //Date nc = new Date(); - //nc.setTime(nextCheck); + // Date nc = new Date(); + // nc.setTime(nextCheck); } public void rollover() throws RolloverFailure { - //addInfo("roll-over called"); - //addInfo("compressionMode: " + compressionMode); - if (getParentFileName() == null) { - switch (compressionMode) { - case Compress.NONE: - // nothing to do; - break; - case Compress.GZ: - addInfo("GZIP compressing ["+elapsedPeriodsFileName+"]."); - compress.GZCompress(elapsedPeriodsFileName); - break; - case Compress.ZIP: - addInfo("ZIP compressing ["+elapsedPeriodsFileName+"]"); - compress.ZIPCompress(elapsedPeriodsFileName); - break; - } + // when rollover is called the elapsed period's file has + // been already closed. This is a working assumption of this method. + + if (getParentFileName() == null && compressionMode != CompressionMode.NONE) { + doCompression(false, elapsedPeriodsFileName, elapsedPeriodsFileName); } else { - switch (compressionMode) { - case Compress.NONE: + if (compressionMode == CompressionMode.NONE) { util.rename(getParentFileName(), elapsedPeriodsFileName); - break; - case Compress.GZ: - addInfo("GZIP compressing ["+elapsedPeriodsFileName+"]"); - compress.GZCompress(getParentFileName(), elapsedPeriodsFileName); - break; - case Compress.ZIP: - addInfo("ZIP compressing ["+elapsedPeriodsFileName+"]"); - compress.ZIPCompress(getParentFileName(), elapsedPeriodsFileName); - break; + } else { + doCompression(true, getParentFileName(), elapsedPeriodsFileName); } } - - //let's update the parent active file name + + // let's update the parent active file name setParentFileName(getNewActiveFileName()); - + + } + + void doCompression(boolean rename, String nameOfFile2Compress, + String nameOfCompressedFile) throws RolloverFailure { + Compressor compressor = null; + + if (rename) { + String renameTarget = nameOfFile2Compress + System.nanoTime() + ".tmp"; + util.rename(getParentFileName(), renameTarget); + nameOfFile2Compress = renameTarget; + } + + switch (compressionMode) { + case GZ: + addInfo("GZIP compressing [" + nameOfFile2Compress + "]."); + compressor = new Compressor(CompressionMode.GZ, nameOfFile2Compress, + nameOfCompressedFile); + compressor.setContext(this.context); + break; + case ZIP: + addInfo("ZIP compressing [" + nameOfFile2Compress + "]"); + compressor = new Compressor(CompressionMode.ZIP, nameOfFile2Compress, + nameOfCompressedFile); + compressor.setContext(this.context); + break; + } + + AsynchronousCompressor ac = new AsynchronousCompressor(compressor); + future = ac.compressAsynchronously(); + } /** - * + * * The active log file is determined by the value of the parent's filename - * option. However, in case the file name is left blank, - * then, the active log file equals the file name for the current period - * as computed by the <b>FileNamePattern</b> option. + * option. However, in case the file name is left blank, then, the active log + * file equals the file name for the current period as computed by the + * <b>FileNamePattern</b> option. * - * The RollingPolicy must know wether it is responsible for - * changing the name of the active file or not. If the active file - * name is set by the user via the configuration file, then the - * RollingPolicy must let it like it is. If the user does not - * specify an active file name, then the RollingPolicy generates one. + * The RollingPolicy must know wether it is responsible for changing the name + * of the active file or not. If the active file name is set by the user via + * the configuration file, then the RollingPolicy must let it like it is. If + * the user does not specify an active file name, then the RollingPolicy + * generates one. * - * To be sure that the file name used by the parent class has been - * generated by the RollingPolicy and not specified by the user, we - * keep track of the last generated name object and compare its - * reference to the parent file name. If they match, then - * the RollingPolicy knows it's responsible for the change of the - * file name. + * To be sure that the file name used by the parent class has been generated + * by the RollingPolicy and not specified by the user, we keep track of the + * last generated name object and compare its reference to the parent file + * name. If they match, then the RollingPolicy knows it's responsible for the + * change of the file name. * */ public String getNewActiveFileName() { - if (getParentFileName() == null || getParentFileName() == lastGeneratedFileName) { + if (getParentFileName() == null + || getParentFileName() == lastGeneratedFileName) { String newName = activeFileNamePattern.convertDate(lastCheck); addInfo("Generated a new name for RollingFileAppender: " + newName); lastGeneratedFileName = newName; @@ -186,32 +198,33 @@ } public boolean isTriggeringEvent(File activeFile, final E event) { - long time= getCurrentTime(); + long time = getCurrentTime(); if (time >= nextCheck) { - //addInfo("Time to trigger roll-over"); - // We set the elapsedPeriodsFileName before we set the 'lastCheck' variable + // addInfo("Time to trigger roll-over"); + // We set the elapsedPeriodsFileName before we set the 'lastCheck' + // variable // The elapsedPeriodsFileName corresponds to the file name of the period // that just elapsed. elapsedPeriodsFileName = activeFileNamePattern.convertDate(lastCheck); - //addInfo("elapsedPeriodsFileName set to "+elapsedPeriodsFileName); + // addInfo("elapsedPeriodsFileName set to "+elapsedPeriodsFileName); lastCheck.setTime(time); nextCheck = rc.getNextCheckMillis(lastCheck); Date x = new Date(); x.setTime(nextCheck); - //addInfo("Next check on "+ x); + // addInfo("Next check on "+ x); return true; } else { return false; } - } + } @Override public String toString() { return "c.q.l.core.rolling.TimeBasedRollingPolicy"; } - + } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/AsynchronousCompressor.java Sat Apr 26 01:05:56 2008 @@ -0,0 +1,19 @@ +package ch.qos.logback.core.rolling.helper; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +public class AsynchronousCompressor { + Compressor compressor; + + public AsynchronousCompressor(Compressor compressor) { + this.compressor = compressor; + } + + public Future<?> compressAsynchronously() { + ExecutorService executor = Executors.newScheduledThreadPool(1); + return executor.submit(new CompressionRunnable(compressor)); + } + +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionMode.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionMode.java Sat Apr 26 01:05:56 2008 @@ -0,0 +1,5 @@ +package ch.qos.logback.core.rolling.helper; + +public enum CompressionMode { + NONE, GZ, ZIP; +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionRunnable.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/CompressionRunnable.java Sat Apr 26 01:05:56 2008 @@ -0,0 +1,14 @@ +package ch.qos.logback.core.rolling.helper; + + +public class CompressionRunnable implements Runnable { + + final Compressor compressor; + public CompressionRunnable(Compressor compressor) { + this.compressor = compressor; + } + + public void run() { + compressor.compress(); + } +} Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java (from r1666, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compress.java) ============================================================================== --- /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compress.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java Sat Apr 26 01:05:56 2008 @@ -16,7 +16,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import ch.qos.logback.core.Context; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.WarnStatus; @@ -28,37 +27,37 @@ * * @author Ceki Gülcü */ -public class Compress extends ContextAwareBase { - public static final int NONE = 0; - public static final int GZ = 1; - public static final int ZIP = 2; - /** - * String constant representing no compression. The value of this constant is - * "NONE". - */ - public static final String NONE_STR = "NONE"; - - /** - * String constant representing compression in the GZIP format. The value of - * this constant is "GZ". - */ - public static final String GZ_STR = "GZ"; - - /** - * String constant representing compression in the ZIP format. The value of - * this constant is "ZIP". - */ - public static final String ZIP_STR = "ZIP"; - - Context context; - - public void ZIPCompress(String nameOfFile2zip) { - // Here we rely on the fact that the two argument version of ZIPCompress - // automatically adds a .zip extension to the second argument - GZCompress(nameOfFile2zip, nameOfFile2zip); +public class Compressor extends ContextAwareBase { + + final CompressionMode compressionMode; + final String nameOfFile2Compress; + final String nameOfCompressedFile; + + + public Compressor(CompressionMode compressionMode, String nameOfFile2Compress, String nameOfCompressedFile) { + this.compressionMode = compressionMode; + this.nameOfFile2Compress = nameOfFile2Compress; + this.nameOfCompressedFile = nameOfCompressedFile; + } + + public Compressor(CompressionMode compressionMode, String nameOfFile2Compress) { + // Here we rely on the fact that the two argument version of ZIPCompress/GZCompress + // automatically adds a .zip/.gz extension to the second argument + this(compressionMode, nameOfFile2Compress, nameOfFile2Compress); } - public void ZIPCompress(String nameOfFile2zip, String nameOfZippedFile) { + public void compress() { + switch(compressionMode) { + case GZ: + gzCompress(nameOfFile2Compress, nameOfCompressedFile); + break; + case ZIP: + zipCompress(nameOfFile2Compress, nameOfCompressedFile); + break; + } + } + + private void zipCompress(String nameOfFile2zip, String nameOfZippedFile) { File file2zip = new File(nameOfFile2zip); if (!file2zip.exists()) { @@ -111,13 +110,7 @@ } } - public void GZCompress(String nameOfFile2gz) { - // Here we rely on the fact that the two argument version of GZCompress - // automatically adds a .gz extension to the second argument - GZCompress(nameOfFile2gz, nameOfFile2gz); - } - - public void GZCompress(String nameOfFile2gz, String nameOfgzedFile) { + private void gzCompress(String nameOfFile2gz, String nameOfgzedFile) { File file2gz = new File(nameOfFile2gz); if (!file2gz.exists()) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Sat Apr 26 01:05:56 2008 @@ -10,18 +10,19 @@ package ch.qos.logback.core.rolling; +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.concurrent.TimeUnit; + +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.layout.EchoLayout; import ch.qos.logback.core.util.Compare; import ch.qos.logback.core.util.Constants; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Calendar; /** * A rather exhaustive set of tests. Tests include leaving the file option @@ -241,9 +242,7 @@ tbrp.setCurrentTime(addTime(tbrp.getCurrentTime(), 500)); } - // for (int i = 0; i < 3; i++) { - // System.out.println(i + " expected filename [" + filenames[i] + "]."); - // } + tbrp.future.get(1000, TimeUnit.MILLISECONDS); for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX @@ -424,6 +423,9 @@ // System.out.println(i + " expected filename [" + filenames[i] + "]."); // } + // wait for the compression task to finish + tbrp.future.get(1000, TimeUnit.MILLISECONDS); + for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test6." + i + ".gz")); @@ -432,7 +434,7 @@ assertTrue(Compare.compare(filenames[2], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test6.2")); } - + public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(TimeBasedRollingTest.class); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Sat Apr 26 01:05:56 2008 @@ -16,108 +16,106 @@ import java.io.InputStream; import java.io.OutputStream; -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.util.Compare; import ch.qos.logback.core.util.Constants; import ch.qos.logback.core.util.StatusPrinter; - /** * @author Ceki Gulcu */ public class CompressTest extends TestCase { - Compress compress; Context context = new ContextBase(); - - public CompressTest(String arg0) { - super(arg0); - compress = new Compress(); - compress.setContext(context); - } public void setUp() throws IOException { - //Copy source files - //Delete output files - { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress1.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress1.txt"); - copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz"); - target.mkdirs(); - target.delete(); - } - { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress2.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress2.txt"); - copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX + "output/compress2.txt.gz"); - target.mkdirs(); - target.delete(); - } - { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress3.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress3.txt"); - copy(source, dest); - File target = new File(Constants.TEST_DIR_PREFIX + "output/compress3.txt.zip"); - target.mkdirs(); - target.delete(); - } + // Copy source files + // Delete output files + { + File source = new File(Constants.TEST_DIR_PREFIX + "input/compress1.copy"); + File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress1.txt"); + + copy(source, dest); + File target = new File(Constants.TEST_DIR_PREFIX + + "output/compress1.txt.gz"); + target.mkdirs(); + target.delete(); + } + { + File source = new File(Constants.TEST_DIR_PREFIX + "input/compress2.copy"); + File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress2.txt"); + copy(source, dest); + File target = new File(Constants.TEST_DIR_PREFIX + + "output/compress2.txt.gz"); + target.mkdirs(); + target.delete(); + } + { + File source = new File(Constants.TEST_DIR_PREFIX + "input/compress3.copy"); + File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress3.txt"); + copy(source, dest); + File target = new File(Constants.TEST_DIR_PREFIX + + "output/compress3.txt.zip"); + target.mkdirs(); + target.delete(); + } } public void tearDown() { } public void test1() throws Exception { - compress.GZCompress(Constants.TEST_DIR_PREFIX + "input/compress1.txt", Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz"); - - StatusPrinter.print(context.getStatusManager()); - assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz", - Constants.TEST_DIR_PREFIX + "witness/compress1.txt.gz")); + Compressor compressor = new Compressor(CompressionMode.GZ, + Constants.TEST_DIR_PREFIX + "input/compress1.txt", + Constants.TEST_DIR_PREFIX + "output/compress1.txt.gz"); + compressor.setContext(context); + compressor.compress(); + + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); + assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX + + "output/compress1.txt.gz", Constants.TEST_DIR_PREFIX + + "witness/compress1.txt.gz")); } public void test2() throws Exception { - compress.GZCompress(Constants.TEST_DIR_PREFIX + "input/compress2.txt", Constants.TEST_DIR_PREFIX + "output/compress2.txt"); - - StatusPrinter.print(context.getStatusManager()); - assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX + "output/compress2.txt.gz", - Constants.TEST_DIR_PREFIX + "witness/compress2.txt.gz")); + Compressor compressor = new Compressor(CompressionMode.GZ, + Constants.TEST_DIR_PREFIX + "input/compress2.txt", + Constants.TEST_DIR_PREFIX + "output/compress2.txt"); + compressor.setContext(context); + compressor.compress(); + + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); + assertTrue(Compare.gzCompare(Constants.TEST_DIR_PREFIX + + "output/compress2.txt.gz", Constants.TEST_DIR_PREFIX + + "witness/compress2.txt.gz")); } public void test3() throws Exception { - compress.ZIPCompress(Constants.TEST_DIR_PREFIX + "input/compress3.txt", Constants.TEST_DIR_PREFIX + "output/compress3.txt"); - - StatusPrinter.print(context.getStatusManager()); - assertEquals(0, context.getStatusManager().getCount()); + Compressor compressor = new Compressor(CompressionMode.ZIP, + Constants.TEST_DIR_PREFIX + "input/compress3.txt", + Constants.TEST_DIR_PREFIX + "output/compress3.txt"); + compressor.setContext(context); + compressor.compress(); + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); // assertTrue(Compare.compare("output/compress3.txt.zip", // "witness/compress3.txt.zip")); } - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(new CompressTest("test1")); - suite.addTest(new CompressTest("test2")); - suite.addTest(new CompressTest("test3")); - return suite; - } - private void copy(File src, File dst) throws IOException { - InputStream in = new FileInputStream(src); - OutputStream out = new FileOutputStream(dst); - byte[] buf = new byte[1024]; - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - in.close(); - out.close(); + InputStream in = new FileInputStream(src); + OutputStream out = new FileOutputStream(dst); + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + in.close(); + out.close(); } - - + }

1 0

[Bug 149] New: compression should happen in a separate thread
by bugzilla-daemon＠pixie.qos.ch 22 Apr '08

22 Apr '08

http://bugzilla.qos.ch/show_bug.cgi?id=149 Summary: compression should happen in a separate thread Product: logback-core Version: unspecified Platform: Other OS/Version: All Status: NEW Severity: enhancement Priority: P1 Component: Rolling AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.ceki(a)qos.ch During rollover, compression can bring all logging to a halt. This bug is related to bug #55. http://bugzilla.qos.ch/show_bug.cgi?id=55 -- 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

[Bug 55] New: Implement AsyncAppender
by bugzilla-daemon＠pixie.qos.ch 22 Apr '08

22 Apr '08

http://bugzilla.qos.ch/show_bug.cgi?id=55 Summary: Implement AsyncAppender Product: logback-classic Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: enhancement Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: anders_wallgren(a)alum.mit.edu Being able to write log files in the background is a requirement for production deployments of anything we would write on top of logback. Bonus points for including a feature to periodically flush the output. -- 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 2