From f83f7714d59558b6016eb365f5a81eaa1e4979b1 Mon Sep 17 00:00:00 2001 From: winckel Date: Tue, 5 Nov 2013 14:13:15 +0000 Subject: [PATCH] Moved load of filters or messages files after GTK has entered its main loop to avoid issue when reloading files! Excluded "MESSAGES_ID_MAX" message from filter. Removed unused function "ui_callback_on_tree_view_select". Change logging level of some logs. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4321 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- .../utils/itti_analyzer/libbuffers/buffers.c | 4 +- common/utils/itti_analyzer/libbuffers/file.c | 8 +- .../utils/itti_analyzer/libbuffers/socket.c | 2 +- .../utils/itti_analyzer/libparser/xml_parse.c | 69 +++++++------ .../itti_analyzer/libresolver/resolvers.c | 8 +- .../utils/itti_analyzer/libui/ui_callbacks.c | 19 ++-- common/utils/itti_analyzer/libui/ui_filters.c | 2 +- .../utils/itti_analyzer/libui/ui_interface.c | 6 +- .../itti_analyzer/libui/ui_main_screen.c | 98 ++++++++++--------- .../itti_analyzer/libui/ui_notifications.c | 6 +- 10 files changed, 116 insertions(+), 106 deletions(-) diff --git a/common/utils/itti_analyzer/libbuffers/buffers.c b/common/utils/itti_analyzer/libbuffers/buffers.c index 7d1697a10d..3e017216c8 100644 --- a/common/utils/itti_analyzer/libbuffers/buffers.c +++ b/common/utils/itti_analyzer/libbuffers/buffers.c @@ -194,7 +194,7 @@ int buffer_has_enouch_data(buffer_t *buffer, uint32_t offset, uint32_t to_get) return -1; underflow = (buffer->size_bytes >= ((offset + to_get) / 8)) ? 0 : -1; if (underflow && debug_buffers) - g_debug("Detected Underflow offset %u, to_get %u, buffer size %u\n", - offset, to_get, buffer->size_bytes); + g_warning("Detected Underflow offset %u, to_get %u, buffer size %u\n", + offset, to_get, buffer->size_bytes); return underflow; } diff --git a/common/utils/itti_analyzer/libbuffers/file.c b/common/utils/itti_analyzer/libbuffers/file.c index 730735890a..22cd865ecb 100644 --- a/common/utils/itti_analyzer/libbuffers/file.c +++ b/common/utils/itti_analyzer/libbuffers/file.c @@ -24,8 +24,8 @@ int file_read_dump(buffer_t **buffer, const char *filename) return RC_BAD_PARAM; if ((fd = open(filename, O_RDONLY)) == -1) { - g_debug("Cannot open %s for reading, returned %d:%s\n", - filename, errno, strerror(errno)); + g_warning("Cannot open %s for reading, returned %d:%s\n", + filename, errno, strerror(errno)); return RC_FAIL; } @@ -35,8 +35,8 @@ int file_read_dump(buffer_t **buffer, const char *filename) current_read = read(fd, data, READ_BUFFER_SIZE); if (current_read == -1) { - g_debug("Failed to read data from file, returned %d:%s\n", - errno, strerror(errno)); + g_warning("Failed to read data from file, returned %d:%s\n", + errno, strerror(errno)); return RC_FAIL; } CHECK_FCT(buffer_append_data(new_buf, data, current_read)); diff --git a/common/utils/itti_analyzer/libbuffers/socket.c b/common/utils/itti_analyzer/libbuffers/socket.c index 11cf28a325..ff5e28fd3c 100644 --- a/common/utils/itti_analyzer/libbuffers/socket.c +++ b/common/utils/itti_analyzer/libbuffers/socket.c @@ -84,7 +84,7 @@ static int socket_read_itti_message(socket_data_t *socket_data, g_assert(message_header != NULL); -// g_debug("Attempting to read signal header from socket"); + g_debug("Attempting to read signal header from socket"); /* Read the sub-header of signal */ while (data_read != sizeof(itti_signal_header_t)) { diff --git a/common/utils/itti_analyzer/libparser/xml_parse.c b/common/utils/itti_analyzer/libparser/xml_parse.c index 108f2a7bc5..9bf0bb5489 100644 --- a/common/utils/itti_analyzer/libparser/xml_parse.c +++ b/common/utils/itti_analyzer/libparser/xml_parse.c @@ -42,12 +42,12 @@ static int parse_attribute_name(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "name")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve name attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve name attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); return -1; } else { - PARSER_DEBUG("cannot retrieve name attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve name attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); return 0; } @@ -59,7 +59,7 @@ static int parse_attribute_name(xmlNode *node, types_t *type, int mandatory) { static int parse_attribute_id(xmlNode *node, types_t *type) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "id")) == NULL) { - PARSER_ERROR("cannot retrieve id attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve id attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); return -1; } @@ -71,13 +71,13 @@ static int parse_attribute_size(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "size")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve size attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve size attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->size = -1; return -1; } else { - PARSER_DEBUG("cannot retrieve size attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve size attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->size = -1; return 0; @@ -91,13 +91,13 @@ static int parse_attribute_align(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "align")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve align attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve align attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->align = -1; return -1; } else { - PARSER_DEBUG("cannot retrieve align attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve align attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->align = -1; return 0; @@ -131,7 +131,7 @@ static int parse_attribute_context(xmlNode *node, types_t *type, int mandatory) xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "context")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve context attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve context attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->context = -1; return -1; @@ -148,7 +148,7 @@ static int parse_attribute_context(xmlNode *node, types_t *type, int mandatory) static int parse_attribute_artificial(xmlNode *node, types_t *type) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "artificial")) == NULL) { - PARSER_DEBUG("cannot retrieve artificial attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve artificial attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->artificial = -1; return 0; @@ -160,7 +160,7 @@ static int parse_attribute_artificial(xmlNode *node, types_t *type) { static int parse_attribute_init(xmlNode *node, types_t *type) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "init")) == NULL) { - PARSER_ERROR("cannot retrieve init attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve init attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->init_value = -1; return 0; @@ -173,13 +173,13 @@ static int parse_attribute_members(xmlNode *node, types_t *type, int mandatory) xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "members")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve members attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve members attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->members = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve members attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve members attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->members = 0; return 0; @@ -193,13 +193,13 @@ static int parse_attribute_mangled(xmlNode *node, types_t *type, int mandatory) xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "mangled")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve mangled attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve mangled attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->mangled = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve mangled attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve mangled attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->mangled = 0; return 0; @@ -213,13 +213,13 @@ static int parse_attribute_demangled(xmlNode *node, types_t *type, int mandatory xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "mangled")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve demangled attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve demangled attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->demangled = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve demangled attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve demangled attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->demangled = 0; return 0; @@ -233,13 +233,13 @@ static int parse_attribute_offset(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "offset")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve offset attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve offset attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->offset = -1; return -1; } else { - PARSER_DEBUG("cannot retrieve offset attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve offset attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->offset = -1; return 0; @@ -253,13 +253,13 @@ static int parse_attribute_bits(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "bits")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve bits attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve bits attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->bits = -1; return -1; } else { - PARSER_DEBUG("cannot retrieve bits attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve bits attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->bits = -1; return 0; @@ -273,13 +273,13 @@ static int parse_attribute_type(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "type")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve type attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve type attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->type_xml = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve type attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve type attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->type_xml = 0; return 0; @@ -293,13 +293,13 @@ static int parse_attribute_min(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "min")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve min attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve min attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->min = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve min attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve min attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->min = 0; return 0; @@ -313,13 +313,13 @@ static int parse_attribute_max(xmlNode *node, types_t *type, int mandatory) { xmlAttrPtr node_attribute; if ((node_attribute = xmlHasProp (node, (xmlChar *) "max")) == NULL) { if (mandatory) { - PARSER_ERROR("cannot retrieve max attribute in node %s, %s:%ld\n", + PARSER_ERROR("cannot retrieve max attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->max = 0; return -1; } else { - PARSER_DEBUG("cannot retrieve max attribute in node %s, %s:%ld\n", + PARSER_DEBUG("cannot retrieve max attribute in node %s, %s:%ld", (char *)node->name, node->doc->URL, XML_GET_LINE(node)); type->max = 0; return 0; @@ -660,7 +660,7 @@ int xml_parse_buffer(const char *xml_buffer, const int size) { return -1; } - g_debug("Parsing XML definition from buffer"); + g_message("Parsing XML definition from buffer ..."); /* This initialize the library and check potential ABI mismatches * between the version it was compiled for and the actual shared @@ -695,7 +695,7 @@ int xml_parse_file(const char *filename) { doc = xmlReadFile (filename, NULL, 0); if (doc == NULL) { - g_warning("Failed to parse %s\n", filename); + g_warning("Failed to parse %s", filename); // ui_notification_dialog(DIALOG_WARNING, "Failed to parse file %s", filename); return RC_FAIL; } @@ -713,8 +713,12 @@ static int update_filters() { { types = types->child; - while (types != NULL) { - ui_filters_add(FILTER_MESSAGES, types->init_value, types->name); + while (types != NULL) + { + if (strcmp (types->name, "MESSAGES_ID_MAX") != 0) + { + ui_filters_add (FILTER_MESSAGES, types->init_value, types->name); + } types = types->next; } } @@ -789,6 +793,9 @@ static int xml_parse_doc(xmlDocPtr doc) { } fclose (dissect_file); + + g_message("Parsed XML definition"); + return ret; } @@ -801,7 +808,7 @@ int dissect_signal(buffer_t *buffer, ui_set_signal_text_cb_t ui_set_signal_text_ } if (buffer == NULL) { - g_error("Failed buffer is NULL\n"); + g_error("Failed buffer is NULL"); return RC_FAIL; } diff --git a/common/utils/itti_analyzer/libresolver/resolvers.c b/common/utils/itti_analyzer/libresolver/resolvers.c index 8f17fb2ff3..2fc2392ae0 100644 --- a/common/utils/itti_analyzer/libresolver/resolvers.c +++ b/common/utils/itti_analyzer/libresolver/resolvers.c @@ -206,8 +206,8 @@ int resolve_pointer_type(types_t **head) if (next_type->type != TYPE_POINTER) continue; -// g_debug("Trying to resolve pointer id %d with type %d\n", -// next_type->id, next_type->type_xml); + // g_debug("Trying to resolve pointer id %d with type %d", + // next_type->id, next_type->type_xml); if (search_id(*head, &next_type->child, next_type->type_xml) != RESOLV_OK) { /* We have to remove this reference */ @@ -314,8 +314,8 @@ int resolve_function(types_t **head) if (next_type->type != TYPE_FUNCTION) continue; -// g_debug("Trying to resolve function id %d with type %d\n", -// next_type->id, next_type->type_xml); + // g_debug("Trying to resolve function id %d with type %d", + // next_type->id, next_type->type_xml); if (search_id(*head, &next_type->child, next_type->type_xml) != RESOLV_OK) { /* We have to remove this reference */ diff --git a/common/utils/itti_analyzer/libui/ui_callbacks.c b/common/utils/itti_analyzer/libui/ui_callbacks.c index 0e9c61636d..99177356f3 100644 --- a/common/utils/itti_analyzer/libui/ui_callbacks.c +++ b/common/utils/itti_analyzer/libui/ui_callbacks.c @@ -25,7 +25,7 @@ static gboolean ui_handle_socket_connection_failed(gint fd); gboolean ui_callback_on_open_messages(GtkWidget *widget, GdkEvent *event, gpointer data) { - g_debug("Open replay event occurred"); + g_debug("Open messages event occurred"); CHECK_FCT(ui_messages_open_file_chooser()); return TRUE; @@ -33,7 +33,7 @@ gboolean ui_callback_on_open_messages(GtkWidget *widget, GdkEvent *event, gpoint gboolean ui_callback_on_save_messages(GtkWidget *widget, GdkEvent *event, gpointer data) { - g_debug("Save replay event occurred"); + g_debug("Save messages event occurred"); // CHECK_FCT(ui_file_chooser()); return TRUE; } @@ -222,7 +222,7 @@ gboolean ui_pipe_callback(gint source, gpointer user_data) case UI_PIPE_UPDATE_SIGNAL_LIST: return ui_handle_update_signal_list (source, input_data, input_data_length); default: - g_debug("[gui] Unhandled message type %u", input_header.message_type); + g_warning("[gui] Unhandled message type %u", input_header.message_type); g_assert_not_reached(); } return FALSE; @@ -309,13 +309,6 @@ gboolean ui_callback_signal_clear_list(GtkWidget *widget, GdkEvent *event, gpoin return TRUE; } -gboolean ui_callback_on_tree_view_select(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - /* We have to retrieve the ip address and port of remote host */ - g_debug("List selection event occurred"); - return TRUE; -} - static gboolean ui_callback_on_menu_item_selected(GtkWidget *widget, gpointer data) { ui_filter_item_t *filter_entry = data; @@ -323,7 +316,7 @@ static gboolean ui_callback_on_menu_item_selected(GtkWidget *widget, gpointer da enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)); filter_entry->enabled = enabled; - // g_debug("ui_callback_on_menu_item_selected occurred %x %x %s %d", widget, data, filter_entry->name, enabled); + g_debug("ui_callback_on_menu_item_selected occurred %x %x %s %d", (int) widget, (int) data, filter_entry->name, enabled); return TRUE; } @@ -348,7 +341,7 @@ static void ui_create_filter_menu(GtkWidget **menu, ui_filter_t *filter) /* Connect function to be called when the menu item is selected */ data = &filter->items[item]; - // g_debug("ui_create_filter_menu %x %x", menu_items, data); + g_debug("ui_create_filter_menu %x %x", (int) menu_items, (int) data); g_signal_connect(G_OBJECT (menu_items), "activate", G_CALLBACK(ui_callback_on_menu_item_selected), data); /* Show the widget */ @@ -388,7 +381,7 @@ gboolean ui_callback_on_tree_column_header_click(GtkWidget *widget, gpointer dat { col_type_e col = (col_type_e) data; - // g_debug("ui_callback_on_tree_column_header_click %x", col); + g_debug("ui_callback_on_tree_column_header_click %x", col); switch (col) { case COL_SIGNAL: diff --git a/common/utils/itti_analyzer/libui/ui_filters.c b/common/utils/itti_analyzer/libui/ui_filters.c index e28483cda4..5dfed7d574 100644 --- a/common/utils/itti_analyzer/libui/ui_filters.c +++ b/common/utils/itti_analyzer/libui/ui_filters.c @@ -107,7 +107,7 @@ void ui_filters_add(ui_filter_e filter, uint32_t value, char *name) break; default: - g_error("unknown filter type %d", filter); + g_warning("unknown filter type %d", filter); break; } } diff --git a/common/utils/itti_analyzer/libui/ui_interface.c b/common/utils/itti_analyzer/libui/ui_interface.c index 00547cbc03..5010a07658 100644 --- a/common/utils/itti_analyzer/libui/ui_interface.c +++ b/common/utils/itti_analyzer/libui/ui_interface.c @@ -22,7 +22,7 @@ gboolean ui_callback_on_pipe_notification( /* avoid reentrancy problems and stack overflow */ g_source_remove(pipe_input->pipe_input_id); -// g_debug("Received new data on pipe %d", pipe_input->pipe_input_id); + g_debug("Received new data on pipe %d", pipe_input->pipe_input_id); if (pipe_input->input_cb(pipe_input->source_fd, pipe_input->user_data)) { /* restore pipe handler */ @@ -82,7 +82,7 @@ int ui_pipe_write_message(int pipe_fd, const uint16_t message_type, ret = write(pipe_fd, &pipe_input_header, sizeof(pipe_input_header)); if (ret < 0) { - g_debug("Failed to write header to pipe: %s", g_strerror(errno)); + g_warning("Failed to write header to pipe: %s", g_strerror(errno)); return ret; } @@ -90,7 +90,7 @@ int ui_pipe_write_message(int pipe_fd, const uint16_t message_type, if (message_size > 0) { ret = write(pipe_fd, message, message_size); if (ret < 0) { - g_debug("Failed to write message of size %u at 0x%p to pipe: %s", + g_warning("Failed to write message of size %u at 0x%p to pipe: %s", message_size, message, g_strerror(errno)); return ret; } diff --git a/common/utils/itti_analyzer/libui/ui_main_screen.c b/common/utils/itti_analyzer/libui/ui_main_screen.c index 6671de389b..b36c0ce735 100644 --- a/common/utils/itti_analyzer/libui/ui_main_screen.c +++ b/common/utils/itti_analyzer/libui/ui_main_screen.c @@ -1,4 +1,3 @@ - #if HAVE_CONFIG_H # include "config.h" #endif @@ -47,8 +46,8 @@ static void ui_gtk_parse_arg(int argc, char *argv[]) break; case 'h': - ui_help(); - exit(0); + ui_help (); + exit (0); break; case 'i': @@ -60,10 +59,10 @@ static void ui_gtk_parse_arg(int argc, char *argv[]) break; case 'p': - ui_main_data.port_entry_init = optarg; - break; + ui_main_data.port_entry_init = optarg; + break; - default: + default: ui_help (); exit (-1); break; @@ -71,44 +70,9 @@ static void ui_gtk_parse_arg(int argc, char *argv[]) } } -int ui_gtk_initialize(int argc, char *argv[]) +static int ui_idle_callback(gpointer data) { - GtkWidget *vbox; - - memset(&ui_main_data, 0, sizeof(ui_main_data_t)); - - /* Set some default initialization value */ - ui_main_data.ip_entry_init = "127.0.0.1"; - ui_main_data.port_entry_init = "10007"; - - 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); - - gtk_window_set_position(GTK_WINDOW(ui_main_data.window), GTK_WIN_POS_CENTER); - gtk_window_set_default_size(GTK_WINDOW(ui_main_data.window), 1024, 800); -#if defined(PACKAGE_STRING) - gtk_window_set_title(GTK_WINDOW(ui_main_data.window), PACKAGE_STRING); -#else - gtk_window_set_title(GTK_WINDOW(ui_main_data.window), "itti debugger"); -#endif - gtk_window_set_resizable(GTK_WINDOW(ui_main_data.window), TRUE); - - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - - CHECK_FCT(ui_menu_bar_create(vbox)); - CHECK_FCT(ui_toolbar_create(vbox)); -// CHECK_FCT(ui_tree_view_create(ui_main_data.window, vbox)); - CHECK_FCT(ui_notebook_create(vbox)); - - gtk_container_add(GTK_CONTAINER(ui_main_data.window), vbox); - /* Assign the destroy event */ - g_signal_connect(ui_main_data.window, "destroy", G_CALLBACK (gtk_main_quit), NULL); - - /* Show the application window */ - gtk_widget_show_all (ui_main_data.window); + g_debug("Entering idle state"); /* Read filters file */ if (ui_main_data.filters_file_name != NULL) @@ -119,8 +83,54 @@ int ui_gtk_initialize(int argc, char *argv[]) /* Read messages file */ if (ui_main_data.messages_file_name != NULL) { - ui_messages_read(ui_main_data.messages_file_name); + ui_messages_read (ui_main_data.messages_file_name); } + /* One shot execution */ + return FALSE; +} + +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 */ + ui_main_data.ip_entry_init = "127.0.0.1"; + ui_main_data.port_entry_init = "10007"; + + 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); + + gtk_window_set_position (GTK_WINDOW(ui_main_data.window), GTK_WIN_POS_CENTER); + gtk_window_set_default_size (GTK_WINDOW(ui_main_data.window), 1024, 800); +#if defined(PACKAGE_STRING) + gtk_window_set_title(GTK_WINDOW(ui_main_data.window), PACKAGE_STRING); +#else + gtk_window_set_title (GTK_WINDOW(ui_main_data.window), "itti debugger"); +#endif + gtk_window_set_resizable (GTK_WINDOW(ui_main_data.window), TRUE); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + CHECK_FCT(ui_menu_bar_create(vbox)); + CHECK_FCT(ui_toolbar_create(vbox)); +// CHECK_FCT(ui_tree_view_create(ui_main_data.window, vbox)); + CHECK_FCT(ui_notebook_create(vbox)); + + gtk_container_add (GTK_CONTAINER(ui_main_data.window), vbox); + + /* Assign the destroy event */ + g_signal_connect(ui_main_data.window, "destroy", G_CALLBACK (gtk_main_quit), NULL); + + /* Show the application window */ + gtk_widget_show_all (ui_main_data.window); + + g_idle_add (ui_idle_callback, NULL); + return RC_OK; } diff --git a/common/utils/itti_analyzer/libui/ui_notifications.c b/common/utils/itti_analyzer/libui/ui_notifications.c index 5081bf1ba7..53d03252c3 100644 --- a/common/utils/itti_analyzer/libui/ui_notifications.c +++ b/common/utils/itti_analyzer/libui/ui_notifications.c @@ -70,7 +70,7 @@ int ui_messages_read(char *filename) { input_data_length = message_header.message_size - sizeof(itti_socket_header_t); - // g_debug ("%x, %x ,%x\n", message_header.message_type, message_header.message_size, input_data_length); + // g_debug ("%x, %x ,%x", message_header.message_type, message_header.message_size, input_data_length); /* Checking for non-header part */ if (input_data_length > 0) @@ -113,7 +113,7 @@ int ui_messages_read(char *filename) case ITTI_STATISTIC_MESSAGE_TYPE: default: - g_debug("Received unknow (or not implemented) message from socket type: %d", message_header.message_type); + g_warning("Received unknow (or not implemented) message from socket type: %d", message_header.message_type); break; } @@ -127,7 +127,7 @@ int ui_messages_read(char *filename) ui_set_sensitive_move_buttons (TRUE); } - g_debug("Read %d messages from file \"%s\"\n", read_messages, filename); + g_message("Read %d messages from file \"%s\"\n", read_messages, filename); close (source); }