JUL: use root logger to capture events

[lttng-ust.git] / liblttng-ust-jul / org / lttng / ust / jul / LTTngLogHandler.java

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
index ddeb5eb3b36e9e04cba608cbd0a17539a948c265..4c617fb91918f0afe192b66836782bb2178b6d68 100644 (file)
--- a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
+++ b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
@@ -22,37 +22,25 @@ import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.LogManager;
 import java.util.logging.Level;
-import java.util.ArrayList;
+import java.util.logging.Logger;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.lttng.ust.jul.LTTngUst;
 
-/* Note: This is taken from the LTTng tools ABI. */
-class LTTngLogLevelABI {
-       /* Loglevel type. */
-       public static final int LOGLEVEL_TYPE_ALL = 0;
-       public static final int LOGLEVEL_TYPE_RANGE = 1;
-       public static final int LOGLEVEL_TYPE_SINGLE = 2;
-}
-
 public class LTTngLogHandler extends Handler {
-       /*
-        * Indicate if the enable all event has been seen and if yes logger that we
-        * enabled should use the loglevel/type below.
-        */
-       public int logLevelUseAll = 0;
-       public ArrayList<LTTngLogLevel> logLevelsAll =
-               new ArrayList<LTTngLogLevel>();
-
        /* Am I a root Log Handler. */
        public int is_root = 0;
+       public int refcount = 0;
 
        public LogManager logManager;
 
-       /* Indexed by name and corresponding LTTngEvent. */
-       private HashMap<String, LTTngEvent> eventMap =
-               new HashMap<String, LTTngEvent>();
+       /* Logger object attached to this handler that can trigger a tracepoint. */
+       public Map<String, LTTngEvent> enabledEvents =
+               Collections.synchronizedMap(new HashMap<String, LTTngEvent>());
 
+       /* Constructor */
        public LTTngLogHandler(LogManager logManager) {
                super();
 
@@ -62,33 +50,11 @@ public class LTTngLogHandler extends Handler {
                LTTngUst.init();
        }
 
-       /**
-        * Add event to handler hash map if new.
-        *
-        * @return 0 if it did not exist else 1.
-        */
-       public int setEvent(LTTngEvent new_event) {
-               LTTngEvent event;
-
-               event = eventMap.get(new_event.name);
-               if (event == null) {
-                       eventMap.put(new_event.name, new_event);
-                       /* Did not exists. */
-                       return 0;
-               } else {
-                       /* Add new event loglevel to existing event. */
-                       event.logLevels.addAll(new_event.logLevels);
-                       /* Already exists. */
-                       return 1;
-               }
-       }
-
        /*
         * Cleanup this handler state meaning put it back to a vanilla state.
         */
        public void clear() {
-               this.eventMap.clear();
-               this.logLevelsAll.clear();
+               this.enabledEvents.clear();
        }
 
        @Override
@@ -99,52 +65,6 @@ public class LTTngLogHandler extends Handler {
 
        @Override
        public void publish(LogRecord record) {
-               int fire_tp = 0, rec_log_level, ev_type, ev_log_level;
-               LTTngEvent event;
-               LTTngLogLevel lttngLogLevel;
-               String logger_name = record.getLoggerName();
-
-               /* Get back the event if any and check for loglevel. */
-               event = eventMap.get(logger_name);
-               if (event != null) {
-                       for (LTTngLogLevel ev_log : event.logLevels) {
-                               /* Get record and event log level. */
-                               rec_log_level = record.getLevel().intValue();
-                               ev_log_level = ev_log.level;
-
-                               switch (ev_log.type) {
-                               case LTTngLogLevelABI.LOGLEVEL_TYPE_RANGE:
-                                       if (ev_log_level <= rec_log_level) {
-                                               fire_tp = 1;
-                                       }
-                                       break;
-                               case LTTngLogLevelABI.LOGLEVEL_TYPE_SINGLE:
-                                       if (ev_log_level == rec_log_level) {
-                                               fire_tp = 1;
-                                       }
-                                       break;
-                               case LTTngLogLevelABI.LOGLEVEL_TYPE_ALL:
-                                       fire_tp = 1;
-                                       break;
-                               }
-
-                               /*
-                                * If we match, stop right now else continue to the next
-                                * loglevel contained in the event.
-                                */
-                               if (fire_tp == 1) {
-                                       break;
-                               }
-                       }
-               } else {
-                       /* No loglevel attached thus fire tracepoint. */
-                       fire_tp = 1;
-               }
-
-               if (fire_tp == 0) {
-                       return;
-               }
-
                /*
                 * Specific tracepoing designed for JUL events. The source class of the
                 * caller is used for the event name, the raw message is taken, the