Added domains in logs and domain specific message levels filtering.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4500 818b1a75-f10b-46b9-bf7c-635c3b92a50f

common/utils/itti_analyzer/itti_analyzer.c

@@ -15,18 +15,25 @@
 
 #include "rc.h"
 
+#define G_LOG_LEVELS (G_LOG_LEVEL_ERROR     | \
+                      G_LOG_LEVEL_CRITICAL  | \
+                      G_LOG_LEVEL_WARNING   | \
+                      G_LOG_LEVEL_MESSAGE   | \
+                      G_LOG_LEVEL_INFO      | \
+                      G_LOG_LEVEL_DEBUG)
+
 int debug_buffers = 1;
 int debug_parser = 0;
 
-static void
-console_log_handler(const char *log_domain, GLogLevelFlags log_level,
-                    const char *message, gpointer user_data)
+static void console_log_handler(const char *log_domain, GLogLevelFlags log_level,
+                                const char *message, gpointer user_data)
 {
+    GLogLevelFlags domain_log_level = (GLogLevelFlags) user_data;
     time_t curr;
     struct tm *today;
     const char *level;
 
-    if (ui_main_data.log_flags & log_level)
+    if (ui_main_data.log_flags & domain_log_level & log_level)
     {
         switch (log_level & G_LOG_LEVEL_MASK)
         {
@@ -59,7 +66,7 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level,
         time(&curr);
         today = localtime(&curr);
 
-        fprintf(stderr, "%02u:%02u:%02u %8s %s %s\n", today->tm_hour, today->tm_min, today->tm_sec,
+        fprintf(stderr, "%02u:%02u:%02u %-9s %s %s\n", today->tm_hour, today->tm_min, today->tm_sec,
                 log_domain != NULL ? log_domain : "", level, message);
     }
 }
@@ -76,9 +83,7 @@ int main(int argc, char *argv[])
         G_LOG_LEVEL_WARNING     |
         G_LOG_LEVEL_MESSAGE     |
         G_LOG_LEVEL_INFO        |
-        G_LOG_LEVEL_DEBUG       |
-        G_LOG_FLAG_FATAL        |
-        G_LOG_FLAG_RECURSION);
+        G_LOG_LEVEL_DEBUG);
 
     /* This initialize the library and check potential ABI mismatches
      * between the version it was compiled for and the actual shared
@@ -90,7 +95,20 @@ int main(int argc, char *argv[])
     /* Initialize the widget set */
     gtk_init(&argc, &argv);
 
