Fix: add LTTngEvent class to fix delayed logger

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

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
index b89deb818c4702514d86842570abf9a9aac16dcd..25d1cb2e11662b9a2587ae1be0b4e2a706d0549d 100644 (file)
--- a/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
+++ b/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
@@ -29,9 +29,11 @@ import java.io.DataInputStream;
 import java.net.*;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Logger;
 
 class USTRegisterMsg {
        public static int pid;
@@ -55,7 +57,11 @@ public class LTTngTCPSessiondClient {
        private Semaphore registerSem;
 
        private Timer eventTimer;
-       private List<String> enabledEventList = new ArrayList<String>();
+       private List<LTTngEvent> enabledEventList = new ArrayList<LTTngEvent>();
+       /*
+        * Map of Logger objects that have been enabled. They are indexed by name.
+        */
+       private HashMap<String, Logger> enabledLoggers = new HashMap<String, Logger>();
        /* Timer delay at each 5 seconds. */
        private final static long timerDelay = 5 * 1000;
        private static boolean timerInitialized;
@@ -80,14 +86,59 @@ public class LTTngTCPSessiondClient {
                                 * We have to make a copy here since it is possible that the
                                 * enabled event list is changed during an iteration on it.
                                 */
-                               List<String> tmpList = new ArrayList<String>(enabledEventList);
+                               List<LTTngEvent> tmpList = new ArrayList<LTTngEvent>(enabledEventList);
 
                                LTTngSessiondCmd2_4.sessiond_enable_handler enableCmd = new
                                        LTTngSessiondCmd2_4.sessiond_enable_handler();
-                               for (String strEventName: tmpList) {
-                                       enableCmd.name = strEventName;
-                                       if (enableCmd.execute(handler) == null) {
-                                               enabledEventList.remove(strEventName);
+                               for (LTTngEvent event: tmpList) {
+                                       int ret;
+                                       Logger logger;
+
+                                       /*
+                                        * Check if this Logger name has been enabled already. Note
+                                        * that in the case of "*", it's never added in that hash
+                                        * table thus the enable command does a lookup for each
+                                        * logger name in that hash table for the * case in order
+                                        * to make sure we don't enable twice the same logger
+                                        * because JUL apparently accepts that the *same*
+                                        * LogHandler can be added twice on a Logger object...
+                                        * don't ask...
+                                        */
+                                       logger = enabledLoggers.get(event.name);
+                                       if (logger != null) {
+                                               continue;
+                                       }
+
+                                       /*
+                                        * Set to one means that the enable all event has been seen
+                                        * thus event from that point on must use loglevel for all
+                                        * events. Else the object has its own loglevel.
+                                        */
+                                       if (handler.logLevelUseAll == 1) {
+                                               event.logLevel.level = handler.logLevelAll;
+                                               event.logLevel.type = handler.logLevelTypeAll;
+                                       }
+
+                                       /*
+                                        * The all event is a special case since we have to iterate
+                                        * over every Logger to see which one was not enabled.
+                                        */
+                                       if (event.name.equals("*")) {
+                                               enableCmd.name = event.name;
+                                               enableCmd.lttngLogLevel = event.logLevel.level;
+                                               enableCmd.lttngLogLevelType = event.logLevel.type;
+                                               /*
+                                                * The return value is irrelevant since the * event is
+                                                * always kept in the list.
+                                                */
+                                               enableCmd.execute(handler, enabledLoggers);
+                                               continue;
+                                       }
+
+                                       ret = enableCmd.enableLogger(handler, event, enabledLoggers);
+                                       if (ret == 1) {
+                                               /* Enabled so remove the event from the list. */
+                                               enabledEventList.remove(event);
                                        }
                                }
                        }
@@ -212,7 +263,7 @@ public class LTTngTCPSessiondClient {
                                }
                                case CMD_ENABLE:
                                {
-                                       String event_name;
+                                       LTTngEvent event;
                                        LTTngSessiondCmd2_4.sessiond_enable_handler enableCmd =
                                                new LTTngSessiondCmd2_4.sessiond_enable_handler();
                                        if (data == null) {
@@ -220,13 +271,15 @@ public class LTTngTCPSessiondClient {
                                                break;
                                        }
                                        enableCmd.populate(data);
-                                       event_name = enableCmd.execute(this.handler);
-                                       if (event_name != null) {
+                                       event = enableCmd.execute(this.handler, this.enabledLoggers);
+                                       if (event != null) {
                                                /*
                                                 * Add the event to the list so it can be enabled if
                                                 * the logger appears at some point in time.
                                                 */
-                                               enabledEventList.add(event_name);
+                                               if (enabledEventList.contains(event) == false) {
+                                                       enabledEventList.add(event);
+                                               }
                                        }
                                        data = enableCmd.getBytes();
                                        break;