Revision: 15456
Author: brainslog
Date: Tue Nov 23 09:08:34 2010
Log: Moving Diameter Stack Statistics to TRACE level + optimizations.

Updates Issue #2151
Status: Fixed
Moved logger to trace level plus optimizations:
- Verify if is loggable (even using SLF4J, it's better, so record.toString() is not called)
- Cache logger objects
- Externalize strings for better perf and mem usage
- Moved default logging interval and pause to 30s instead of 5s


http://code.google.com/p/mobicents/source/detail?r=15456

Modified:
/trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticFactory.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticLogger.java /trunk/servers/diameter/core/mux/sar-jboss-5/src/main/resources/config/jdiameter-config.xml

=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java Fri Jul 9 08:04:27 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java Tue Nov 23 09:08:34 2010
@@ -279,12 +279,12 @@
     /**
      * Statistic logger start pause
      */
- public static final Parameters StatisticLoggerPause = new Parameters("StatisticLoggerPause", Long.class, 5000L); + public static final Parameters StatisticLoggerPause = new Parameters("StatisticLoggerPause", Long.class, 30000L);

     /**
      * Statistic logger delay between save statistic information
      */
- public static final Parameters StatisticLoggerDelay = new Parameters("StatisticLoggerDelay", Long.class, 5000L); + public static final Parameters StatisticLoggerDelay = new Parameters("StatisticLoggerDelay", Long.class, 30000L);

     /**
      * Concurrent configuration root point
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticFactory.java Tue Feb 2 02:53:45 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticFactory.java Tue Nov 23 09:08:34 2010
@@ -22,7 +22,6 @@

public IStatisticRecord newCounterRecord(IStatistic.Counters recordDescription, IStatisticRecord.ValueHolder counter, IStatisticRecord... rec) { return new StatisticRecordImpl(recordDescription.name(), recordDescription.getDescription(), recordDescription.getId(), counter, rec);
-
   }

public IStatisticRecord newCounterRecord(String name, String description, int id) {
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticLogger.java Tue Feb 2 05:30:37 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/statistic/StatisticLogger.java Tue Nov 23 09:08:34 2010
@@ -4,13 +4,18 @@
 import org.jdiameter.client.impl.helpers.Parameters;
 import org.jdiameter.common.api.statistic.IStatistic;
 import org.jdiameter.common.api.statistic.IStatisticRecord;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import java.util.HashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

 public class StatisticLogger {

+ private static final String STATS_ROOT_LOGGER_NAME = "jdiameter.statistic";
+  private static final String STATS_LOGGER_PREFIX = "jdiameter.statistic.";
+
public StatisticLogger(final StatisticFactory factory, ScheduledExecutorService concurrentFactory, Configuration config) {

     long pause = (Long) Parameters.StatisticLoggerPause.defValue();
@@ -22,6 +27,8 @@
     }

     concurrentFactory.scheduleAtFixedRate(new Runnable() {
+
+      HashMap<String, Logger> loggers = new HashMap<String, Logger>();

       public void run() {
         boolean oneLine = false;
@@ -29,14 +36,27 @@
           if (statistic.isEnable()) {
             for (IStatisticRecord record : statistic.getRecords()) {
               oneLine = true;
- LoggerFactory.getLogger("jdiameter.statistic." + statistic.getName() + "." +
-                  record.getName()).debug(record.toString());
+ String loggerKey = statistic.getName() + "." + record.getName();
+              Logger logger = null;
+              if((logger = loggers.get(loggerKey)) == null) {
+ logger = LoggerFactory.getLogger(STATS_LOGGER_PREFIX + loggerKey);
+                loggers.put(loggerKey, logger);
+              }
+              if(logger.isTraceEnabled()) {
+                logger.trace(record.toString());
+              }
             }
           }
         }
         if (oneLine) {
-          LoggerFactory.getLogger("jdiameter.statistic").
- debug("=============================================== Marker ===============================================");
+          Logger logger = null;
+          if((logger = loggers.get(STATS_ROOT_LOGGER_NAME)) == null) {
+            logger = LoggerFactory.getLogger(STATS_ROOT_LOGGER_NAME);
+            loggers.put(STATS_ROOT_LOGGER_NAME, logger);
+          }
+          if(logger.isTraceEnabled()) {
+ logger.trace("=============================================== Marker ===============================================");
+          }
         }
       }
     }, pause, delay, TimeUnit.MILLISECONDS);
=======================================
--- /trunk/servers/diameter/core/mux/sar-jboss-5/src/main/resources/config/jdiameter-config.xml Mon Jul 12 06:51:57 2010 +++ /trunk/servers/diameter/core/mux/sar-jboss-5/src/main/resources/config/jdiameter-config.xml Tue Nov 23 09:08:34 2010
@@ -35,6 +35,10 @@
     <DwaTimeOut value="10000" />
     <DpaTimeOut value="5000" />
     <RecTimeOut value="10000" />
+
+    <!-- Statistics Logger Configuration -->
+    <StatisticLogger pause="30000" delay="30000" />
+
     <Concurrent>
       <Entity name="ThreadGroup" size="64"/> // Common Thread Pool
       <Entity name="ProcessingMessageTimer" size="1"/>

Reply via email to