Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/614e39e0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/614e39e0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/614e39e0
Branch: refs/heads/master Commit: 614e39e02f209257e126df9180e2859d45018b7c Parents: be3fcda afcce2c Author: ggregory <ggreg...@apache.org> Authored: Mon May 9 11:12:26 2016 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Mon May 9 11:12:26 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/AsyncAppender.java | 55 ++-- .../log4j/core/async/AsyncEventRouter.java | 36 --- .../core/async/AsyncEventRouterFactory.java | 101 ------ ...syncLoggerConfigDefaultExceptionHandler.java | 54 ++++ .../core/async/AsyncLoggerConfigDisruptor.java | 13 +- .../AsyncLoggerDefaultExceptionHandler.java | 52 ++++ .../log4j/core/async/AsyncLoggerDisruptor.java | 12 +- .../log4j/core/async/AsyncQueueFullPolicy.java | 38 +++ .../core/async/AsyncQueueFullPolicyFactory.java | 101 ++++++ .../core/async/DefaultAsyncEventRouter.java | 37 --- ...efaultAsyncLoggerConfigExceptionHandler.java | 54 ---- .../DefaultAsyncLoggerExceptionHandler.java | 52 ---- .../core/async/DefaultAsyncQueueFullPolicy.java | 37 +++ .../core/async/DiscardingAsyncEventRouter.java | 72 ----- .../async/DiscardingAsyncQueueFullPolicy.java | 72 +++++ .../logging/log4j/core/async/DisruptorUtil.java | 8 +- .../logging/log4j/core/async/EventRoute.java | 4 + .../logging/log4j/core/impl/Log4jLogEvent.java | 25 +- .../log4j/core/impl/MutableLogEvent.java | 32 +- .../AsyncAppenderQueueFullPolicyTest.java | 113 +++++++ .../core/async/AsyncEventRouterFactoryTest.java | 114 ------- .../async/AsyncQueueFullPolicyFactoryTest.java | 114 +++++++ .../core/async/DefaultAsyncEventRouterTest.java | 50 --- .../async/DefaultAsyncQueueFullPolicyTest.java | 50 +++ .../async/DiscardingAsyncEventRouterTest.java | 117 ------- .../DiscardingAsyncQueueFullPolicyTest.java | 117 +++++++ .../core/async/perftest/ResponseTimeTest.java | 101 +++--- .../core/async/perftest/SimplePerfTest.bat | 47 --- .../log4j/core/async/perftest/SimplePerfTest.sh | 57 ---- .../log4j/core/impl/Log4jLogEventTest.java | 68 ++++ .../log4j/test/appender/BlockingAppender.java | 61 ++++ .../test/resources/log4j-asynch-queue-full.xml | 38 +++ .../src/test/resources/perf/SimplePerfTest.bat | 47 +++ .../src/test/resources/perf/SimplePerfTest.sh | 57 ++++ .../src/test/resources/perf/runResponseTm.sh | 62 ++++ .../AsyncAppenderLog4j1LocationBenchmark.java | 71 +++++ .../AsyncAppenderLog4j2LocationBenchmark.java | 75 +++++ .../AsyncAppenderLogbackLocationBenchmark.java | 77 +++++ .../perf/jmh/AsyncLoggersLocationBenchmark.java | 84 +++++ .../jmh/Log4j2AppenderComparisonBenchmark.java | 221 +++++++++++++ .../perf/jmh/MemoryHandlerJULBenchmark.java | 1 + .../jmh/MemoryHandlerJULLocationBenchmark.java | 74 +++++ .../resources/log4j2-appenderComparison.xml | 68 ++++ .../perf-WithoutAnyAppender-location.xml | 12 + ...perf-log4j12-async-location-noOpAppender.xml | 31 ++ ...perf-logback-async-location-noOpAppender.xml | 31 ++ .../perf5AsyncApndWithLoc-noOpAppender.xml | 31 ++ src/changes/changes.xml | 3 + .../images/AsyncWithLocationThrpt1T-labeled.png | Bin 0 -> 23503 bytes .../images/AsyncWithLocationThrpt1T.png | Bin 0 -> 17751 bytes ...responsetimeasynclogging16thre...@8keach.png | Bin 0 -> 30694 bytes ...ogging16thre...@8keachlog4j2only-labeled.png | Bin 0 -> 42723 bytes .../responsetimeasynclogging1thr...@128k.png | Bin 0 -> 25701 bytes ...responsetimeasynclogging4thre...@16keach.png | Bin 0 -> 35566 bytes ...asynclogging4thre...@16keachwithoutmixed.png | Bin 0 -> 37846 bytes ...amallasyncclassicvslog4j1-16thre...@128k.png | Bin 0 -> 33079 bytes src/site/xdoc/manual/appenders.xml | 4 +- src/site/xdoc/manual/async.xml | 311 ++++--------------- src/site/xdoc/manual/configuration.xml.vm | 6 +- src/site/xdoc/manual/garbagefree.xml | 21 +- src/site/xdoc/performance.xml | 82 ++++- 61 files changed, 2151 insertions(+), 1120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/614e39e0/src/changes/changes.xml ----------------------------------------------------------------------
