Merge branch 'feature/LOG4J2-1430'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e7bbd27f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e7bbd27f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e7bbd27f Branch: refs/heads/master Commit: e7bbd27fc3143c5dda2dfa7d8ee553872ef5e2d2 Parents: dbbeb5c 41ea561 Author: Matt Sicker <boa...@gmail.com> Authored: Sun Sep 4 13:36:53 2016 -0500 Committer: Matt Sicker <boa...@gmail.com> Committed: Sun Sep 4 13:36:53 2016 -0500 ---------------------------------------------------------------------- .../apache/logging/log4j/util/LoaderUtil.java | 19 ++ log4j-core/pom.xml | 12 ++ .../log4j/core/appender/AsyncAppender.java | 153 +++++++++++++--- .../core/async/ArrayBlockingQueueFactory.java | 26 +++ .../log4j/core/async/BlockingQueueFactory.java | 26 +++ .../async/DisruptorBlockingQueueFactory.java | 37 ++++ .../core/async/JCToolsBlockingQueueFactory.java | 182 +++++++++++++++++++ .../core/async/LinkedTransferQueueFactory.java | 43 +++++ .../apache/logging/log4j/core/util/Loader.java | 10 +- .../AsyncAppenderQueueFullPolicyTest.java | 9 +- .../log4j/core/appender/AsyncAppenderTest.java | 27 ++- .../core/async/perftest/AbstractRunQueue.java | 91 ++++++++++ .../core/async/perftest/ResponseTimeTest.java | 1 + .../core/async/perftest/RunConversant.java | 31 ++++ .../log4j/core/async/perftest/RunJCTools.java | 32 ++++ .../logging/log4j/junit/LoggerContextRule.java | 4 +- .../BlockingQueueFactory-ArrayBlockingQueue.xml | 40 ++++ ...ckingQueueFactory-DisruptorBlockingQueue.xml | 40 ++++ ...lockingQueueFactory-JctoolsBlockingQueue.xml | 40 ++++ ...BlockingQueueFactory-LinkedTransferQueue.xml | 40 ++++ .../test/resources/log4j-asynch-queue-full.xml | 4 +- log4j-perf/pom.xml | 8 + .../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 37 +++- .../AsyncAppenderLog4j2LocationBenchmark.java | 23 ++- .../perf5AsyncApndDsrptrNoLoc-noOpAppender.xml | 32 ++++ ...perf5AsyncApndDsrptrWithLoc-noOpAppender.xml | 32 ++++ .../perf5AsyncApndMpscQNoLoc-noOpAppender.xml | 32 ++++ .../perf5AsyncApndMpscQWithLoc-noOpAppender.xml | 32 ++++ .../perf5AsyncApndNoLoc-noOpAppender.xml | 1 + .../perf5AsyncApndXferQNoLoc-noOpAppender.xml | 32 ++++ .../perf5AsyncApndXferQWithLoc-noOpAppender.xml | 32 ++++ pom.xml | 14 +- src/site/xdoc/manual/appenders.xml | 84 ++++++++- 33 files changed, 1168 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e7bbd27f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e7bbd27f/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e7bbd27f/src/site/xdoc/manual/appenders.xml ----------------------------------------------------------------------
