You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/22 11:32:11 UTC

[5/6] logging-log4j2 git commit: Merge branch 'master' into gelf-layout-efficiency

Merge branch 'master' into gelf-layout-efficiency


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8167fff6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8167fff6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8167fff6

Branch: refs/heads/gelf-layout-efficiency
Commit: 8167fff6069dbb0b8a8a1b1db859dc849ee3b8c4
Parents: 901a1ac 7fca94f
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed May 18 12:56:57 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed May 18 12:56:57 2016 +0200

----------------------------------------------------------------------
 .../logging/log4j/CloseableThreadContext.java   | 195 +++++++++----------
 .../log4j/CloseableThreadContextTest.java       |  94 +++++++--
 log4j-perf/perf.txt                             |  23 +++
 .../log4j/perf/jmh/MDCFilterBenchmark.java      |  91 +++++++++
 .../log4j/perf/jmh/MarkerFilterBenchmark.java   | 105 ++++++++++
 .../main/resources/log4j2-markerFilter-perf.xml |  31 +++
 .../log4j2-threadContextFilter-perf.xml         |  33 ++++
 .../resources/logback-markerFilter-perf.xml     |  33 ++++
 .../main/resources/logback-mdcFilter-perf.xml   |  34 ++++
 pom.xml                                         |   8 +-
 src/changes/changes.xml                         | 133 +++++++------
 src/site/pdf.xml                                |   2 +-
 .../images/AsyncWithLocationThrpt1T-labeled.png | Bin 23503 -> 23273 bytes
 ...Log4j2AppenderThroughputComparison-linux.png | Bin 132814 -> 37494 bytes
 ...g4j2AppenderThroughputComparison-windows.png | Bin 167346 -> 36089 bytes
 .../images/MarkerFilterCostComparison.png       | Bin 0 -> 22737 bytes
 src/site/resources/images/ParamMsgThrpt1-4T.png | Bin 27522 -> 37465 bytes
 .../ResponseTimeAsyncClassicVsGcFree-label.png  | Bin 29217 -> 31148 bytes
 ...ResponseTimeAsyncLogging16Threads@8kEach.png | Bin 30694 -> 29429 bytes
 ...ogging16Threads@8kEachLog4j2Only-labeled.png | Bin 42723 -> 41663 bytes
 ...ResponseTimeAsyncLogging4Threads@16kEach.png | Bin 35566 -> 32664 bytes
 ...AsyncLogging4Threads@16kEachWithoutMixed.png | Bin 37846 -> 0 bytes
 .../images/ResponseTimeSyncClassicVsGcFree.png  | Bin 38428 -> 33240 bytes
 ...amAllAsyncClassicVsLog4j1-16Threads@128k.png | Bin 33079 -> 0 bytes
 .../SyncThroughputLoggerComparisonLinux.png     | Bin 28640 -> 33718 bytes
 ...SynchronousFileResponseTime2T32k-labeled.png | Bin 0 -> 31907 bytes
 .../ThreadContextFilterCostComparison.png       | Bin 0 -> 17874 bytes
 .../garbage-free2.6-SyncThroughputLinux.png     | Bin 65092 -> 24197 bytes
 src/site/site.xml                               |  13 +-
 src/site/xdoc/manual/async.xml                  |  11 +-
 src/site/xdoc/manual/garbagefree.xml            |  68 ++++---
 src/site/xdoc/manual/thread-context.xml         |  11 +-
 src/site/xdoc/performance.xml                   | 133 ++++++-------
 33 files changed, 719 insertions(+), 299 deletions(-)
----------------------------------------------------------------------