-    g_log_set_handler(NULL, log_flags, console_log_handler, NULL);
+    /* Parse command line options */
+    ui_gtk_parse_arg (argc, argv);
+
+    /* Set log handlers:
+     *                 Domain,      Levels,    Handler,             Domain enabled levels */
+    g_log_set_handler( NULL,        log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("BUFFERS",    log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("PARSER",     log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("RESOLVER",   log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI",         log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI_CB",      log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("UI_FILTER",  log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
+    g_log_set_handler("UI_INTER",   log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS));
+    g_log_set_handler("UI_TREE",    log_flags, console_log_handler, (gpointer) (G_LOG_LEVELS & (~(G_LOG_LEVEL_DEBUG))));
 
     CHECK_FCT(ui_gtk_initialize(argc, argv));
 

common/utils/itti_analyzer/libbuffers/buffers.c

@@ -3,6 +3,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("BUFFERS")
+
 #include <glib.h>
 
 #include "rc.h"

common/utils/itti_analyzer/libbuffers/file.c

@@ -5,6 +5,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#define G_LOG_DOMAIN ("BUFFERS")
+
 #include <glib.h>
 
 #include "rc.h"

common/utils/itti_analyzer/libbuffers/socket.c

@@ -7,6 +7,8 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#define G_LOG_DOMAIN ("BUFFERS")
+
 #include <gtk/gtk.h>
 
 #include "itti_types.h"

common/utils/itti_analyzer/libparser/array_type.c

@@ -4,6 +4,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "array_type.h"
 #include "fundamental_type.h"
 #include "ui_interface.h"

common/utils/itti_analyzer/libparser/enum_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "enum_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/enum_value_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "enum_value_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/field_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "rc.h"
 
 #include "field_type.h"

common/utils/itti_analyzer/libparser/file_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "file_type.h"
 
 int file_type_file_print(types_t *type, int indent, FILE *file)

common/utils/itti_analyzer/libparser/fundamental_type.c

@@ -3,6 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "fundamental_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/pointer_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "pointer_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/reference_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "reference_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/struct_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "rc.h"
 
 #include "struct_type.h"

common/utils/itti_analyzer/libparser/typedef_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "typedef_type.h"
 #include "ui_interface.h"
 

common/utils/itti_analyzer/libparser/types.c

@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "types.h"
 #include "array_type.h"
 #include "enum_type.h"

common/utils/itti_analyzer/libparser/union_type.c

@@ -3,6 +3,8 @@
 #include <assert.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("PARSER")
+
 #include "rc.h"
 
 #include "enum_value_type.h"

common/utils/itti_analyzer/libresolver/locate_root.c

 #include <stdio.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("RESOLVER")
+
 #include <glib.h>
 
 #include "rc.h"

common/utils/itti_analyzer/libresolver/resolvers.c

@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define G_LOG_DOMAIN ("RESOLVER")
+
 #include <glib.h>
 
 #include "types.h"

common/utils/itti_analyzer/libui/ui_callbacks.c

@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#define G_LOG_DOMAIN ("UI_CB")
+
 #include <gtk/gtk.h>
 
 #include "rc.h"
@@ -368,7 +370,7 @@ gboolean ui_callback_on_menu_color(GtkWidget *widget, gpointer data)
         snprintf (color_string, COLOR_SIZE, "#%02x%02x%02x", red, green, blue);
         ui_tree_view_refilter ();
 
-        g_message("Selected color for %s %f->%02x %f->%02x %f->%02x %s",
+        g_debug("Selected color for %s %f->%02x %f->%02x %f->%02x %s",
                   menu_color->menu_enable->filter_item->name, color.red, red, color.green, green, color.blue, blue, color_string);
     }
     gtk_widget_destroy (color_chooser);

common/utils/itti_analyzer/libui/ui_filters.c

 #include <stdio.h>
 #include <stdlib.h>
+
+#define G_LOG_DOMAIN ("UI_FILTER")
+
 #include <glib.h>
 
 #include <libxml/parser.h>
@@ -252,7 +255,7 @@ static ui_filter_e ui_filter_from_name(const char *name)
     return FILTER_UNKNOWN;
 }
 
-static int xml_parse_filters(xmlDocPtr doc)
+static int xml_parse_filters(xmlDocPtr doc, const char *file_name)
 {
     xmlNode *root_element = NULL;
     xmlNode *filter_node = NULL;
@@ -354,8 +357,7 @@ static int xml_parse_filters(xmlDocPtr doc)
         ret = RC_OK;
     }
 
-    g_message(
-            "Parsed XML filters definition found %d entries (%d messages to display)", filters_entries, ui_tree_view_get_filtered_number());
+    g_message("Parsed XML filters file \"%s\", found %d entries (%d messages to display)", file_name, filters_entries, ui_tree_view_get_filtered_number());
 
     return ret;
 }
@@ -378,7 +380,7 @@ int ui_filters_read(const char *file_name)
         return RC_FAIL;
     }
 
-    ret = xml_parse_filters (doc);
+    ret = xml_parse_filters (doc, file_name);
     if (ret != RC_OK)
     {
         ui_notification_dialog (GTK_MESSAGE_WARNING, "open filters", "Found no filter definitions in \"%s\"",

common/utils/itti_analyzer/libui/ui_interface.c

@@ -2,6 +2,8 @@
 #include <stdint.h>
 #include <unistd.h>
 
+#define G_LOG_DOMAIN ("UI_INTER")
+
 #include <gtk/gtk.h>
 
 #include "ui_interface.h"

common/utils/itti_analyzer/libui/ui_main_screen.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#define G_LOG_DOMAIN ("UI")
+
 #include <gtk/gtk.h>
 
 #include "rc.h"
@@ -22,11 +24,6 @@
 
 ui_main_data_t ui_main_data;
 
-gchar *LOG_DOMAIN_PARSE =    "Parse";
-gchar *LOG_DOMAIN_PIPE =     "Pipe";
-gchar *LOG_DOMAIN_SOCKET =   "Socket";
-gchar *LOG_DOMAIN_UI =       "UI";
-
 static void ui_help(void)
 {
     printf ("Usage: itti_analyser [options]\n\n"
@@ -40,10 +37,20 @@ static void ui_help(void)
             "  -p PORT      set port to PORT\n");
 }
 
-static void ui_gtk_parse_arg(int argc, char *argv[])
+void ui_gtk_parse_arg(int argc, char *argv[])
 {
     char c;
 
+    /* Clear of ui_main_data not needed */
+    // memset (&ui_main_data, 0, sizeof(ui_main_data_t));
+
+    /* Set some default initialization value for the IP address */
+    ui_main_data.ip_entry_init = "127.0.0.1";
+    ui_main_data.port_entry_init = "10006";
+
+    /* Set default log level to at least warning level messages */
+    ui_main_data.log_flags = (G_LOG_LEVEL_MASK & (~(G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG)));
+
     while ((c = getopt (argc, argv, "d:f:hi:l:m:p:")) != -1)
     {
         switch (c)
@@ -160,17 +167,6 @@ int ui_gtk_initialize(int argc, char *argv[])
 {
     GtkWidget *vbox;
 
-    memset (&ui_main_data, 0, sizeof(ui_main_data_t));
-
-    /* Set some default initialization value for the IP address */
-    ui_main_data.ip_entry_init = "127.0.0.1";
-    ui_main_data.port_entry_init = "10007";
-
-    /* Set default log level to all but debug message */
-    ui_main_data.log_flags = (G_LOG_LEVEL_MASK & (~G_LOG_LEVEL_DEBUG));
-
-    ui_gtk_parse_arg (argc, argv);
-
     /* Create the main window */
     ui_main_data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     ui_init_filters (TRUE, FALSE);

common/utils/itti_analyzer/libui/ui_main_screen.h

@@ -59,6 +59,8 @@ typedef struct {
 
 extern ui_main_data_t ui_main_data;
 
+void ui_gtk_parse_arg(int argc, char *argv[]);
+
 void ui_set_title(const char *fmt, ...);
 
 int ui_gtk_initialize(int argc, char *argv[]);

common/utils/itti_analyzer/libui/ui_menu_bar.c

+#define G_LOG_DOMAIN ("UI")
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

common/utils/itti_analyzer/libui/ui_notebook.c

@@ -6,6 +6,8 @@
 #include <stdint.h>
 #include <gtk/gtk.h>
 
+#define G_LOG_DOMAIN ("UI")
+
 #include "rc.h"
 
 #include "ui_notebook.h"

common/utils/itti_analyzer/libui/ui_notif_dlg.c

+#define G_LOG_DOMAIN ("UI")
+
 #include "rc.h"
 
 #include "ui_notif_dlg.h"

common/utils/itti_analyzer/libui/ui_notifications.c

@@ -3,6 +3,8 @@
 #include <stdint.h>
 #include <stdarg.h>
 
+#define G_LOG_DOMAIN ("UI")
+
 #include <sys/stat.h>
 
 #include <gtk/gtk.h>

common/utils/itti_analyzer/libui/ui_signal_dissect_view.c

 #include <string.h>
 
+#define G_LOG_DOMAIN ("UI")
+
 #include <gtk/gtk.h>
 
 #include "rc.h"

common/utils/itti_analyzer/libui/ui_tree_view.c

 #include <stdlib.h>
 #include <stdint.h>
 
+#define G_LOG_DOMAIN ("UI_TREE")
+
 #include <gtk/gtk.h>
 
 #include "rc.h"