- itti_analyzer v0.2:

* Moved all GUI calls to main thread * Refine socket interface * Added origin/destination task id on message display list git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4258 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2013-10-22 13:42:39 +00:00
parent 3dc3d6ae45
commit ecf07e3805
22 changed files with 890 additions and 420 deletions
@@ -14,21 +14,91 @@
 #include "xml_parse.h"

 ui_interface_t ui_interface = {
-    .dissector_ready = 0,

-    /** core program -> UI **/
-    .ui_notification_dialog       = ui_notification_dialog,
-    .ui_disable_connect_button    = ui_disable_connect_button,
-    .ui_enable_connect_button     = ui_enable_connect_button,
-    .ui_progress_bar_set_fraction = ui_progress_bar_set_fraction,
-    .ui_progress_bar_terminate    = ui_progress_bar_terminate,
-    .ui_tree_view_new_signal_ind  = ui_tree_view_new_signal_ind,
    .ui_signal_set_text           = ui_signal_set_text,
-
-    /** UI -> core program **/
-    .socket_connect = socket_connect_to_remote_host,
-    .socket_disconnect = socket_disconnect_from_remote_host,
-
-    .parse_signal_file = xml_parse_file,
-    .dissect_signal    = dissect_signal,
 };
+
+static
+gboolean ui_callback_on_pipe_notification(
+    GIOChannel *source, GIOCondition condition, gpointer user_data)
+{
+    pipe_input_t *pipe_input = (pipe_input_t *)user_data;
+
+    /* 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);
+
+    if (pipe_input->input_cb(pipe_input->source_fd, pipe_input->user_data)) {
+        /* restore pipe handler */
+        pipe_input->pipe_input_id = g_io_add_watch_full(pipe_input->pipe_channel,
+                                                        G_PRIORITY_HIGH,
+                                                        (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP),
+                                                        ui_callback_on_pipe_notification,
+                                                        pipe_input,
+                                                        NULL);
+    }
+    return TRUE;
+}
+
+int ui_pipe_new(int pipe_fd[2], pipe_input_cb_t input_cb, gpointer user_data)
+{
+    static pipe_input_t pipe_input;
+
+    g_assert(pipe_fd != NULL);
+
+    /* Create a pipe between GUI and a thread or a process */
+    if (socketpair(AF_UNIX, SOCK_DGRAM, 0, pipe_fd) < 0) {
+        g_warning("Failed to create socketpair %s", g_strerror(errno));
+        return RC_FAIL;
+    }
+
+    /* Source taken from wireshark SVN repository */
+
+    pipe_input.source_fd = pipe_fd[0];
+    pipe_input.input_cb  = input_cb;
+    pipe_input.user_data = user_data;
+
+    pipe_input.pipe_channel = g_io_channel_unix_new(pipe_fd[0]);
+    g_io_channel_set_encoding(pipe_input.pipe_channel, NULL, NULL);
+    pipe_input.pipe_input_id = g_io_add_watch_full(pipe_input.pipe_channel,
+                                                   G_PRIORITY_HIGH,
+                                                   G_IO_IN | G_IO_ERR | G_IO_HUP,
+                                                   ui_callback_on_pipe_notification,
+                                                   &pipe_input,
+                                                   NULL);
+
+    return RC_OK;
+}
+
+int ui_pipe_write_message(int pipe_fd, const uint16_t message_type,
+                          const void * const message, const uint16_t message_size)
+{
+    int ret;
+    pipe_input_header_t pipe_input_header;
+
+    pipe_input_header.message_size = message_size + sizeof(pipe_input_header);
+    pipe_input_header.message_type = message_type;
+
+    if (message_size > 0 && message == NULL) {
+        g_error("message size = %u but message is NULL", message_size);
+        g_assert_not_reached();
+    }
+
+    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));
+        return ret;
+    }
+
+    /* Only write the message to pipe if valid data to transmit */
+    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",
+                    message_size, message, g_strerror(errno));
+            return ret;
+        }
+    }
+    return 0;
+}