You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/10/11 09:02:01 UTC

svn commit: r1707952 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging: EffectiveLevelFilter.java LoggerNameAndLevelFilter.java QpidLoggerTurboFilter.java

Author: kwall
Date: Sun Oct 11 07:02:01 2015
New Revision: 1707952

URL: http://svn.apache.org/viewvc?rev=1707952&view=rev
Log:
QPID-6785: Improve performance of QpidLoggerTurboFilter #2

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java?rev=1707952&r1=1707951&r2=1707952&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java Sun Oct 11 07:02:01 2015
@@ -25,5 +25,7 @@ import ch.qos.logback.classic.Logger;
 
 public interface EffectiveLevelFilter
 {
+    Level getLevel();
+
     Level getEffectiveLevel(Logger logger);
 }

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java?rev=1707952&r1=1707951&r2=1707952&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java Sun Oct 11 07:02:01 2015
@@ -50,6 +50,7 @@ public class LoggerNameAndLevelFilter ex
         _level = level;
     }
 
+    @Override
     public Level getLevel()
     {
         return _level;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java?rev=1707952&r1=1707951&r2=1707952&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java Sun Oct 11 07:02:01 2015
@@ -36,16 +36,17 @@ import org.slf4j.Marker;
 public final class QpidLoggerTurboFilter extends TurboFilter
 {
     private final CopyOnWriteArrayList<EffectiveLevelFilter> _filters = new CopyOnWriteArrayList<>();
-    private final AtomicReference<ConcurrentMap<Logger, Level>> _effectiveLevels =
+    private final AtomicReference<ConcurrentMap<Logger, Integer>> _effectiveLevels =
             new AtomicReference<>();
+    private volatile int _minimumFilterLevel = Level.OFF.levelInt;
+    /** Ensures updates to _minimumLogLevel are single threaded */
+    private final Object _minimumFilterLevelUpdateLock = new Object();
 
     public QpidLoggerTurboFilter()
     {
-        clearCachedResults();
+        resetCacheAndSetMinimumLevel();
     }
 
-
-
     @Override
     public FilterReply decide(final Marker marker,
                               final Logger logger,
@@ -54,16 +55,21 @@ public final class QpidLoggerTurboFilter
                               final Object[] params,
                               final Throwable t)
     {
-        final ConcurrentMap<Logger, Level> effectiveLevels = _effectiveLevels.get();
-        Level effectiveLoggerLevel = effectiveLevels.get(logger);
+        if (level.levelInt  < _minimumFilterLevel)
+        {
+            // Optimisation - no filters accept an event with this level
+            return FilterReply.DENY;
+        }
 
+        final ConcurrentMap<Logger, Integer> effectiveLevels = _effectiveLevels.get();
+        Integer effectiveLoggerLevel = effectiveLevels.get(logger);
         if(effectiveLoggerLevel == null)
         {
-            effectiveLoggerLevel = Level.OFF;
-            for(EffectiveLevelFilter filter : _filters)
+            effectiveLoggerLevel = Level.OFF.levelInt;
+            for (EffectiveLevelFilter filter : _filters)
             {
-                Level loggerLevel = filter.getEffectiveLevel(logger);
-                if(effectiveLoggerLevel.isGreaterOrEqual(loggerLevel))
+                Integer loggerLevel = filter.getEffectiveLevel(logger).levelInt;
+                if (effectiveLoggerLevel >= loggerLevel)
                 {
                     effectiveLoggerLevel = loggerLevel;
                 }
@@ -71,28 +77,22 @@ public final class QpidLoggerTurboFilter
             effectiveLevels.putIfAbsent(logger, effectiveLoggerLevel);
         }
 
-
-        return level.isGreaterOrEqual(effectiveLoggerLevel) ? FilterReply.ACCEPT : FilterReply.DENY;
+        return level.levelInt >= effectiveLoggerLevel ? FilterReply.ACCEPT : FilterReply.DENY;
     }
 
     public void filterAdded(EffectiveLevelFilter filter)
     {
         if(_filters.addIfAbsent(filter))
         {
-            clearCachedResults();
+            resetCacheAndSetMinimumLevel();
         }
     }
 
-    private void clearCachedResults()
-    {
-        _effectiveLevels.set(new ConcurrentHashMap<Logger, Level>());
-    }
-
     public void filterRemoved(EffectiveLevelFilter filter)
     {
         if(_filters.remove(filter))
         {
-            clearCachedResults();
+            resetCacheAndSetMinimumLevel();
         }
     }
 
@@ -100,7 +100,23 @@ public final class QpidLoggerTurboFilter
     {
         if(_filters.contains(filter))
         {
-            clearCachedResults();
+            resetCacheAndSetMinimumLevel();
+        }
+    }
+
+    private void resetCacheAndSetMinimumLevel()
+    {
+        // Disable the 'decide' optimisation until the new minimum is established
+        _minimumFilterLevel = Level.ALL.levelInt;
+        _effectiveLevels.set(new ConcurrentHashMap<Logger, Integer>());
+        synchronized (_minimumFilterLevelUpdateLock)
+        {
+            int newMinimumLogLevel = Level.OFF.levelInt;
+            for (EffectiveLevelFilter filter : _filters)
+            {
+                newMinimumLogLevel = Math.min(filter.getLevel().levelInt, newMinimumLogLevel);
+            }
+            _minimumFilterLevel = newMinimumLogLevel;
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org