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/04/21 07:26:22 UTC
[1/3] logging-log4j2 git commit: javadoc
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3095a9c07 -> 8af151ff6
javadoc
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/736cc4e0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/736cc4e0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/736cc4e0
Branch: refs/heads/master
Commit: 736cc4e091cacdf8ab02b54995d28f62add37df0
Parents: ddb2ca9
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 21 14:22:02 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 21 14:22:02 2016 +0900
----------------------------------------------------------------------
.../log4j/core/async/perftest/IdleStrategy.java | 24 +-------------------
.../core/async/perftest/NoOpIdleStrategy.java | 7 ++++--
2 files changed, 6 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/736cc4e0/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
index eca115c..65b97df 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
@@ -19,11 +19,6 @@ package org.apache.logging.log4j.core.async.perftest;
/**
* Idle strategy for use by threads when they do not have work to do.
*
- * <h3>Note regarding implementor state</h3>
- *
- * Some implementations are known to be stateful, please note that you cannot safely assume implementations to be stateless.
- * Where implementations are stateful it is recommended that implementation state is padded to avoid false sharing.
- *
* <h3>Note regarding potential for TTSP(Time To Safe Point) issues</h3>
*
* If the caller spins in a 'counted' loop, and the implementation does not include a a safepoint poll this may cause a TTSP
@@ -36,24 +31,7 @@ package org.apache.logging.log4j.core.async.perftest;
*/
interface IdleStrategy {
/**
- * Perform current idle action (e.g. nothing/yield/sleep). To be used in conjunction with {@link IdleStrategy#reset()}
- * to clear internal state when idle period is over (or before it begins). Callers are expected to follow this pattern:
- *
- * <pre>
- * <code>while (isRunning) {
- * if (!hasWork()) {
- * idleStrategy.reset();
- * while (!hasWork()) {
- * if (!isRunning) {
- * return;
- * }
- * idleStrategy.idle();
- * }
- * }
- * doWork();
- * }
- * </code>
- * </pre>
+ * Perform current idle action (e.g. nothing/yield/sleep).
*/
void idle();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/736cc4e0/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java
index ad5d280..6bce312 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java
@@ -17,8 +17,11 @@
package org.apache.logging.log4j.core.async.perftest;
/**
- * Low-latency idle strategy to be employed in loops that do significant work on each iteration such that any work in the
- * idle strategy would be wasteful.
+ * No operation idle strategy.
+ * <p>
+ * This idle strategy should be prevented from being inlined by using a Hotspot compiler command as a JVM argument e.g:
+ * <code>-XX:CompileCommand=dontinline,org.apache.logging.log4j.core.async.perftest.NoOpIdleStrategy::idle</code>
+ * </p>
*/
class NoOpIdleStrategy implements IdleStrategy {
[2/3] logging-log4j2 git commit: cleanup
Posted by rp...@apache.org.
cleanup
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4673aef5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4673aef5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4673aef5
Branch: refs/heads/master
Commit: 4673aef5a2107b28dbce63cb09fc3af92674c6a8
Parents: 736cc4e
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 21 14:23:18 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 21 14:23:18 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/core/async/perftest/SimpleLatencyTest.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4673aef5/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimpleLatencyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimpleLatencyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimpleLatencyTest.java
index 73e7138..cad4e55 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimpleLatencyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimpleLatencyTest.java
@@ -85,13 +85,6 @@ public class SimpleLatencyTest {
final long nanoTimeCost = PerfTest.calcNanoTimeCost();
System.out.println("nanoTimeCost=" + nanoTimeCost);
-// long maxOpsPerSec = 1000 * 1000; // just assume... TODO make parameter
-//
-// long oneOpDurationNanos = TimeUnit.SECONDS.toNanos(1) / maxOpsPerSec;
-// long idleTimeNanos = (long) ((1.0 - targetLoadLevel) * oneOpDurationNanos);
-// idleTimeNanos *= 10;
-// System.out.printf("Idle time is %d nanos at %,f load level%n", idleTimeNanos, targetLoadLevel);
-
final long interval = TimeUnit.MICROSECONDS.toNanos(intervalMicros);// * threadCount;
System.out.printf("%d threads, interval is %d nanos%n", threadCount, interval);
@@ -101,6 +94,7 @@ public class SimpleLatencyTest {
final int WARMUP_COUNT = 50000 / threadCount;
final IdleStrategy idleStrategy = new YieldIdleStrategy();
runLatencyTest(logger, WARMUP_DURATION_MILLIS, WARMUP_COUNT, interval, idleStrategy, warmupHistograms, nanoTimeCost, threadCount);
+ System.out.println("Warmup done.");
Thread.sleep(1000);
long start = System.currentTimeMillis();
[3/3] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8af151ff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8af151ff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8af151ff
Branch: refs/heads/master
Commit: 8af151ff62055cf737129a84b5c71da271fa277e
Parents: 4673aef 3095a9c
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 21 14:26:32 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 21 14:26:32 2016 +0900
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 72 +++++++++++++++++
.../impl/DefaultConfigurationBuilder.java | 54 +++++++++++--
.../impl/DefaultLoggerComponentBuilder.java | 29 +++++++
.../impl/DefaultRootLoggerComponentBuilder.java | 27 +++++++
.../PropertiesConfigurationBuilder.java | 32 +++++++-
.../log4j/core/layout/JacksonFactory.java | 41 +++++++++-
.../appender/RandomAccessFileAppenderTests.java | 15 ++--
.../appender/XmlCompleteFileAppenderTest.java | 82 ++++++++++++++++++++
.../core/appender/XmlFileAppenderTest.java | 1 +
...cessFileAppenderLocationPropsTest.properties | 35 +++++++++
src/changes/changes.xml | 12 ++-
11 files changed, 378 insertions(+), 22 deletions(-)
----------------------------------------------------------------------