You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/04 15:23:28 UTC
[50/50] [abbrv] logging-log4j2 git commit: Merge remote-tracking
branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Conflicts:
log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessageFactory.java
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2faae9c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2faae9c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2faae9c9
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 2faae9c97418fddac10c399915ef424263c3e982
Parents: 9d9d143 963f965
Author: rpopma <rp...@apache.org>
Authored: Fri Mar 4 23:22:47 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Mar 4 23:22:47 2016 +0900
----------------------------------------------------------------------
log4j-1.2-api/src/site/xdoc/index.xml | 3 +-
.../org/apache/logging/log4j/MarkerManager.java | 49 +-
.../log4j/message/ParameterizedMessage.java | 1 +
.../logging/log4j/message/ReusableMessage.java | 9 +-
.../message/ReusableParameterizedMessage.java | 6 +-
.../ReusableParameterizedMessageFactory.java | 3 +
.../logging/log4j/simple/SimpleLogger.java | 10 +-
.../logging/log4j/spi/AbstractLogger.java | 6 +-
.../apache/logging/log4j/util/LoaderUtil.java | 2 +-
.../logging/log4j/util/LowLevelLogUtil.java | 67 ++
.../log4j/util/PerformanceSensitive.java | 4 +-
.../logging/log4j/util/PropertiesUtil.java | 12 +-
.../java/org/apache/log4j/util/SerialUtil.java | 65 -
.../java/org/apache/log4j/util/StringsTest.java | 36 -
.../logging/log4j/AbstractLoggerTest.java | 2 -
.../logging/log4j/LoggerSupplierTest.java | 24 +-
.../org/apache/logging/log4j/LoggerTest.java | 1107 +++++++++---------
.../java/org/apache/logging/log4j/Timer.java | 184 ++-
.../logging/log4j/junit/BundleTestInfo.java | 66 ++
.../org/apache/logging/log4j/junit/Mutable.java | 35 +
.../apache/logging/log4j/junit/OsgiRule.java | 68 ++
.../apache/logging/log4j/junit/SerialUtil.java | 65 +
.../log4j/message/FormattedMessageTest.java | 1 +
.../log4j/message/LocalizedMessageTest.java | 1 +
.../log4j/message/MessageFormatMessageTest.java | 1 +
.../apache/logging/log4j/message/Mutable.java | 34 -
.../log4j/message/ObjectMessageTest.java | 3 +-
.../log4j/message/ParameterizedMessageTest.java | 1 +
.../message/StringFormattedMessageTest.java | 1 +
.../log4j/osgi/AbstractLoadBundleTest.java | 2 +
.../logging/log4j/osgi/BundleTestInfo.java | 80 --
.../org/apache/logging/log4j/osgi/OsgiRule.java | 69 --
.../logging/log4j/util/ReflectionUtilTest.java | 2 +
.../apache/logging/log4j/util/StringsTest.java | 9 +
.../logging/log4j/core/AbstractLifeCycle.java | 6 +-
.../logging/log4j/core/AbstractLogEvent.java | 10 +
.../org/apache/logging/log4j/core/LogEvent.java | 18 +-
.../logging/log4j/core/LoggerContext.java | 1 -
.../log4j/core/appender/AbstractAppender.java | 2 -
.../appender/AbstractOutputStreamAppender.java | 2 -
.../core/appender/AbstractWriterAppender.java | 2 -
.../log4j/core/appender/AsyncAppender.java | 1 -
.../log4j/core/appender/ConsoleAppender.java | 3 +-
.../core/appender/DefaultErrorHandler.java | 5 +-
.../log4j/core/appender/FailoverAppender.java | 2 -
.../log4j/core/appender/FileAppender.java | 1 -
.../core/appender/MemoryMappedFileAppender.java | 2 -
.../core/appender/OutputStreamAppender.java | 2 -
.../core/appender/RandomAccessFileAppender.java | 2 -
.../core/appender/RollingFileAppender.java | 1 -
.../RollingRandomAccessFileAppender.java | 3 -
.../log4j/core/appender/SmtpAppender.java | 1 -
.../log4j/core/appender/SocketAppender.java | 2 -
.../log4j/core/appender/SyslogAppender.java | 1 -
.../log4j/core/appender/WriterAppender.java | 2 -
.../appender/db/AbstractDatabaseAppender.java | 1 -
.../core/appender/db/jdbc/JdbcAppender.java | 1 -
.../db/jpa/AbstractLogEventWrapperEntity.java | 20 +
.../appender/db/jpa/BasicLogEventEntity.java | 22 +
.../log4j/core/appender/db/jpa/JpaAppender.java | 1 -
.../log4j/core/appender/mom/JmsAppender.java | 1 -
.../appender/mom/jeromq/JeroMqAppender.java | 17 +-
.../core/appender/mom/kafka/KafkaAppender.java | 10 +-
.../core/appender/rewrite/RewriteAppender.java | 2 -
.../rolling/DefaultRolloverStrategy.java | 4 +-
.../action/PathSortByModificationTime.java | 6 +-
.../core/appender/routing/IdlePurgePolicy.java | 99 +-
.../core/appender/routing/RoutingAppender.java | 3 +-
.../logging/log4j/core/async/AsyncLogger.java | 18 +-
.../log4j/core/async/AsyncLoggerConfig.java | 6 +-
.../log4j/core/async/AsyncLoggerContext.java | 2 -
.../log4j/core/async/RingBufferLogEvent.java | 35 +-
.../async/RingBufferLogEventTranslator.java | 28 +-
.../core/async/ThreadNameCachingStrategy.java | 5 +-
.../core/config/AbstractConfiguration.java | 40 +-
.../log4j/core/config/AppenderControl.java | 1 -
.../core/config/ConfigurationScheduler.java | 1 -
.../core/config/ConfiguratonFileWatcher.java | 4 +-
.../log4j/core/config/DefaultAdvertiser.java | 5 +-
.../log4j/core/config/DefaultConfiguration.java | 2 -
.../logging/log4j/core/config/LoggerConfig.java | 1 -
.../log4j/core/config/NullConfiguration.java | 1 -
.../log4j/core/config/OrderComparator.java | 4 +-
.../core/config/json/JsonConfiguration.java | 21 +-
.../config/plugins/processor/PluginEntry.java | 2 +-
.../core/config/plugins/util/PluginBuilder.java | 11 +-
.../properties/PropertiesConfiguration.java | 6 +-
.../log4j/core/config/xml/XmlConfiguration.java | 2 -
.../core/config/yaml/YamlConfiguration.java | 2 -
.../log4j/core/filter/AbstractFilter.java | 2 -
.../log4j/core/filter/AbstractFilterable.java | 2 -
.../logging/log4j/core/filter/BurstFilter.java | 7 +-
.../log4j/core/filter/CompositeFilter.java | 2 -
.../core/filter/DynamicThresholdFilter.java | 2 -
.../log4j/core/filter/LevelRangeFilter.java | 2 -
.../logging/log4j/core/filter/MapFilter.java | 2 -
.../logging/log4j/core/filter/MarkerFilter.java | 2 -
.../logging/log4j/core/filter/RegexFilter.java | 2 -
.../logging/log4j/core/filter/ScriptFilter.java | 1 -
.../log4j/core/filter/StructuredDataFilter.java | 2 -
.../core/filter/ThreadContextMapFilter.java | 2 -
.../log4j/core/filter/ThresholdFilter.java | 2 -
.../logging/log4j/core/filter/TimeFilter.java | 37 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 96 +-
.../log4j/core/jackson/LogEventMixIn.java | 10 +
.../apache/logging/log4j/core/jmx/Server.java | 1 -
.../log4j/core/layout/AbstractCsvLayout.java | 1 -
.../core/layout/AbstractJacksonLayout.java | 1 -
.../log4j/core/layout/AbstractLayout.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java | 16 -
.../log4j/core/layout/CsvLogEventLayout.java | 4 +-
.../log4j/core/layout/CsvParameterLayout.java | 2 -
.../logging/log4j/core/layout/GelfLayout.java | 3 +-
.../logging/log4j/core/layout/HtmlLayout.java | 1 -
.../logging/log4j/core/layout/JsonLayout.java | 2 -
.../log4j/core/layout/PatternLayout.java | 2 -
.../logging/log4j/core/layout/PatternMatch.java | 20 +-
.../log4j/core/layout/Rfc5424Layout.java | 2 -
.../log4j/core/layout/SerializedLayout.java | 2 -
.../logging/log4j/core/layout/SyslogLayout.java | 2 -
.../log4j/core/layout/TextEncoderHelper.java | 19 +-
.../logging/log4j/core/layout/XmlLayout.java | 2 -
.../logging/log4j/core/lookup/MapLookup.java | 2 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 34 +-
.../logging/log4j/core/osgi/Activator.java | 6 +-
.../core/pattern/DatePatternConverter.java | 4 +-
.../log4j/core/pattern/MaxLengthConverter.java | 103 ++
.../core/pattern/MessagePatternConverter.java | 1 -
.../log4j/core/pattern/NdcPatternConverter.java | 52 +-
.../core/pattern/ThreadIdPatternConverter.java | 61 +
.../pattern/ThreadNamePatternConverter.java | 59 +
.../core/pattern/ThreadPatternConverter.java | 59 -
.../pattern/ThreadPriorityPatternConverter.java | 61 +
.../util/DefaultShutdownCallbackRegistry.java | 4 +-
.../logging/log4j/core/util/KeyValuePair.java | 22 +-
.../logging/log4j/core/util/WatchManager.java | 13 +-
.../core/util/datetime/FixedDateFormat.java | 6 +-
log4j-core/src/main/resources/Log4j-events.dtd | 4 +-
log4j-core/src/main/resources/Log4j-events.xsd | 2 +
.../log4j/core/BasicConfigurationFactory.java | 1 -
.../apache/logging/log4j/core/LogEventTest.java | 2 +
.../log4j/core/TimestampMessageTest.java | 7 +-
.../MemoryMappedFileAppenderLocationTest.java | 2 +-
.../MemoryMappedFileAppenderRemapTest.java | 2 +-
.../MemoryMappedFileAppenderSimpleTest.java | 2 +-
.../db/AbstractDatabaseAppenderTest.java | 2 -
.../core/appender/db/jpa/JpaH2AppenderTest.java | 2 +-
.../db/jpa/JpaHyperSqlAppenderTest.java | 2 +-
.../core/appender/db/jpa/TestBaseEntity.java | 12 +
.../appender/mom/jeromq/JeroMqAppenderTest.java | 6 +-
.../appender/rolling/PatternProcessorTest.java | 1 -
...ollingAppenderNoUnconditionalDeleteTest.java | 22 +-
.../core/async/RingBufferLogEventTest.java | 10 +-
.../async/perftest/CountingNoOpAppender.java | 4 -
.../log4j/core/async/perftest/PerfTest.java | 4 +-
.../core/async/perftest/PerfTestDriver.java | 2 +-
.../async/perftest/PerfTestResultFormatter.java | 4 +-
.../core/async/perftest/SimplePerfTest.java | 1 -
.../log4j/core/async/perftest/SimplePerfTest.sh | 22 +
...DynamicThresholdFilterSerializationTest.java | 47 -
.../log4j/core/impl/Log4jLogEventTest.java | 3 +-
.../core/layout/SerializableLayoutTest.java | 66 --
.../log4j/core/lookup/MapLookupTest.java | 25 +
.../log4j/core/net/server/ThreadIdFilter.java | 40 +
.../log4j/core/net/server/ThreadNameFilter.java | 3 +
.../core/net/server/ThreadPriorityFilter.java | 40 +
.../core/pattern/MaxLengthConverterTest.java | 73 ++
.../log4j/core/pattern/PatternParserTest.java | 60 +
.../pattern/ThreadIdPatternConverterTest.java | 39 +
.../pattern/ThreadNamePatternConverterTest.java | 39 +
.../ThreadPriorityPatternConverterTest.java | 39 +
.../log4j/core/util/CronExpressionTest.java | 1 -
.../util/KeyValuePairSerializationTest.java | 39 -
.../log4j/core/util/WatchManagerTest.java | 8 +-
.../log4j/test/appender/AlwaysFailAppender.java | 2 -
.../logging/log4j/test/layout/BasicLayout.java | 1 -
.../log4j/test/layout/SerializableLayout.java | 48 -
.../src/test/resources/JeroMqAppenderTest.xml | 3 +-
.../log4j/flume/appender/FlumeAppender.java | 1 -
.../log4j/flume/appender/FlumeEvent.java | 18 +
log4j-flume-ng/src/site/xdoc/index.xml.vm | 1 +
log4j-iostreams/src/site/xdoc/index.xml | 1 +
.../logging/log4j/io/AbstractStreamTest.java | 2 +-
log4j-jcl/src/site/xdoc/index.xml | 3 +-
log4j-jmx-gui/src/site/xdoc/index.xml | 3 +-
.../log4j/jul/DefaultLevelConverter.java | 4 +-
log4j-jul/src/site/xdoc/index.xml | 1 +
.../logging/log4j/jul/AbstractLoggerTest.java | 4 +-
log4j-liquibase/src/site/xdoc/index.xml | 3 +-
.../log4j/nosql/appender/NoSqlAppender.java | 1 -
.../nosql/appender/NoSqlDatabaseManager.java | 2 +
log4j-nosql/src/site/xdoc/index.xml.vm | 1 +
.../appender/NoSqlDatabaseManagerTest.java | 6 +
.../log4j/perf/jmh/CollectionsBenchmark.java | 12 +-
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 8 +-
.../perf/jmh/TextEncoderHelperBenchmark.java | 243 ++++
.../perf/jmh/ThreadLocalVsPoolBenchmark.java | 2 +-
.../logging/log4j/perf/nogc/AbstractLogger.java | 3 +-
.../logging/log4j/perf/nogc/DemoAppender.java | 3 +-
.../logging/log4j/perf/nogc/NoGcLayout.java | 6 +-
.../logging/log4j/perf/nogc/NoGcLogger.java | 2 +-
.../logging/log4j/perf/nogc/NoGcMessage.java | 6 +-
.../perf/nogc/NoGcMessagePatternConverter.java | 3 -
.../CustomConfigurationFactory.java | 2 -
.../configuration/CustomConfigurationTest.java | 2 +-
log4j-slf4j-impl/src/site/xdoc/index.xml | 3 +-
.../org/apache/logging/slf4j/Log4j1222Test.java | 1 -
log4j-taglib/src/site/xdoc/index.xml | 3 +-
.../logging/log4j/taglib/CatchingTagTest.java | 6 +-
.../logging/log4j/taglib/EnterTagTest.java | 79 ++
.../logging/log4j/taglib/EntryTagTest.java | 79 --
log4j-to-slf4j/src/site/xdoc/index.xml | 7 +-
.../log4j/web/Log4jServletContextListener.java | 3 +-
.../log4j/web/Log4jWebInitializerImpl.java | 2 -
.../log4j/web/appender/ServletAppender.java | 2 -
log4j-web/src/site/xdoc/index.xml | 3 +-
.../web/Log4jServletContextListenerTest.java | 11 -
pom.xml | 2 +-
src/changes/changes.xml | 30 +
src/site/xdoc/manual/layouts.xml.vm | 66 +-
220 files changed, 2655 insertions(+), 1902 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2faae9c9/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessageFactory.java
----------------------------------------------------------------------
diff --cc log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessageFactory.java
index b14d606,0950d5d..b5f6da0
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessageFactory.java
@@@ -25,7 -27,8 +27,8 @@@ import org.apache.logging.log4j.util.Pe
* This class is immutable.
* </p>
*/
+ @PerformanceSensitive("allocation")
-public final class ReusableParameterizedMessageFactory extends AbstractMessageFactory {
+public final class ReusableParameterizedMessageFactory extends AbstractMessageFactory implements MessageFactory2 {
/**
* Instance of ReusableParameterizedMessageFactory.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2faae9c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2faae9c9/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
----------------------------------------------------------------------