Merge master into branch LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bb62985f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bb62985f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bb62985f Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: bb62985f64a9a0a60603fc3c125ba2ea03c79f71 Parents: fbd7695 15d95ec Author: rpopma <[email protected]> Authored: Wed Feb 24 08:19:42 2016 +0900 Committer: rpopma <[email protected]> Committed: Wed Feb 24 08:19:42 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/message/ObjectMessage.java | 21 +- .../log4j/message/ParameterizedMessage.java | 358 +++++---- .../logging/log4j/message/ReusableMessage.java | 34 + .../ReusableParameterizedMessageFactory.java | 66 ++ .../logging/log4j/message/SimpleMessage.java | 9 +- .../log4j/message/ThreadDumpMessage.java | 13 +- .../logging/log4j/spi/AbstractLogger.java | 98 ++- .../logging/log4j/spi/ExtendedLogger.java | 2 + .../apache/logging/log4j/spi/StandardLevel.java | 2 +- .../log4j/util/PerformanceSensitive.java | 29 + .../logging/log4j/util/PropertiesUtil.java | 18 +- .../logging/log4j/util/ReflectionUtil.java | 5 + .../log4j/util/StringBuilderFormattable.java | 33 + .../apache/logging/log4j/LambdaLoggerTest.java | 2 +- .../log4j/message/ParameterizedMessageTest.java | 21 +- .../org/apache/logging/log4j/core/Layout.java | 19 +- .../core/appender/RandomAccessFileAppender.java | 17 +- .../core/appender/RandomAccessFileManager.java | 18 +- .../RollingRandomAccessFileAppender.java | 19 +- .../log4j/core/appender/SocketAppender.java | 6 +- .../appender/rolling/RollingFileManager.java | 2 +- .../rolling/RollingRandomAccessFileManager.java | 19 +- .../logging/log4j/core/async/AsyncLogger.java | 8 +- .../logging/log4j/core/async/DisruptorUtil.java | 4 +- .../log4j/core/async/RingBufferLogEvent.java | 80 +- .../log4j/core/config/AppenderControl.java | 4 + .../core/config/AppenderControlArraySet.java | 8 +- .../apache/logging/log4j/core/jmx/Server.java | 11 +- .../log4j/core/layout/AbstractLayout.java | 49 +- .../log4j/core/layout/AbstractStringLayout.java | 9 +- .../core/layout/ByteBufferDestination.java | 45 ++ .../logging/log4j/core/layout/Encoder.java | 36 + .../log4j/core/layout/PatternLayout.java | 79 +- .../log4j/core/layout/TextEncoderHelper.java | 136 ++++ .../core/pattern/DatePatternConverter.java | 80 +- .../core/pattern/MessagePatternConverter.java | 18 + .../logging/log4j/core/util/Constants.java | 23 +- ...ingRandomAccessFileAppenderRolloverTest.java | 13 +- .../routing/PropertiesRoutingAppenderTest.java | 1 + .../appender/routing/RoutingAppenderTest.java | 1 + .../routing/RoutingAppenderWithPurgingTest.java | 13 +- .../routing/RoutingDefaultAppenderTest.java | 1 + .../core/layout/SpyByteBufferDestination.java | 63 ++ .../core/layout/TextEncoderHelperTest.java | 263 +++++++ .../core/pattern/DatePatternConverterTest.java | 27 + .../apache/logging/log4j/junit/CleanFiles.java | 23 +- .../perf/jmh/ParameterizedMessageBenchmark.java | 289 +------ .../ParameterizedMessageInliningBenchmark.java | 332 ++++++++ .../log4j/perf/nogc/ByteBufferDestination.java | 33 - .../logging/log4j/perf/nogc/DemoAppender.java | 10 +- .../apache/logging/log4j/perf/nogc/Encoder.java | 24 - .../logging/log4j/perf/nogc/NoGcLayout.java | 5 +- .../log4j/perf/nogc/ParameterizedMessage.java | 757 +++++++++++++++++++ .../log4j/perf/nogc/TextEncoderHelper.java | 108 --- .../logging/log4j/taglib/CatchingTagTest.java | 43 +- .../logging/log4j/taglib/DebugTagTest.java | 32 - .../logging/log4j/taglib/EntryTagTest.java | 36 +- .../logging/log4j/taglib/ErrorTagTest.java | 32 - .../logging/log4j/taglib/ExitTagTest.java | 36 +- .../logging/log4j/taglib/FatalTagTest.java | 32 - .../logging/log4j/taglib/IfEnabledTagTest.java | 26 +- .../logging/log4j/taglib/InfoTagTest.java | 32 - .../taglib/LoggingMessageTagSupportTest.java | 38 +- .../logging/log4j/taglib/TagLevelTest.java | 57 ++ .../logging/log4j/taglib/TagUtilsLevelTest.java | 61 ++ .../logging/log4j/taglib/TagUtilsScopeTest.java | 56 ++ .../logging/log4j/taglib/TagUtilsTest.java | 114 --- .../logging/log4j/taglib/TraceTagTest.java | 32 - .../logging/log4j/taglib/WarnTagTest.java | 32 - pom.xml | 16 +- src/changes/changes.xml | 28 +- 71 files changed, 2837 insertions(+), 1230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bb62985f/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --cc log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 9c0a13b,6a50c8d..80d4c49 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@@ -24,8 -26,8 +26,9 @@@ import org.apache.logging.log4j.message import org.apache.logging.log4j.message.FlowMessageFactory; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; +import org.apache.logging.log4j.message.MessageFactory2; import org.apache.logging.log4j.message.ParameterizedMessageFactory; + import org.apache.logging.log4j.message.ReusableParameterizedMessageFactory; import org.apache.logging.log4j.message.StringFormattedMessage; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LambdaUtil;
