X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-jul%2Forg%2Flttng%2Fust%2Fjul%2FLTTngLogHandler.java;h=008b105ba916a67b3f109e34ecb6afe227f2c370;hb=6de95b2897a8badebcc281b9eafc1481c9f23903;hp=d2d5587489b26ff4797967756c35c4cef87e0ec3;hpb=a15440fd233e9b45850475344d627683a79dd9af;p=lttng-ust.git

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
index d2d55874..008b105b 100644
--- a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
+++ b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
@@ -22,63 +22,34 @@ import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.LogManager;
 import java.util.logging.Level;
+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;
-}
-
-class LTTngLogLevel {
-	/* Event name on which this loglevel is applied on. */
-	private String event_name;
-	/* This level is a JUL int level value. */
-	private int level;
-	private int type;
-
-	public LTTngLogLevel(String event_name, int level, int type) {
-		this.event_name = event_name;
-		this.type = type;
-		this.level = level;
-	}
-
-	public String getName() {
-		return this.event_name;
-	}
-
-	public int getLevel() {
-		return this.level;
-	}
-
-	public int getType() {
-		return this.type;
-	}
-}
-
 public class LTTngLogHandler extends Handler {
-	public LogManager logManager;
+	/* Am I a root Log Handler. */
+	public int is_root = 0;
+	public int refcount = 0;
 
-	private HashMap<String, LTTngLogLevel> logLevels =
-		new HashMap<String, LTTngLogLevel>();
+	/* Logger object attached to this handler that can trigger a tracepoint. */
+	public Map<String, LTTngEvent> enabledEvents =
+		Collections.synchronizedMap(new HashMap<String, LTTngEvent>());
 
-	public LTTngLogHandler(LogManager logManager) {
+	/* Constructor */
+	public LTTngLogHandler() {
 		super();
-
-		this.logManager = logManager;
-
 		/* Initialize LTTng UST tracer. */
 		LTTngUst.init();
 	}
 
-	public void setLogLevel(String event_name, int level, int type) {
-		LTTngLogLevel lttngLogLevel = new LTTngLogLevel(event_name, level,
-				type);
-		logLevels.put(event_name, lttngLogLevel);
+	/*
+	 * Cleanup this handler state meaning put it back to a vanilla state.
+	 */
+	public void clear() {
+		this.enabledEvents.clear();
 	}
 
 	@Override
@@ -89,48 +60,21 @@ public class LTTngLogHandler extends Handler {
 
 	@Override
 	public void publish(LogRecord record) {
-		int fire_tp = 0, rec_log_level, ev_type, ev_log_level;
-		LTTngLogLevel lttngLogLevel;
-		String event_name = record.getLoggerName();
-
-		lttngLogLevel = logLevels.get(event_name);
-		if (lttngLogLevel != null) {
-			rec_log_level = record.getLevel().intValue();
-			ev_log_level = lttngLogLevel.getLevel();
-			ev_type = lttngLogLevel.getType();
-
-			switch (ev_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;
-			}
-		} 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
 		 * loglevel of the record and the thread ID.
 		 */
-		LTTngUst.tracepoint(record.getMessage(), record.getLoggerName(),
-				record.getSourceClassName(), record.getSourceMethodName(),
-				record.getMillis(), record.getLevel().intValue(),
-				record.getThreadID());
+		if (this.is_root == 1) {
+			LTTngUst.tracepointS(record.getMessage(),
+					record.getLoggerName(), record.getSourceClassName(),
+					record.getSourceMethodName(), record.getMillis(),
+					record.getLevel().intValue(), record.getThreadID());
+		} else {
+			LTTngUst.tracepointU(record.getMessage(),
+					record.getLoggerName(), record.getSourceClassName(),
+					record.getSourceMethodName(), record.getMillis(),
+					record.getLevel().intValue(), record.getThreadID());
+		}
 	}
 }