This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch scheduled-for-deletion/gelf-layout-efficiency in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8167fff6069dbb0b8a8a1b1db859dc849ee3b8c4 Merge: 901a1acb6f 7fca94f592 Author: Mikael Ståldal <[email protected]> AuthorDate: Wed May 18 12:56:57 2016 +0200 Merge branch 'master' into gelf-layout-efficiency .../logging/log4j/CloseableThreadContext.java | 195 ++++++++++----------- .../logging/log4j/CloseableThreadContextTest.java | 94 ++++++++-- log4j-perf/perf.txt | 23 +++ .../logging/log4j/perf/jmh/MDCFilterBenchmark.java | 91 ++++++++++ .../log4j/perf/jmh/MarkerFilterBenchmark.java | 105 +++++++++++ .../main/resources/log4j2-markerFilter-perf.xml | 31 ++++ .../resources/log4j2-threadContextFilter-perf.xml | 33 ++++ .../main/resources/logback-markerFilter-perf.xml | 33 ++++ .../src/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 .../Log4j2AppenderThroughputComparison-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 .../[email protected] | Bin 30694 -> 29429 bytes [email protected] | Bin 42723 -> 41663 bytes .../[email protected] | Bin 35566 -> 32664 bytes [email protected] | Bin 37846 -> 0 bytes .../images/ResponseTimeSyncClassicVsGcFree.png | Bin 38428 -> 33240 bytes [email protected] | Bin 33079 -> 0 bytes .../images/SyncThroughputLoggerComparisonLinux.png | Bin 28640 -> 33718 bytes .../SynchronousFileResponseTime2T32k-labeled.png | Bin 0 -> 31907 bytes .../images/ThreadContextFilterCostComparison.png | Bin 0 -> 17874 bytes .../images/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(-)
