X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=e0e677fceb3db170f724b80d2902ac6c29d95416;hb=c74e0cf9bdbda21d13d48be89bc9fd3e257c9b9e;hp=1871313f7fee968c7db4386fe534990b4feb1da8;hpb=3c0310400666ee8c42a23383b14c8c15ba197309;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index 1871313f..e0e677fc 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -1,5 +1,5 @@ /* This file is part of the Linux Trace Toolkit viewer - * Copyright (C) 2003-2004 XangXiu Yang + * Copyright (C) 2003-2004 XangXiu Yang, Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -22,6 +22,9 @@ #include // for PATH_MAX #include +#include +#include +#include #include @@ -47,6 +50,7 @@ #define DEFAULT_TIME_WIDTH_S 1 +#define CLIP_BUF 256 // size of clipboard buffer extern LttvTrace *g_init_trace ; @@ -60,6 +64,7 @@ static char remember_trace_dir[PATH_MAX] = ""; MainWindow * get_window_data_struct(GtkWidget * widget); +char * get_load_module(char ** load_module_name, int nb_module); char * get_unload_module(char ** loaded_module_name, int nb_module); char * get_remove_trace(char ** all_trace_name, int nb_trace); char * get_selection(char ** all_name, int nb, char *title, char * column_title); @@ -74,8 +79,8 @@ void checkbox_changed(GtkTreeView *treeview, GtkTreePath *arg1, GtkTreeViewColumn *arg2, gpointer user_data); -void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i); -void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * trace); +void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i); +void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * trace); Tab *create_new_tab(GtkWidget* widget, gpointer user_data); LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset); @@ -148,6 +153,247 @@ LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset) return s; } +/* Pasting routines */ + +static void MEventBox1a_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_ssec, *ptr_snsec, *ptr_esec, *ptr_ensec; + + strncpy(buffer, text, CLIP_BUF); + + /* start */ + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_ssec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_snsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + /* end */ + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_esec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_ensec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry1), + (double)strtoul(ptr_ssec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2), + (double)strtoul(ptr_snsec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry3), + (double)strtoul(ptr_esec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4), + (double)strtoul(ptr_ensec, NULL, 10)); +} + +static gboolean on_MEventBox1a_paste(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + Tab *tab = (Tab*)data; + + GtkClipboard *clip = gtk_clipboard_get_for_display(gdk_display_get_default(), + GDK_SELECTION_PRIMARY); + gtk_clipboard_request_text(clip, + (GtkClipboardTextReceivedFunc)MEventBox1a_receive, + (gpointer)tab); + return 0; +} + + +/* Start */ +static void MEventBox1b_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_sec, *ptr_nsec; + + strncpy(buffer, text, CLIP_BUF); + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_sec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_nsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry1), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* Start */ +static gboolean on_MEventBox1b_paste(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + Tab *tab = (Tab*)data; + + GtkClipboard *clip = gtk_clipboard_get_for_display(gdk_display_get_default(), + GDK_SELECTION_PRIMARY); + gtk_clipboard_request_text(clip, + (GtkClipboardTextReceivedFunc)MEventBox1b_receive, + (gpointer)tab); + return 0; +} + +/* End */ +static void MEventBox3b_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_sec, *ptr_nsec; + + strncpy(buffer, text, CLIP_BUF); + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_sec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_nsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry3), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* End */ +static gboolean on_MEventBox3b_paste(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + Tab *tab = (Tab*)data; + + GtkClipboard *clip = gtk_clipboard_get_for_display(gdk_display_get_default(), + GDK_SELECTION_PRIMARY); + gtk_clipboard_request_text(clip, + (GtkClipboardTextReceivedFunc)MEventBox3b_receive, + (gpointer)tab); + return 0; +} + +/* Current */ +static void MEventBox5b_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_sec, *ptr_nsec; + + strncpy(buffer, text, CLIP_BUF); + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_sec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_nsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry5), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry6), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* Current */ +static gboolean on_MEventBox5b_paste(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + Tab *tab = (Tab*)data; + + GtkClipboard *clip = gtk_clipboard_get_for_display(gdk_display_get_default(), + GDK_SELECTION_PRIMARY); + gtk_clipboard_request_text(clip, + (GtkClipboardTextReceivedFunc)MEventBox5b_receive, + (gpointer)tab); + return 0; +} + + +static gboolean viewer_grab_focus(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + GtkWidget *viewer = GTK_WIDGET(data); + GtkWidget *viewer_container = gtk_widget_get_parent(viewer); + + g_debug("FOCUS GRABBED"); + g_object_set_data(G_OBJECT(viewer_container), "focused_viewer", viewer); + return 0; +} + + +static void connect_focus_recursive(GtkWidget *widget, + GtkWidget *viewer) +{ + if(GTK_IS_CONTAINER(widget)) { + gtk_container_forall(GTK_CONTAINER(widget), + (GtkCallback)connect_focus_recursive, + viewer); + + } + if(GTK_IS_TREE_VIEW(widget)) { + gtk_tree_view_set_headers_clickable(widget, TRUE); + } + gtk_widget_add_events(widget, GDK_BUTTON_PRESS_MASK); + g_signal_connect (G_OBJECT(widget), + "button-press-event", + G_CALLBACK (viewer_grab_focus), + (gpointer)viewer); +} /* insert_viewer function constructs an instance of a viewer first, * then inserts the widget of the instance into the container of the @@ -167,7 +413,7 @@ insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data) /* internal functions */ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor) { - GtkMultiVPaned * multi_vpaned; + GtkWidget * viewer_container; MainWindow * mw_data = get_window_data_struct(widget); GtkWidget * notebook = lookup_widget(widget, "MNotebook"); GtkWidget * viewer; @@ -183,25 +429,175 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor) tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - multi_vpaned = tab->multi_vpaned; + viewer_container = tab->viewer_container; s = construct_traceset_selector(tab->traceset_info->traceset); - viewer = (GtkWidget*)constructor(tab, s, "Traceset_Selector"); + viewer = (GtkWidget*)constructor(tab); if(viewer) { - gtk_multi_vpaned_widget_add(multi_vpaned, viewer); - // We unref here, because it is now referenced by the multi_vpaned! - g_object_unref(G_OBJECT(viewer)); + //gtk_multivpaned_widget_add(GTK_MULTIVPANED(multivpaned), viewer); + + gtk_box_pack_end(GTK_BOX(viewer_container), + viewer, + TRUE, + TRUE, + 0); + + /* We want to connect the viewer_grab_focus to EVERY + * child of this widget. The little trick is to get each child + * of each GTK_CONTAINER, even subchildren. + */ + connect_focus_recursive(viewer, viewer); + } +} + +/** + * Function to set/update traceset for the viewers + * @param tab viewer's tab + * @param traceset traceset of the main window. + * return value : + * 0 : traceset updated + * 1 : no traceset hooks to update; not an error. + */ - // The viewer will show itself when it receives a show notify - // So we call the show notify hooks here. It will - // typically add hooks for reading, we call process trace, and the - // end of reading hook will call gtk_widget_show and unregister the - // hooks. - // Note that show notify gets the time_requested through the call_data. - //show_viewer(mw_data); - // in expose now call_pending_read_hooks(mw_data); +int SetTraceset(Tab * tab, LttvTraceset *traceset) +{ + LttvTracesetContext *tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + TimeWindow new_time_window; + LttTime new_current_time; + + /* Set the tab's time window and current time if + * out of bounds */ + if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0 + || ltt_time_compare( ltt_time_add(tab->time_window.start_time, + tab->time_window.time_width), + time_span.end_time) > 0) { + new_time_window.start_time = time_span.start_time; + + new_current_time = time_span.start_time; + + LttTime tmp_time; + + if(DEFAULT_TIME_WIDTH_S < time_span.end_time.tv_sec) + tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S; + else + tmp_time.tv_sec = time_span.end_time.tv_sec; + tmp_time.tv_nsec = 0; + new_time_window.time_width = tmp_time ; } + time_change_manager(tab, new_time_window); + current_time_change_manager(tab, new_current_time); + +#if 0 + /* Set scrollbar */ + GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); + LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time); + + g_object_set(G_OBJECT(adjustment), + "lower", + 0.0, /* lower */ + "upper", + ltt_time_to_double(upper) + * NANOSECONDS_PER_SECOND, /* upper */ + "step_increment", + ltt_time_to_double(tab->time_window.time_width) + / SCROLL_STEP_PER_PAGE + * NANOSECONDS_PER_SECOND, /* step increment */ + "page_increment", + ltt_time_to_double(tab->time_window.time_width) + * NANOSECONDS_PER_SECOND, /* page increment */ + "page_size", + ltt_time_to_double(tab->time_window.time_width) + * NANOSECONDS_PER_SECOND, /* page size */ + NULL); + gtk_adjustment_changed(adjustment); + + g_object_set(G_OBJECT(adjustment), + "value", + ltt_time_to_double( + ltt_time_sub(tab->time_window.start_time, time_span.start_time)) + * NANOSECONDS_PER_SECOND, /* value */ + NULL); + gtk_adjustment_value_changed(adjustment); + + /* set the time bar. The value callbacks will change their nsec themself */ + /* start seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry1), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); + + /* end seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry3), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); + + /* current seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry5), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); +#endif //0 + + /* Finally, call the update hooks of the viewers */ + LttvHooks * tmp; + LttvAttributeValue value; + gint retval = 0; + + + g_assert( lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatetraceset", LTTV_POINTER, &value)); + + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) retval = 1; + else lttv_hooks_call(tmp,traceset); + + + return retval; +} + +/** + * Function to set/update filter for the viewers + * @param tab viewer's tab + * @param filter filter of the main window. + * return value : + * -1 : error + * 0 : filters updated + * 1 : no filter hooks to update; not an error. + */ + +int SetFilter(Tab * tab, gpointer filter) +{ + LttvHooks * tmp; + LttvAttributeValue value; + + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatefilter", LTTV_POINTER, &value)); + + tmp = (LttvHooks*)*(value.v_pointer); + + if(tmp == NULL) return 1; + lttv_hooks_call(tmp,filter); + + return 0; +} + + + +/** + * Function to redraw each viewer belonging to the current tab + * @param tab viewer's tab + */ + +void update_traceset(Tab *tab) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatetraceset", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) return; + lttv_hooks_call(tmp, NULL); } @@ -294,12 +690,57 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone) } } +/* Get the currently focused viewer. + * If no viewer is focused, use the first one. + * + * If no viewer available, return NULL. + */ +GtkWidget *viewer_container_focus(GtkWidget *container) +{ + GtkWidget *widget; + + widget = (GtkWidget*)g_object_get_data(G_OBJECT(container), + "focused_viewer"); + + if(widget == NULL) { + g_debug("no widget focused"); + GList *children = gtk_container_get_children(GTK_CONTAINER(container)); + + if(children != NULL) + widget = GTK_WIDGET(children->data); + g_object_set_data(G_OBJECT(container), + "focused_viewer", + widget); + } + + return widget; + + +} + +gint viewer_container_position(GtkWidget *container, GtkWidget *child) +{ + + if(child == NULL) return -1; + + gint pos; + GValue value = { 0, }; + g_value_init(&value, G_TYPE_INT); + gtk_container_child_get_property(GTK_CONTAINER(container), + child, + "position", + &value); + pos = g_value_get_int(&value); + + return pos; +} + /* move_*_viewer functions move the selected view up/down in * the current tab */ -void move_up_viewer(GtkWidget * widget, gpointer user_data) +void move_down_viewer(GtkWidget * widget, gpointer user_data) { MainWindow * mw = get_window_data_struct(widget); GtkWidget * notebook = lookup_widget(widget, "MNotebook"); @@ -308,17 +749,30 @@ void move_up_viewer(GtkWidget * widget, gpointer user_data) gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); Tab *tab; - if(!page) { return; } else { tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - gtk_multi_vpaned_widget_move_up(tab->multi_vpaned); + //gtk_multivpaned_widget_move_up(GTK_MULTIVPANED(tab->multivpaned)); + + /* change the position in the vbox */ + GtkWidget *focus_widget; + gint position; + focus_widget = viewer_container_focus(tab->viewer_container); + position = viewer_container_position(tab->viewer_container, focus_widget); + + if(position > 0) { + /* can move up one position */ + gtk_box_reorder_child(GTK_BOX(tab->viewer_container), + focus_widget, + position-1); + } + } -void move_down_viewer(GtkWidget * widget, gpointer user_data) +void move_up_viewer(GtkWidget * widget, gpointer user_data) { MainWindow * mw = get_window_data_struct(widget); GtkWidget * notebook = lookup_widget(widget, "MNotebook"); @@ -333,7 +787,24 @@ void move_down_viewer(GtkWidget * widget, gpointer user_data) tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - gtk_multi_vpaned_widget_move_down(tab->multi_vpaned); + //gtk_multivpaned_widget_move_down(GTK_MULTIVPANED(tab->multivpaned)); + /* change the position in the vbox */ + GtkWidget *focus_widget; + gint position; + focus_widget = viewer_container_focus(tab->viewer_container); + position = viewer_container_position(tab->viewer_container, focus_widget); + + if(position != -1 && + position < + g_list_length(gtk_container_get_children( + GTK_CONTAINER(tab->viewer_container)))-1 + ) { + /* can move down one position */ + gtk_box_reorder_child(GTK_BOX(tab->viewer_container), + focus_widget, + position+1); + } + } @@ -355,7 +826,14 @@ void delete_viewer(GtkWidget * widget, gpointer user_data) tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - gtk_multi_vpaned_widget_delete(tab->multi_vpaned); + //gtk_multivpaned_widget_delete(GTK_MULTIVPANED(tab->multivpaned)); + + GtkWidget *focus_widget = viewer_container_focus(tab->viewer_container); + + if(focus_widget != NULL) + gtk_widget_destroy(focus_widget); + + g_object_set_data(G_OBJECT(tab->viewer_container), "focused_viewer", NULL); } @@ -393,6 +871,41 @@ void open_traceset(GtkWidget * widget, gpointer user_data) } +static void events_request_free(EventsRequest *events_request) +{ + if(events_request == NULL) return; + + if(events_request->start_position != NULL) + lttv_traceset_context_position_destroy(events_request->start_position); + if(events_request->end_position != NULL) + lttv_traceset_context_position_destroy(events_request->end_position); + if(events_request->hooks != NULL) + g_array_free(events_request->hooks, TRUE); + if(events_request->before_chunk_traceset != NULL) + lttv_hooks_destroy(events_request->before_chunk_traceset); + if(events_request->before_chunk_trace != NULL) + lttv_hooks_destroy(events_request->before_chunk_trace); + if(events_request->before_chunk_tracefile != NULL) + lttv_hooks_destroy(events_request->before_chunk_tracefile); + if(events_request->event != NULL) + lttv_hooks_destroy(events_request->event); + if(events_request->event_by_id != NULL) + lttv_hooks_by_id_destroy(events_request->event_by_id); + if(events_request->after_chunk_tracefile != NULL) + lttv_hooks_destroy(events_request->after_chunk_tracefile); + if(events_request->after_chunk_trace != NULL) + lttv_hooks_destroy(events_request->after_chunk_trace); + if(events_request->after_chunk_traceset != NULL) + lttv_hooks_destroy(events_request->after_chunk_traceset); + if(events_request->before_request != NULL) + lttv_hooks_destroy(events_request->before_request); + if(events_request->after_request != NULL) + lttv_hooks_destroy(events_request->after_request); + + g_free(events_request); +} + + /* lttvwindow_process_pending_requests * @@ -417,6 +930,7 @@ void open_traceset(GtkWidget * widget, gpointer user_data) * */ +#define list_out tab->events_requests gboolean lttvwindow_process_pending_requests(Tab *tab) { @@ -426,24 +940,24 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) GtkWidget* widget; LttvTracesetContext *tsc; LttvTracefileContext *tfc; - GSList *events_requests = tab->events_requests; - GSList *list_out = events_requests; GSList *list_in = NULL; LttTime end_time; guint end_nb_events; guint count; LttvTracesetContextPosition *end_position; - - if(tab == NULL) + if(tab == NULL) { + g_critical("Foreground processing : tab does not exist. Processing removed."); return FALSE; + } /* There is no events requests pending : we should never have been called! */ - g_assert(g_slist_length(events_requests) != 0); + g_assert(g_slist_length(list_out) != 0); tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); //set the cursor to be X shape, indicating that the computer is busy in doing its job +#if 0 new = gdk_cursor_new(GDK_X_CURSOR); widget = lookup_widget(tab->mw->mwindow, "MToolbar1"); win = gtk_widget_get_parent_window(widget); @@ -451,14 +965,74 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) gdk_cursor_unref(new); gdk_window_stick(win); gdk_window_unstick(win); +#endif //0 + + g_debug("SIZE events req len : %d", g_slist_length(list_out)); + + /* Preliminary check for no trace in traceset */ + /* Unregister the routine if empty, empty list_out too */ + if(lttv_traceset_number(tsc->ts) == 0) { + + /* - For each req in list_out */ + GSList *iter = list_out; + + while(iter != NULL) { + + gboolean remove = FALSE; + gboolean free_data = FALSE; + EventsRequest *events_request = (EventsRequest *)iter->data; + + /* - Call end request for req */ + if(events_request->servicing == TRUE) + lttv_hooks_call(events_request->after_request, (gpointer)tsc); + + /* - remove req from list_out */ + /* Destroy the request */ + remove = TRUE; + free_data = TRUE; + + /* Go to next */ + if(remove) + { + GSList *remove_iter = iter; + + iter = g_slist_next(iter); + if(free_data) events_request_free((EventsRequest*)remove_iter->data); + list_out = g_slist_remove_link(list_out, remove_iter); + } else { // not remove + iter = g_slist_next(iter); + } + } + } + + /* 0.1 Lock Traces */ + { + guint iter_trace=0; + + for(iter_trace=0; + iter_tracets); + iter_trace++) { + LttvTrace *trace_v = lttv_traceset_get(tsc->ts, iter_trace); + + if(lttvwindowtraces_lock(trace_v) != 0) { + g_critical("Foreground processing : Unable to get trace lock"); + return TRUE; /* Cannot get lock, try later */ + } + } + } + + /* 0.2 Seek tracefiles positions to context position */ + lttv_process_traceset_synchronize_tracefiles(tsc); - g_debug("SIZE events req len : %d", g_slist_length(events_requests)); /* Events processing algorithm implementation */ + /* Warning : the gtk_events_pending takes a LOT of cpu time. So what we do + * instead is to leave the control to GTK and take it back. + */ /* A. Servicing loop */ - while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0) - && !gtk_events_pending() ) { - + //while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { + if((g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { + /* Servicing */ /* 1. If list_in is empty (need a seek) */ if( g_slist_length(list_in) == 0 ) { @@ -500,7 +1074,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) lpos = g_slist_append(lpos, g_slist_nth_data(list_out, 0)); for(iter=g_slist_nth(list_out,1);iter!=NULL;iter=g_slist_next(iter)) { /* Find all position requests with the lowest position in list_out */ - guint index_lpos = g_array_index(lpos, guint, 0); EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0); EventsRequest *event_request_list_out = (EventsRequest*)iter->data; @@ -524,7 +1097,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } - /* 1.1.3 If lpos.start time < ltime */ { EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0); EventsRequest *event_request_ltime = (EventsRequest*)g_slist_nth_data(ltime, 0); @@ -532,22 +1104,24 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) if(event_request_lpos != NULL && event_request_lpos->start_position != NULL) { - lpos_start_time = lttv_traceset_context_position_get_time( event_request_lpos->start_position); - if(ltt_time_compare(lpos_start_time, - event_request_ltime->start_time)<0) { - /* Add lpos to list_in, remove them from list_out */ - - for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) { - /* Add to list_in */ - EventsRequest *event_request_lpos = - (EventsRequest*)iter->data; - - g_slist_append(list_in, event_request_lpos); - /* Remove from list_out */ - g_slist_remove(list_out, event_request_lpos); - } + } + + /* 1.1.3 If lpos.start time < ltime */ + if(event_request_lpos != NULL + && event_request_lpos->start_position != NULL + && ltt_time_compare(lpos_start_time, + event_request_ltime->start_time)<0) { + /* Add lpos to list_in, remove them from list_out */ + for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) { + /* Add to list_in */ + EventsRequest *event_request_lpos = + (EventsRequest*)iter->data; + + list_in = g_slist_append(list_in, event_request_lpos); + /* Remove from list_out */ + list_out = g_slist_remove(list_out, event_request_lpos); } } else { /* 1.1.4 (lpos.start time >= ltime) */ @@ -558,9 +1132,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) EventsRequest *event_request_ltime = (EventsRequest*)iter->data; - g_slist_append(list_in, event_request_ltime); + list_in = g_slist_append(list_in, event_request_ltime); /* Remove from list_out */ - g_slist_remove(list_out, event_request_ltime); + list_out = g_slist_remove(list_out, event_request_ltime); } } } @@ -573,22 +1147,63 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) tfc = lttv_traceset_context_get_current_tfc(tsc); g_assert(g_slist_length(list_in)>0); EventsRequest *events_request = g_slist_nth_data(list_in, 0); + guint seek_count; /* 1.2.1 If first request in list_in is a time request */ if(events_request->start_position == NULL) { /* - If first req in list_in start time != current time */ - if(tfc != NULL && ltt_time_compare(events_request->start_time, + if(tfc == NULL || ltt_time_compare(events_request->start_time, tfc->timestamp) != 0) /* - Seek to that time */ - lttv_process_traceset_seek_time(tsc, events_request->start_time); + g_debug("SEEK TIME : %lu, %lu", events_request->start_time.tv_sec, + events_request->start_time.tv_nsec); + //lttv_process_traceset_seek_time(tsc, events_request->start_time); + lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), + events_request->start_time); + + /* Process the traceset with only state hooks */ + seek_count = + lttv_process_traceset_middle(tsc, + events_request->start_time, + G_MAXUINT, NULL); + + } else { + LttTime pos_time; /* Else, the first request in list_in is a position request */ /* If first req in list_in pos != current pos */ g_assert(events_request->start_position != NULL); + g_debug("SEEK POS time : %lu, %lu", + lttv_traceset_context_position_get_time( + events_request->start_position).tv_sec, + lttv_traceset_context_position_get_time( + events_request->start_position).tv_nsec); + + g_debug("SEEK POS context time : %lu, %lu", + lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_sec, + lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_nsec); + g_assert(events_request->start_position != NULL); if(lttv_traceset_context_ctx_pos_compare(tsc, events_request->start_position) != 0) { /* 1.2.2.1 Seek to that position */ - lttv_process_traceset_seek_position(tsc, events_request->start_position); + g_debug("SEEK POSITION"); + //lttv_process_traceset_seek_position(tsc, events_request->start_position); + pos_time = lttv_traceset_context_position_get_time( + events_request->start_position); + + lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), + pos_time); + + /* Process the traceset with only state hooks */ + seek_count = + lttv_process_traceset_middle(tsc, + ltt_time_infinite, + G_MAXUINT, + events_request->start_position); + g_assert(lttv_traceset_context_ctx_pos_compare(tsc, + events_request->start_position) == 0); + + } } } @@ -604,58 +1219,149 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - begin request hooks called * - servicing = TRUE */ - lttv_hooks_call(events_request->before_request, NULL); + lttv_hooks_call(events_request->before_request, (gpointer)tsc); events_request->servicing = TRUE; } /* 1.3.2 call before chunk * 1.3.3 events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } } } } else { /* 2. Else, list_in is not empty, we continue a read */ - GSList *iter = NULL; - tfc = lttv_traceset_context_get_current_tfc(tsc); + + { + /* 2.0 For each req of list_in */ + GSList *iter = list_in; - /* 2.1 For each req of list_out */ - for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) { - EventsRequest *events_request = (EventsRequest*)iter->data; + while(iter != NULL) { - /* if req.start time == current context time - * or req.start position == current position*/ - if( ltt_time_compare(events_request->start_time, - tfc->timestamp) == 0 - || - (events_request->start_position != NULL - && - lttv_traceset_context_ctx_pos_compare(tsc, - events_request->start_position) == 0) - ) { - /* - Add to list_in, remove from list_out */ - g_slist_append(list_in, events_request); - g_slist_remove(list_out, events_request); - - /* - If !servicing */ - if(events_request->servicing == FALSE) { - /* - begin request hooks called - * - servicing = TRUE - */ - lttv_hooks_call(events_request->before_request, NULL); - events_request->servicing = TRUE; - } - /* call before chunk - * events hooks added + EventsRequest *events_request = (EventsRequest *)iter->data; + + /* - Call before chunk + * - events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } + + iter = g_slist_next(iter); + } + } + + { + tfc = lttv_traceset_context_get_current_tfc(tsc); + + /* 2.1 For each req of list_out */ + GSList *iter = list_out; + + while(iter != NULL) { + + gboolean remove = FALSE; + gboolean free_data = FALSE; + EventsRequest *events_request = (EventsRequest *)iter->data; + + /* if req.start time == current context time + * or req.start position == current position*/ + if( ltt_time_compare(events_request->start_time, + tfc->timestamp) == 0 + || + (events_request->start_position != NULL + && + lttv_traceset_context_ctx_pos_compare(tsc, + events_request->start_position) == 0) + ) { + /* - Add to list_in, remove from list_out */ + list_in = g_slist_append(list_in, events_request); + remove = TRUE; + free_data = FALSE; + + /* - If !servicing */ + if(events_request->servicing == FALSE) { + /* - begin request hooks called + * - servicing = TRUE + */ + lttv_hooks_call(events_request->before_request, (gpointer)tsc); + events_request->servicing = TRUE; + } + /* call before chunk + * events hooks added + */ + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, events_request->before_chunk_trace, events_request->before_chunk_tracefile, events_request->event, events_request->event_by_id); + } + + + } + + /* Go to next */ + if(remove) + { + GSList *remove_iter = iter; + + iter = g_slist_next(iter); + if(free_data) events_request_free((EventsRequest*)remove_iter->data); + list_out = g_slist_remove_link(list_out, remove_iter); + } else { // not remove + iter = g_slist_next(iter); + } } } } @@ -742,7 +1448,16 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) { /* 4. Call process traceset middle */ + g_debug("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position); count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position); + + tfc = lttv_traceset_context_get_current_tfc(tsc); + if(tfc != NULL) + g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec, + tfc->timestamp.tv_nsec); + else + g_debug("End of trace reached after middle."); + } { /* 5. After process traceset middle */ @@ -763,13 +1478,33 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + + + } + /* - Call end request for req */ - lttv_hooks_call(events_request->after_request, NULL); + lttv_hooks_call(events_request->after_request, (gpointer)tsc); /* - remove req from list_in */ /* Destroy the request */ @@ -782,14 +1517,13 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) GSList *remove_iter = iter; iter = g_slist_next(iter); - if(free_data) g_free(remove_iter->data); + if(free_data) events_request_free((EventsRequest*)remove_iter->data); list_in = g_slist_remove_link(list_in, remove_iter); } else { // not remove iter = g_slist_next(iter); } } } - { /* 5.1 For each req in list_in */ GSList *iter = list_in; @@ -803,12 +1537,29 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + } + /* - req.num -= count */ g_assert(events_request->num_events >= count); events_request->num_events -= count; @@ -816,7 +1567,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) g_assert(tfc != NULL); /* - if req.num == 0 * or - * current context time > req.end time + * current context time >= req.end time * or * req.end pos == current pos * or @@ -827,17 +1578,18 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->stop_flag == TRUE || ltt_time_compare(tfc->timestamp, - events_request->end_time) > 0 + events_request->end_time) >= 0 || - (events_request->start_position != NULL + (events_request->end_position != NULL && lttv_traceset_context_ctx_pos_compare(tsc, - events_request->start_position) != 0) + events_request->end_position) == 0) ) { + g_assert(events_request->servicing == TRUE); /* - Call end request for req * - remove req from list_in */ - lttv_hooks_call(events_request->after_request, NULL); + lttv_hooks_call(events_request->after_request, (gpointer)tsc); /* - remove req from list_in */ /* Destroy the request */ remove = TRUE; @@ -850,7 +1602,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) GSList *remove_iter = iter; iter = g_slist_next(iter); - if(free_data) g_free(remove_iter->data); + if(free_data) events_request_free((EventsRequest*)remove_iter->data); list_in = g_slist_remove_link(list_in, remove_iter); } else { // not remove iter = g_slist_next(iter); @@ -859,6 +1611,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } } + /* End of removed servicing loop : leave control to GTK instead. */ + // if(gtk_events_pending()) break; + //} /* B. When interrupted between chunks */ @@ -875,12 +1630,11 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* 1.1. Use current postition as start position */ if(events_request->start_position != NULL) lttv_traceset_context_position_destroy(events_request->start_position); - events_request->start_position = ltt_traceset_context_position_new(); + events_request->start_position = lttv_traceset_context_position_new(); lttv_traceset_context_position_save(tsc, events_request->start_position); /* 1.2. Remove start time */ - events_request->start_time.tv_sec = G_MAXUINT; - events_request->start_time.tv_nsec = G_MAXUINT; + events_request->start_time = ltt_time_infinite; /* 1.3. Move from list_in to list_out */ remove = TRUE; @@ -893,7 +1647,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) GSList *remove_iter = iter; iter = g_slist_next(iter); - if(free_data) g_free(remove_iter->data); + if(free_data) events_request_free((EventsRequest*)remove_iter->data); list_in = g_slist_remove_link(list_in, remove_iter); } else { // not remove iter = g_slist_next(iter); @@ -902,28 +1656,59 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } + + /* C Unlock Traces */ + { + //lttv_process_traceset_get_sync_data(tsc); + + guint iter_trace; + + for(iter_trace=0; + iter_tracets); + iter_trace++) { + LttvTrace *trace_v = lttv_traceset_get(tsc->ts, iter_trace); + lttvwindowtraces_unlock(trace_v); + } + } + +#if 0 //set the cursor back to normal gdk_window_set_cursor(win, NULL); - +#endif //0 g_assert(g_slist_length(list_in) == 0); + if( g_slist_length(list_out) == 0 ) { /* Put tab's request pending flag back to normal */ tab->events_request_pending = FALSE; + g_debug("remove the idle fct"); return FALSE; /* Remove the idle function */ } + g_debug("leave the idle fct"); return TRUE; /* Leave the idle function */ + + /* We do not use simili-round-robin, it may require to read 1 meg buffers + * again and again if many tracesets use the same tracefiles. */ + /* Hack for round-robin idle functions */ + /* It will put the idle function at the end of the pool */ + /*g_idle_add_full((G_PRIORITY_HIGH_IDLE + 21), + (GSourceFunc)execute_events_requests, + tab, + NULL); + return FALSE; + */ } +#undef list_out /* add_trace_into_traceset_selector, each instance of a viewer has an associated * selector (filter), when a trace is added into traceset, the selector should * reflect the change. The function is used to update the selector */ - -void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t) +#if 0 +void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * t) { int j, k, m, nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event; LttvTracesetSelector * s; @@ -935,7 +1720,7 @@ void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t) LttFacility * fac; LttEventType * et; - w = gtk_multi_vpaned_get_first_widget(paned); + w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(paned)); while(w){ s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); @@ -969,18 +1754,19 @@ void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t) } }else g_warning("Module does not support filtering\n"); - w = gtk_multi_vpaned_get_next_widget(paned); + w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(paned)); } } - +#endif //0 static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v) { LttvTraceset *traceset = tab->traceset_info->traceset; guint i; + guint num_traces = lttv_traceset_number(traceset); //Verify if trace is already present. - for(i=0; itraceset_info-> traceset_context), traceset); + + //add state update hooks lttv_state_add_event_hooks( (LttvTracesetState*)tab->traceset_info->traceset_context); @@ -1022,7 +1810,8 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v) lttv_trace_unref(trace); } - add_trace_into_traceset_selector(tab->multi_vpaned, lttv_trace(trace_v)); + //FIXME + //add_trace_into_traceset_selector(GTK_MULTIVPANED(tab->multivpaned), lttv_trace(trace_v)); } /* add_trace adds a trace into the current traceset. It first displays a @@ -1072,13 +1861,17 @@ void add_trace(GtkWidget * widget, gpointer user_data) trace_v = lttvwindowtraces_get_trace_by_name(abs_path); if(trace_v == NULL) { trace = ltt_trace_open(abs_path); - if(trace == NULL) g_critical("cannot open trace %s", abs_path); - trace_v = lttv_trace_new(trace); - lttvwindowtraces_add_trace(trace_v); + if(trace == NULL) { + g_warning("cannot open trace %s", abs_path); + } else { + trace_v = lttv_trace_new(trace); + lttvwindowtraces_add_trace(trace_v); + lttvwindow_add_trace(tab, trace_v); + } + } else { + lttvwindow_add_trace(tab, trace_v); } - lttvwindow_add_trace(tab, trace_v); - gtk_widget_destroy((GtkWidget*)file_selector); //update current tab @@ -1105,14 +1898,14 @@ void add_trace(GtkWidget * widget, gpointer user_data) * selector (filter), when a trace is remove from traceset, the selector should * reflect the change. The function is used to update the selector */ - -void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i) +#if 0 +void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i) { LttvTracesetSelector * s; LttvTraceSelector * t; GtkWidget * w; - w = gtk_multi_vpaned_get_first_widget(paned); + w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(paned)); while(w){ s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); if(s){ @@ -1120,10 +1913,10 @@ void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i) lttv_traceset_selector_trace_remove(s, i); lttv_trace_selector_destroy(t); }g_warning("Module dose not support filtering\n"); - w = gtk_multi_vpaned_get_next_widget(paned); + w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(paned)); } } - +#endif //0 /* remove_trace removes a trace from the current traceset if all viewers in * the current tab are not interested in the trace. It first displays a @@ -1134,6 +1927,98 @@ void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i) * current traceset, it will delete all viewers of the current tab */ +// MD : no filter version. +void remove_trace(GtkWidget *widget, gpointer user_data) +{ + LttTrace *trace; + LttvTrace * trace_v; + LttvTraceset * traceset; + gint i, j, nb_trace, index=-1; + char ** name, *remove_trace_name; + MainWindow * mw_data = get_window_data_struct(widget); + GtkWidget * notebook = lookup_widget(widget, "MNotebook"); + + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); + Tab *tab; + + if(!page) { + return; + } else { + tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); + } + + nb_trace =lttv_traceset_number(tab->traceset_info->traceset); + name = g_new(char*,nb_trace); + for(i = 0; i < nb_trace; i++){ + trace_v = lttv_traceset_get(tab->traceset_info->traceset, i); + trace = lttv_trace(trace_v); + name[i] = ltt_trace_name(trace); + } + + remove_trace_name = get_remove_trace(name, nb_trace); + + + if(remove_trace_name){ + + /* yuk, cut n paste from old code.. should be better (MD)*/ + for(i = 0; itraceset_info->traceset; + //Keep a reference to the traces so they are not freed. + for(j=0; jtraceset_info->traceset_context); + lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)); + g_object_unref(tab->traceset_info->traceset_context); + + trace_v = lttv_traceset_get(traceset, index); + + lttv_traceset_remove(traceset, index); + lttv_trace_unref(trace_v); // Remove local reference + + if(lttv_trace_get_ref_number(trace_v) <= 1) { + /* ref 1 : lttvwindowtraces only*/ + ltt_trace_close(lttv_trace(trace_v)); + /* lttvwindowtraces_remove_trace takes care of destroying + * the traceset linked with the trace_v and also of destroying + * the trace_v at the same time. + */ + lttvwindowtraces_remove_trace(trace_v); + } + + tab->traceset_info->traceset_context = + g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); + lttv_context_init( + LTTV_TRACESET_CONTEXT(tab-> + traceset_info->traceset_context),traceset); + //add state update hooks + lttv_state_add_event_hooks( + (LttvTracesetState*)tab->traceset_info->traceset_context); + + //Remove local reference to the traces. + for(j=0; jmulti_vpaned); + //FIXME + w = gtk_multivpaned_get_widget(GTK_MULTIVPANED(tab->multivpaned)); if(w){ s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); if(s){ @@ -1181,7 +2067,7 @@ void remove_trace(GtkWidget * widget, gpointer user_data) } //check if other viewers select the trace - w = gtk_multi_vpaned_get_first_widget(tab->multi_vpaned); + w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(tab->multivpaned)); while(w){ s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); if(s){ @@ -1189,13 +2075,13 @@ void remove_trace(GtkWidget * widget, gpointer user_data) selected = lttv_trace_selector_get_selected(t); if(selected)break; } - w = gtk_multi_vpaned_get_next_widget(tab->multi_vpaned); + w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(tab->multivpaned)); } }else selected = FALSE; //if no viewer selects the trace, remove it if(!selected){ - remove_trace_from_traceset_selector(tab->multi_vpaned, i); + remove_trace_from_traceset_selector(GTK_MULTIVPANED(tab->multivpaned), i); traceset = tab->traceset_info->traceset; //Keep a reference to the traces so they are not freed. @@ -1245,19 +2131,19 @@ void remove_trace(GtkWidget * widget, gpointer user_data) //update current tab //update_traceset(mw_data); - if(nb_trace > 1){ + //if(nb_trace > 1){ - SetTraceset(mw_data, (gpointer)traceset); + SetTraceset(tab, (gpointer)traceset); // in expose now call_pending_read_hooks(mw_data); //lttvwindow_report_current_time(mw_data,&(tab->current_time)); - }else{ - if(tab){ - while(tab->multi_vpaned->num_children){ - gtk_multi_vpaned_widget_delete(tab->multi_vpaned); - } - } - } + //}else{ + // if(tab){ + // while(tab->multi_vpaned->num_children){ + // gtk_multi_vpaned_widget_delete(tab->multi_vpaned); + // } + // } + //} } break; } @@ -1266,7 +2152,7 @@ void remove_trace(GtkWidget * widget, gpointer user_data) g_free(name); } - +#endif //0 /* Redraw all the viewers in the current tab */ void redraw(GtkWidget *widget, gpointer user_data) @@ -1331,18 +2217,19 @@ void stop_processing(GtkWidget *widget, gpointer user_data) } else { tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - GSList *events_requests = tab->events_requests; - - GSList *iter = events_requests; + GSList *iter = tab->events_requests; while(iter != NULL) { GSList *remove_iter = iter; iter = g_slist_next(iter); g_free(remove_iter->data); - events_requests = g_slist_remove_link(events_requests, remove_iter); + tab->events_requests = + g_slist_remove_link(tab->events_requests, remove_iter); } - g_assert(g_slist_length(events_requests) == 0); + tab->events_request_pending = FALSE; + g_idle_remove_by_data(tab); + g_assert(g_slist_length(tab->events_requests) == 0); } @@ -1368,7 +2255,7 @@ void save_as(GtkWidget * widget, gpointer user_data) void zoom(GtkWidget * widget, double size) { - TimeInterval *time_span; + TimeInterval time_span; TimeWindow new_time_window; LttTime current_time, time_delta, time_s, time_e, time_tmp; MainWindow * mw_data = get_window_data_struct(widget); @@ -1388,70 +2275,50 @@ void zoom(GtkWidget * widget, double size) if(size == 1) return; tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); - time_span = &tsc->time_span; + time_span = tsc->time_span; new_time_window = tab->time_window; current_time = tab->current_time; - time_delta = ltt_time_sub(time_span->end_time,time_span->start_time); + time_delta = ltt_time_sub(time_span.end_time,time_span.start_time); if(size == 0){ - new_time_window.start_time = time_span->start_time; + new_time_window.start_time = time_span.start_time; new_time_window.time_width = time_delta; }else{ new_time_window.time_width = ltt_time_div(new_time_window.time_width, size); if(ltt_time_compare(new_time_window.time_width,time_delta) > 0) { /* Case where zoom out is bigger than trace length */ - new_time_window.start_time = time_span->start_time; + new_time_window.start_time = time_span.start_time; new_time_window.time_width = time_delta; } else { /* Center the image on the current time */ - g_critical("update is HERE"); new_time_window.start_time = ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0)); /* If on borders, don't fall off */ - if(ltt_time_compare(new_time_window.start_time, time_span->start_time) <0) + if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0) { - new_time_window.start_time = time_span->start_time; + new_time_window.start_time = time_span.start_time; } else { if(ltt_time_compare( ltt_time_add(new_time_window.start_time, new_time_window.time_width), - time_span->end_time) > 0) + time_span.end_time) > 0) { new_time_window.start_time = - ltt_time_sub(time_span->end_time, new_time_window.time_width); + ltt_time_sub(time_span.end_time, new_time_window.time_width); } } } + } - - - //time_tmp = ltt_time_div(new_time_window.time_width, 2); - //if(ltt_time_compare(current_time, time_tmp) < 0){ - // time_s = time_span->startTime; - //} else { - // time_s = ltt_time_sub(current_time,time_tmp); - //} - //time_e = ltt_time_add(current_time,time_tmp); - //if(ltt_time_compare(time_span->startTime, time_s) > 0){ - // time_s = time_span->startTime; - //}else if(ltt_time_compare(time_span->endTime, time_e) < 0){ - // time_e = time_span->endTime; - // time_s = ltt_time_sub(time_e,new_time_window.time_width); - //} - //new_time_window.start_time = time_s; - } - - //lttvwindow_report_time_window(mw_data, &new_time_window); - //call_pending_read_hooks(mw_data); - - //lttvwindow_report_current_time(mw_data,&(tab->current_time)); - set_time_window(tab, &new_time_window); - // in expose now call_pending_read_hooks(mw_data); - gtk_multi_vpaned_set_adjust(tab->multi_vpaned, &new_time_window, FALSE); + if(ltt_time_compare(new_time_window.time_width, ltt_time_zero) == 0) { + g_warning("Zoom more than 1 ns impossible"); + } else { + time_change_manager(tab, new_time_window); + } } void zoom_in(GtkWidget * widget, gpointer user_data) @@ -1471,7 +2338,7 @@ void zoom_extended(GtkWidget * widget, gpointer user_data) void go_to_time(GtkWidget * widget, gpointer user_data) { - g_printf("Go to time\n"); + g_printf("Go to time\n"); } void show_time_frame(GtkWidget * widget, gpointer user_data) @@ -1725,6 +2592,7 @@ on_remove_viewer_activate (GtkMenuItem *menuitem, delete_viewer((GtkWidget*)menuitem, user_data); } +#if 0 void on_trace_filter_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -1744,7 +2612,7 @@ on_trace_filter_activate (GtkMenuItem *menuitem, tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - w = gtk_multi_vpaned_get_widget(tab->multi_vpaned); + w = gtk_multivpaned_get_widget(GTK_MULTIVPANED(tab->multivpaned)); s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); if(!s){ @@ -1758,59 +2626,316 @@ on_trace_filter_activate (GtkMenuItem *menuitem, //lttvwindow_report_current_time(mw_data,&(tab->current_time)); } } +#endif //0 + +void +on_trace_facility_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + g_printf("Trace facility selector: %s\n"); +} + + +/* Dispaly a file selection dialogue to let user select a library, then call + * lttv_library_load(). + */ + +void +on_load_library_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + GError *error = NULL; + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); + + gchar load_module_path_alter[PATH_MAX]; + { + GPtrArray *name; + guint nb,i; + gchar *load_module_path; + name = g_ptr_array_new(); + nb = lttv_library_path_number(); + /* ask for the library path */ + + for(i=0;ipdata), name->len, + "Select a library path", "Library paths"); + if(load_module_path != NULL) + strncpy(load_module_path_alter, load_module_path, PATH_MAX-1); // -1 for / + + g_ptr_array_free(name, TRUE); + + if(load_module_path == NULL) return; + } + + { + /* Make sure the module path ends with a / */ + gchar *ptr = load_module_path_alter; + + ptr = strchr(ptr, '\0'); + + if(*(ptr-1) != '/') { + *ptr = '/'; + *(ptr+1) = '\0'; + } + } + + { + /* Ask for the library to load : list files in the previously selected + * directory */ + gchar str[PATH_MAX]; + gchar ** dir; + gint id; + GtkFileSelection * file_selector = + (GtkFileSelection *)gtk_file_selection_new("Select a module"); + gtk_file_selection_set_filename(file_selector, load_module_path_alter); + gtk_file_selection_hide_fileop_buttons(file_selector); + + str[0] = '\0'; + id = gtk_dialog_run(GTK_DIALOG(file_selector)); + switch(id){ + case GTK_RESPONSE_ACCEPT: + case GTK_RESPONSE_OK: + dir = gtk_file_selection_get_selections (file_selector); + strncpy(str,dir[0],PATH_MAX); + strncpy(remember_plugins_dir,dir[0],PATH_MAX); + /* only keep file name */ + gchar *str1; + str1 = strrchr(str,'/'); + if(str1)str1++; + else{ + str1 = strrchr(str,'\\'); + str1++; + } +#if 0 + /* remove "lib" */ + if(*str1 == 'l' && *(str1+1)== 'i' && *(str1+2)=='b') + str1=str1+3; + remove info after . */ + { + gchar *str2 = str1; + + str2 = strrchr(str2, '.'); + if(str2 != NULL) *str2 = '\0'; + } + lttv_module_require(str1, &error); +#endif //0 + lttv_library_load(str1, &error); + if(error != NULL) g_warning(error->message); + else g_printf("Load library: %s\n", str); + g_strfreev(dir); + case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_CANCEL: + default: + gtk_widget_destroy((GtkWidget*)file_selector); + break; + } + + } + + + +} + + +/* Display all loaded modules, let user to select a module to unload + * by calling lttv_module_unload + */ + +void +on_unload_library_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); + + LttvLibrary *library; + { + GPtrArray *name; + guint nb,i; + gchar *lib_name; + name = g_ptr_array_new(); + nb = lttv_library_number(); + LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb); + /* ask for the library name */ + + for(i=0;ipdata), name->len, + "Select a library", "Libraries"); + if(lib_name != NULL) { + for(i=0;ipdata), name->len, + "Select a library", "Libraries"); + if(lib_name != NULL) { + for(i=0;ipdata), name->len, + "Select a module", "Modules"); + if(module_name != NULL) { + for(i=0;imessage); + else g_printf("Load module: %s\n", module_name_out); + + +#if 0 + { + + + gchar str[PATH_MAX]; + gchar ** dir; + gint id; + GtkFileSelection * file_selector = + (GtkFileSelection *)gtk_file_selection_new("Select a module"); + gtk_file_selection_set_filename(file_selector, load_module_path_alter); + gtk_file_selection_hide_fileop_buttons(file_selector); + + str[0] = '\0'; + id = gtk_dialog_run(GTK_DIALOG(file_selector)); + switch(id){ + case GTK_RESPONSE_ACCEPT: + case GTK_RESPONSE_OK: + dir = gtk_file_selection_get_selections (file_selector); + strncpy(str,dir[0],PATH_MAX); + strncpy(remember_plugins_dir,dir[0],PATH_MAX); + { + /* only keep file name */ + gchar *str1; + str1 = strrchr(str,'/'); + if(str1)str1++; + else{ + str1 = strrchr(str,'\\'); + str1++; + } +#if 0 + /* remove "lib" */ + if(*str1 == 'l' && *(str1+1)== 'i' && *(str1+2)=='b') + str1=str1+3; + remove info after . */ + { + gchar *str2 = str1; + + str2 = strrchr(str2, '.'); + if(str2 != NULL) *str2 = '\0'; + } + lttv_module_require(str1, &error); +#endif //0 + lttv_library_load(str1, &error); + if(error != NULL) g_warning(error->message); + else g_printf("Load library: %s\n", str); + g_strfreev(dir); + case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_CANCEL: + default: + gtk_widget_destroy((GtkWidget*)file_selector); + break; + } + } - g_printf("Load module: %s\n", str); +#endif //0 + + } + /* Display all loaded modules, let user to select a module to unload * by calling lttv_module_unload */ @@ -1819,48 +2944,93 @@ void on_unload_module_activate (GtkMenuItem *menuitem, gpointer user_data) { - int i; - GPtrArray *name; - char *unload_module_name; - guint nb; - LttvLibrary *library; - LttvLibraryInfo library_info; + GError *error = NULL; MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); - - name = g_ptr_array_new(); - nb = lttv_library_number(); - for(i=0;i 0) g_ptr_array_add(name, library_info.name); - } + LttvLibrary *library; + { + GPtrArray *name; + guint nb,i; + gchar *lib_name; + name = g_ptr_array_new(); + nb = lttv_library_number(); + LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb); + /* ask for the library name */ - unload_module_name =get_unload_module((char **)(name->pdata), name->len); - - if(unload_module_name){ for(i=0;ipdata), name->len, + "Select a library", "Libraries"); + if(lib_name != NULL) { + for(i=0;i 0) g_ptr_array_add(name, path); + } + module_name = get_selection((char **)(name->pdata), name->len, + "Select a module", "Modules"); + if(module_name != NULL) { + for(i=0;ipdata), name->len, + "Select a library path", "Library paths"); + + g_ptr_array_free(name, TRUE); + + if(lib_path == NULL) return; + } + + lttv_library_path_remove(lib_path); +} + void on_color_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -1917,11 +3120,90 @@ on_content_activate (GtkMenuItem *menuitem, } +static void +on_about_close_activate (GtkButton *button, + gpointer user_data) +{ + GtkWidget *about_widget = GTK_WIDGET(user_data); + + gtk_widget_destroy(about_widget); +} + void on_about_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("About...\n"); + MainWindow *main_window = get_window_data_struct(GTK_WIDGET(menuitem)); + GtkWidget *window_widget = main_window->mwindow; + GtkWidget *about_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GtkWindow *about_window = GTK_WINDOW(about_widget); + gint window_width, window_height; + + gtk_window_set_title(about_window, "About Linux Trace Toolkit"); + + gtk_window_set_resizable(about_window, FALSE); + gtk_window_set_transient_for(GTK_WINDOW(window_widget), about_window); + gtk_window_set_destroy_with_parent(about_window, TRUE); + gtk_window_set_modal(about_window, FALSE); + + /* Put the about window at the center of the screen */ + gtk_window_get_size(about_window, &window_width, &window_height); + gtk_window_move (about_window, + (gdk_screen_width() - window_width)/2, + (gdk_screen_height() - window_height)/2); + + GtkWidget *vbox = gtk_vbox_new(FALSE, 1); + + gtk_container_add(GTK_CONTAINER(about_widget), vbox); + + + /* Text to show */ + GtkWidget *label1 = gtk_label_new(""); + gtk_misc_set_padding(GTK_MISC(label1), 10, 20); + gtk_label_set_markup(GTK_LABEL(label1), "\ +Linux Trace Toolkit"); + gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_CENTER); + + GtkWidget *label2 = gtk_label_new(""); + gtk_misc_set_padding(GTK_MISC(label2), 10, 20); + gtk_label_set_markup(GTK_LABEL(label2), "\ +Project author: Karim Yaghmour\n\ +\n\ +Contributors :\n\ +\n\ +Michel Dagenais (New trace format, lttv main)\n\ +Mathieu Desnoyers (Directory structure, build with automake/conf,\n\ + lttv gui, control flow view, gui green threads\n\ + with interruptible foreground and background computation,\n\ + detailed event list)\n\ +Benoit Des Ligneris (Cluster adaptation)\n\ +Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\ + detailed event list and statistics view)\n\ +Tom Zanussi (RelayFS)"); + + GtkWidget *label3 = gtk_label_new(""); + gtk_label_set_markup(GTK_LABEL(label3), "\ +Linux Trace Toolkit, Copyright (C) 2004 Karim Yaghmour\n\ +Linux Trace Toolkit comes with ABSOLUTELY NO WARRANTY.\n\ +This is free software, and you are welcome to redistribute it\n\ +under certain conditions. See COPYING for details."); + gtk_misc_set_padding(GTK_MISC(label3), 10, 20); + + gtk_box_pack_start_defaults(GTK_BOX(vbox), label1); + gtk_box_pack_start_defaults(GTK_BOX(vbox), label2); + gtk_box_pack_start_defaults(GTK_BOX(vbox), label3); + + GtkWidget *hbox = gtk_hbox_new(TRUE, 0); + gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + GtkWidget *close_button = gtk_button_new_with_mnemonic("_Close"); + gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(close_button), 20); + + g_signal_connect(G_OBJECT(close_button), "clicked", + G_CALLBACK(on_about_close_activate), + (gpointer)about_widget); + + gtk_widget_show_all(about_widget); } @@ -2139,6 +3421,465 @@ on_MNotebook_switch_page (GtkNotebook *notebook, } +void time_change_manager (Tab *tab, + TimeWindow new_time_window) +{ + /* Only one source of time change */ + if(tab->time_manager_lock == TRUE) return; + + tab->time_manager_lock = TRUE; + + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + LttTime start_time = new_time_window.start_time; + LttTime end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); + + /* Set scrollbar */ + GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); + LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time); +#if 0 + gtk_range_set_increments(GTK_RANGE(tab->scrollbar), + ltt_time_to_double(new_time_window.time_width) + / SCROLL_STEP_PER_PAGE + * NANOSECONDS_PER_SECOND, /* step increment */ + ltt_time_to_double(new_time_window.time_width) + * NANOSECONDS_PER_SECOND); /* page increment */ + gtk_range_set_range(GTK_RANGE(tab->scrollbar), + 0.0, /* lower */ + ltt_time_to_double(upper) + * NANOSECONDS_PER_SECOND); /* upper */ +#endif //0 + g_object_set(G_OBJECT(adjustment), + "lower", + 0.0, /* lower */ + "upper", + ltt_time_to_double(upper), /* upper */ + "step_increment", + ltt_time_to_double(new_time_window.time_width) + / SCROLL_STEP_PER_PAGE, /* step increment */ + "page_increment", + ltt_time_to_double(new_time_window.time_width), + /* page increment */ + "page_size", + ltt_time_to_double(new_time_window.time_width), /* page size */ + NULL); + gtk_adjustment_changed(adjustment); + + // g_object_set(G_OBJECT(adjustment), + // "value", + // ltt_time_to_double( + // ltt_time_sub(start_time, time_span.start_time)) + // , /* value */ + // NULL); + //gtk_adjustment_value_changed(adjustment); + gtk_range_set_value(GTK_RANGE(tab->scrollbar), + ltt_time_to_double( + ltt_time_sub(start_time, time_span.start_time)) /* value */); + + /* set the time bar. */ + /* start seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry1), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry1), + (double)start_time.tv_sec); + + /* start nanoseconds */ + if(start_time.tv_sec == time_span.start_time.tv_sec) { + /* can be both beginning and end at the same time. */ + if(start_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. -1 (not zero length) */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2), + (double)time_span.start_time.tv_nsec, + (double)time_span.end_time.tv_nsec-1); + } else { + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2), + (double)time_span.start_time.tv_nsec, + (double)NANOSECONDS_PER_SECOND-1); + } + } else if(start_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. -1 (not zero length) */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2), + 0.0, + (double)time_span.end_time.tv_nsec-1); + } else /* anywhere else */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry2), + 0.0, + (double)NANOSECONDS_PER_SECOND-1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2), + (double)start_time.tv_nsec); + + /* end seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry3), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry3), + (double)end_time.tv_sec); + + /* end nanoseconds */ + if(end_time.tv_sec == time_span.start_time.tv_sec) { + /* can be both beginning and end at the same time. */ + if(end_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4), + (double)time_span.start_time.tv_nsec+1, + (double)time_span.end_time.tv_nsec); + } else { + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4), + (double)time_span.start_time.tv_nsec+1, + (double)NANOSECONDS_PER_SECOND-1); + } + } + else if(end_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4), + 0.0, + (double)time_span.end_time.tv_nsec); + } + else /* anywhere else */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry4), + 0.0, + (double)NANOSECONDS_PER_SECOND-1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4), + (double)end_time.tv_nsec); + + /* call viewer hooks for new time window */ + set_time_window(tab, &new_time_window); + + tab->time_manager_lock = FALSE; +} + + +/* value changed for frame start s + * + * Check time span : if ns is out of range, clip it the nearest good value. + */ +void +on_MEntry1_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + + TimeWindow new_time_window = tab->time_window; + + LttTime end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); + + new_time_window.start_time.tv_sec = value; + + /* start nanoseconds */ + if(new_time_window.start_time.tv_sec == time_span.start_time.tv_sec) { + if(new_time_window.start_time.tv_sec == time_span.end_time.tv_sec) { + if(new_time_window.start_time.tv_nsec > time_span.end_time.tv_nsec) + new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1; + if(new_time_window.start_time.tv_nsec < time_span.start_time.tv_nsec) + new_time_window.start_time.tv_nsec = time_span.start_time.tv_nsec; + } else { + if(new_time_window.start_time.tv_nsec < time_span.start_time.tv_nsec) + new_time_window.start_time.tv_nsec = time_span.start_time.tv_nsec; + } + } + else if(new_time_window.start_time.tv_sec == time_span.end_time.tv_sec) { + if(new_time_window.start_time.tv_nsec > time_span.end_time.tv_nsec) + new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1; + } + + /* check if end time selected is below or equal */ + if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { + /* Then, we must push back end time : keep the same time width + * if possible, else end traceset time */ + end_time = LTT_TIME_MIN(time_span.end_time, + ltt_time_add(new_time_window.start_time, + new_time_window.time_width) + ); + } + + /* Fix the time width to fit start time and end time */ + new_time_window.time_width = ltt_time_sub(end_time, + new_time_window.start_time); + + time_change_manager(tab, new_time_window); + +} + +void +on_MEntry2_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + + TimeWindow new_time_window = tab->time_window; + + LttTime end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); + + new_time_window.start_time.tv_nsec = value; + + /* check if end time selected is below or equal */ + if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { + /* Then, we must push back end time : keep the same time width + * if possible, else end traceset time */ + end_time = LTT_TIME_MIN(time_span.end_time, + ltt_time_add(new_time_window.start_time, + new_time_window.time_width) + ); + } + + /* Fix the time width to fit start time and end time */ + new_time_window.time_width = ltt_time_sub(end_time, + new_time_window.start_time); + + time_change_manager(tab, new_time_window); + +} + +void +on_MEntry3_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + + TimeWindow new_time_window = tab->time_window; + + LttTime end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); + end_time.tv_sec = value; + + /* end nanoseconds */ + if(end_time.tv_sec == time_span.start_time.tv_sec) { + if(end_time.tv_sec == time_span.end_time.tv_sec) { + if(end_time.tv_nsec > time_span.end_time.tv_nsec) + end_time.tv_nsec = time_span.end_time.tv_nsec; + if(end_time.tv_nsec < time_span.start_time.tv_nsec) + end_time.tv_nsec = time_span.start_time.tv_nsec+1; + } else { + if(end_time.tv_nsec < time_span.start_time.tv_nsec) + end_time.tv_nsec = time_span.start_time.tv_nsec+1; + } + } + else if(end_time.tv_sec == time_span.end_time.tv_sec) { + if(end_time.tv_nsec > time_span.end_time.tv_nsec) + end_time.tv_nsec = time_span.end_time.tv_nsec; + } + + /* check if end time selected is below or equal */ + if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { + /* Then, we must push front start time : keep the same time width + * if possible, else end traceset time */ + new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, + ltt_time_sub(end_time, + new_time_window.time_width) + ); + } + + /* Fix the time width to fit start time and end time */ + new_time_window.time_width = ltt_time_sub(end_time, + new_time_window.start_time); + + time_change_manager(tab, new_time_window); + +} + +void +on_MEntry4_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + + TimeWindow new_time_window = tab->time_window; + + LttTime end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); + end_time.tv_nsec = value; + + /* check if end time selected is below or equal */ + if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { + /* Then, we must push front start time : keep the same time width + * if possible, else end traceset time */ + new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, + ltt_time_sub(end_time, + new_time_window.time_width) + ); + } + + /* Fix the time width to fit start time and end time */ + new_time_window.time_width = ltt_time_sub(end_time, + new_time_window.start_time); + + time_change_manager(tab, new_time_window); + +} + + +void current_time_change_manager (Tab *tab, + LttTime new_current_time) +{ + /* Only one source of time change */ + if(tab->current_time_manager_lock == TRUE) return; + + tab->current_time_manager_lock = TRUE; + + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + + /* current seconds */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry5), + (double)time_span.start_time.tv_sec, + (double)time_span.end_time.tv_sec); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry5), + (double)new_current_time.tv_sec); + + + /* start nanoseconds */ + if(new_current_time.tv_sec == time_span.start_time.tv_sec) { + /* can be both beginning and end at the same time. */ + if(new_current_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6), + (double)time_span.start_time.tv_nsec, + (double)time_span.end_time.tv_nsec); + } else { + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6), + (double)time_span.start_time.tv_nsec, + (double)NANOSECONDS_PER_SECOND-1); + } + } else if(new_current_time.tv_sec == time_span.end_time.tv_sec) { + /* If we are at the end, max nsec to end.. */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6), + 0.0, + (double)time_span.end_time.tv_nsec); + } else /* anywhere else */ + gtk_spin_button_set_range(GTK_SPIN_BUTTON(tab->MEntry6), + 0.0, + (double)NANOSECONDS_PER_SECOND-1); + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry6), + (double)new_current_time.tv_nsec); + + set_current_time(tab, &new_current_time); + + tab->current_time_manager_lock = FALSE; +} + +void +on_MEntry5_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab = (Tab*)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + LttTime new_current_time = tab->current_time; + new_current_time.tv_sec = value; + + /* current nanoseconds */ + if(new_current_time.tv_sec == time_span.start_time.tv_sec) { + if(new_current_time.tv_sec == time_span.end_time.tv_sec) { + if(new_current_time.tv_nsec > time_span.end_time.tv_nsec) + new_current_time.tv_nsec = time_span.end_time.tv_nsec; + if(new_current_time.tv_nsec < time_span.start_time.tv_nsec) + new_current_time.tv_nsec = time_span.start_time.tv_nsec; + } else { + if(new_current_time.tv_nsec < time_span.start_time.tv_nsec) + new_current_time.tv_nsec = time_span.start_time.tv_nsec; + } + } + else if(new_current_time.tv_sec == time_span.end_time.tv_sec) { + if(new_current_time.tv_nsec > time_span.end_time.tv_nsec) + new_current_time.tv_nsec = time_span.end_time.tv_nsec; + } + + current_time_change_manager(tab, new_current_time); +} + +void +on_MEntry6_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab = (Tab*)user_data; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + LttTime new_current_time = tab->current_time; + new_current_time.tv_nsec = value; + + current_time_change_manager(tab, new_current_time); +} + + +void scroll_value_changed_cb(GtkWidget *scrollbar, + gpointer user_data) +{ + Tab *tab = (Tab *)user_data; + TimeWindow new_time_window; + LttTime time; + GtkAdjustment *adjust = gtk_range_get_adjustment(GTK_RANGE(scrollbar)); + gdouble value = gtk_adjustment_get_value(adjust); + // gdouble upper, lower, ratio, page_size; + gdouble page_size; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + + time = ltt_time_add(ltt_time_from_double(value), + time_span.start_time); + + new_time_window.start_time = time; + + page_size = adjust->page_size; + + new_time_window.time_width = + ltt_time_from_double(page_size); + + + time_change_manager(tab, new_time_window); +#if 0 + //time_window = tab->time_window; + + lower = adjust->lower; + upper = adjust->upper; + ratio = (value - lower) / (upper - lower); + g_info("lower %lu, upper %lu, value %lu, ratio %lu", lower, upper, value, ratio); + + //time = ltt_time_sub(time_span->end_time, time_span->start_time); + //time = ltt_time_mul(time, (float)ratio); + //time = ltt_time_add(time_span->start_time, time); + time = ltt_time_add(ltt_time_from_double(value), + time_span.start_time); + + time_window.start_time = time; + + page_size = adjust->page_size; + + time_window.time_width = + ltt_time_from_double(page_size); + //time = ltt_time_sub(time_span.end_time, time); + //if(ltt_time_compare(time,time_window.time_width) < 0){ + // time_window.time_width = time; + //} + + /* call viewer hooks for new time window */ + set_time_window(tab, &time_window); +#endif //0 +} + + /* callback function to check or uncheck the check box (filter) */ @@ -2380,13 +4121,25 @@ char * get_remove_trace(char ** all_trace_name, int nb_trace) } +/* Select a module which will be loaded + */ + +char * get_load_module(char ** load_module_name, int nb_module) +{ + return get_selection(load_module_name, nb_module, + "Select a module to load", "Module name"); +} + + + + /* Select a module which will be unloaded */ char * get_unload_module(char ** loaded_module_name, int nb_module) { return get_selection(loaded_module_name, nb_module, - "Select an unload module", "Module pathname"); + "Select a module to unload", "Module name"); } @@ -2589,7 +4342,6 @@ void construct_main_window(MainWindow * parent) // Add the object's information to the module's array g_main_window_list = g_slist_append(g_main_window_list, new_m_window); - new_window = create_MWindow(); gtk_widget_show (new_window); @@ -2616,7 +4368,7 @@ void construct_main_window(MainWindow * parent) g_printf("Notebook does not exist\n"); return; } - gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook)); + //gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook)); //for now there is no name field in LttvTraceset structure //Use "Traceset" as the label for the default tab if(parent) { @@ -2633,9 +4385,57 @@ void construct_main_window(MainWindow * parent) new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset"); } else { new_tab = create_tab(new_m_window, NULL, notebook, "Traceset"); + /* First window, use command line trace */ if(g_init_trace != NULL){ lttvwindow_add_trace(new_tab, g_init_trace); + + } + LttvTraceset *traceset = new_tab->traceset_info->traceset; + SetTraceset(new_tab, traceset); + + /* Insert default viewers */ + { + LttvAttributeType type; + LttvAttributeName name; + LttvAttributeValue value; + LttvAttribute *attribute; + + LttvIAttribute *attributes_global = + LTTV_IATTRIBUTE(lttv_global_attributes()); + + g_assert(attribute = + LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( + LTTV_IATTRIBUTE(attributes_global), + LTTV_VIEWER_CONSTRUCTORS))); + + name = g_quark_from_string("guievents"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); + } + + name = g_quark_from_string("guicontrolflow"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); + } + + name = g_quark_from_string("guistatistics"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); + } + } } @@ -2647,44 +4447,46 @@ void construct_main_window(MainWindow * parent) * destroy the tab */ -void tab_destructor(Tab * tab_instance) +void tab_destructor(Tab * tab) { int i, nb, ref_count; LttvTrace * trace; - if(tab_instance->attributes) - g_object_unref(tab_instance->attributes); + gtk_object_destroy(GTK_OBJECT(tab->tooltips)); + + if(tab->attributes) + g_object_unref(tab->attributes); - if(tab_instance->interrupted_state) - g_object_unref(tab_instance->interrupted_state); + if(tab->interrupted_state) + g_object_unref(tab->interrupted_state); - if(tab_instance->traceset_info->traceset_context != NULL){ + if(tab->traceset_info->traceset_context != NULL){ //remove state update hooks lttv_state_remove_event_hooks( - (LttvTracesetState*)tab_instance->traceset_info-> + (LttvTracesetState*)tab->traceset_info-> traceset_context); - lttv_context_fini(LTTV_TRACESET_CONTEXT(tab_instance->traceset_info-> + lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info-> traceset_context)); - g_object_unref(tab_instance->traceset_info->traceset_context); + g_object_unref(tab->traceset_info->traceset_context); } - if(tab_instance->traceset_info->traceset != NULL) { - nb = lttv_traceset_number(tab_instance->traceset_info->traceset); + if(tab->traceset_info->traceset != NULL) { + nb = lttv_traceset_number(tab->traceset_info->traceset); for(i = 0 ; i < nb ; i++) { - trace = lttv_traceset_get(tab_instance->traceset_info->traceset, i); + trace = lttv_traceset_get(tab->traceset_info->traceset, i); ref_count = lttv_trace_get_ref_number(trace); if(ref_count <= 1){ ltt_trace_close(lttv_trace(trace)); } } } - lttv_traceset_destroy(tab_instance->traceset_info->traceset); + lttv_traceset_destroy(tab->traceset_info->traceset); /* Remove the idle events requests processing function of the tab */ - g_idle_remove_by_data(tab_instance); + g_idle_remove_by_data(tab); - g_slist_free(tab_instance->events_requests); - g_free(tab_instance->traceset_info); - g_free(tab_instance); + g_slist_free(tab->events_requests); + g_free(tab->traceset_info); + g_free(tab); } @@ -2711,13 +4513,16 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->traceset_info->traceset = lttv_traceset_new(); } -//FIXME : this is g_debug level +#ifdef DEBUG lttv_attribute_write_xml( lttv_traceset_attribute(tab->traceset_info->traceset), stdout, 0, 4); fflush(stdout); +#endif //DEBUG + tab->time_manager_lock = FALSE; + tab->current_time_manager_lock = FALSE; //FIXME copy not implemented in lower level tab->traceset_info->traceset_context = @@ -2731,6 +4536,7 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, (LttvTracesetState*)tab->traceset_info->traceset_context); //determine the current_time and time_window of the tab +#if 0 if(copy_tab != NULL){ tab->time_window = copy_tab->time_window; tab->current_time = copy_tab->current_time; @@ -2755,10 +4561,177 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> time_span.start_time.tv_nsec; } +#endif //0 tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); - tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new(); - gtk_widget_show((GtkWidget*)tab->multi_vpaned); + + tab->vbox = gtk_vbox_new(FALSE, 2); + tab->viewer_container = gtk_vbox_new(TRUE, 2); + tab->scrollbar = gtk_hscrollbar_new(NULL); + //tab->multivpaned = gtk_multi_vpaned_new(); + + gtk_box_pack_start(GTK_BOX(tab->vbox), + tab->viewer_container, + TRUE, /* expand */ + TRUE, /* Give the extra space to the child */ + 0); /* No padding */ + + /* Create the timebar */ + { + tab->MTimebar = gtk_hbox_new(FALSE, 2); + gtk_widget_show(tab->MTimebar); + tab->tooltips = gtk_tooltips_new(); + + tab->MEventBox1a = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox1a); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox1a, + "Paste Start and End Times Here", ""); + tab->MText1a = gtk_label_new("Time Frame "); + gtk_widget_show(tab->MText1a); + gtk_container_add(GTK_CONTAINER(tab->MEventBox1a), tab->MText1a); + tab->MEventBox1b = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox1b); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox1b, + "Paste Start Time Here", ""); + tab->MText1b = gtk_label_new("start: "); + gtk_widget_show(tab->MText1b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox1b), tab->MText1b); + tab->MText2 = gtk_label_new("s"); + gtk_widget_show(tab->MText2); + tab->MText3a = gtk_label_new("ns"); + gtk_widget_show(tab->MText3a); + tab->MEventBox3b = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox3b); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox3b, + "Paste End Time Here", ""); + tab->MText3b = gtk_label_new("end:"); + gtk_widget_show(tab->MText3b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox3b), tab->MText3b); + tab->MText4 = gtk_label_new("s"); + gtk_widget_show(tab->MText4); + tab->MText5a = gtk_label_new("ns"); + gtk_widget_show(tab->MText5a); + tab->MEventBox5b = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox5b); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox5b, + "Paste Current Time Here", ""); + tab->MText5b = gtk_label_new("Current Time:"); + gtk_widget_show(tab->MText5b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox5b), tab->MText5b); + tab->MText6 = gtk_label_new("s"); + gtk_widget_show(tab->MText6); + tab->MText7 = gtk_label_new("ns"); + gtk_widget_show(tab->MText7); + + tab->MEntry1 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry1),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry1),TRUE); + gtk_widget_show(tab->MEntry1); + tab->MEntry2 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry2),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry2),TRUE); + gtk_widget_show(tab->MEntry2); + tab->MEntry3 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry3),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry3),TRUE); + gtk_widget_show(tab->MEntry3); + tab->MEntry4 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry4),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry4),TRUE); + gtk_widget_show(tab->MEntry4); + tab->MEntry5 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry5),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry5),TRUE); + gtk_widget_show(tab->MEntry5); + tab->MEntry6 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry6),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry6),TRUE); + gtk_widget_show(tab->MEntry6); + + + GtkWidget *temp_widget; + + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox1a, FALSE, + FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox1b, FALSE, + FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry1, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText2, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry2, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText3a, FALSE, FALSE, 0); + temp_widget = gtk_vseparator_new(); + gtk_widget_show(temp_widget); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox3b, FALSE, + FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry3, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText4, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry4, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText5a, FALSE, FALSE, 0); + temp_widget = gtk_vseparator_new(); + gtk_widget_show(temp_widget); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText7, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry6, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText6, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry5, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEventBox5b, FALSE, + FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0); + + + //GtkWidget *test = gtk_button_new_with_label("drop"); + //gtk_button_set_relief(GTK_BUTTON(test), GTK_RELIEF_NONE); + //gtk_widget_show(test); + //gtk_box_pack_end(GTK_BOX (tab->MTimebar), test, FALSE, FALSE, 0); + //gtk_widget_add_events(tab->MText1, GDK_ALL_EVENTS_MASK);//GDK_BUTTON_PRESS_MASK); + /*GtkWidget *event_box = gtk_event_box_new(); + gtk_widget_show(event_box); + gtk_tooltips_set_tip(tooltips, event_box, + "Paste Current Time Here", ""); + gtk_box_pack_end(GTK_BOX (tab->MTimebar), event_box, FALSE, FALSE, 0); + GtkWidget *test = gtk_label_new("drop"); + gtk_container_add(GTK_CONTAINER(event_box), test); + gtk_widget_show(test); + g_signal_connect (G_OBJECT(event_box), + "button-press-event", + G_CALLBACK (on_MText1_paste), + (gpointer)tab); +*/ + + g_signal_connect (G_OBJECT(tab->MEventBox1a), + "button-press-event", + G_CALLBACK (on_MEventBox1a_paste), + (gpointer)tab); + + g_signal_connect (G_OBJECT(tab->MEventBox1b), + "button-press-event", + G_CALLBACK (on_MEventBox1b_paste), + (gpointer)tab); + g_signal_connect (G_OBJECT(tab->MEventBox3b), + "button-press-event", + G_CALLBACK (on_MEventBox3b_paste), + (gpointer)tab); + g_signal_connect (G_OBJECT(tab->MEventBox5b), + "button-press-event", + G_CALLBACK (on_MEventBox5b_paste), + (gpointer)tab); + } + + gtk_box_pack_end(GTK_BOX(tab->vbox), + tab->scrollbar, + FALSE, /* Do not expand */ + FALSE, /* Fill has no effect here (expand false) */ + 0); /* No padding */ + + gtk_box_pack_end(GTK_BOX(tab->vbox), + tab->MTimebar, + FALSE, /* Do not expand */ + FALSE, /* Fill has no effect here (expand false) */ + 0); /* No padding */ + + g_object_set_data(G_OBJECT(tab->viewer_container), "focused_viewer", NULL); + + tab->mw = mw; /*{ @@ -2792,7 +4765,12 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->label = gtk_label_new (label); - gtk_widget_show (tab->label); + + gtk_widget_show(tab->label); + gtk_widget_show(tab->scrollbar); + gtk_widget_show(tab->viewer_container); + gtk_widget_show(tab->vbox); + //gtk_widget_show(tab->multivpaned); /* Start with empty events requests list */ @@ -2800,15 +4778,41 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->events_request_pending = FALSE; g_object_set_data_full( - G_OBJECT(tab->multi_vpaned), + G_OBJECT(tab->vbox), "Tab_Info", tab, (GDestroyNotify)tab_destructor); + g_signal_connect(G_OBJECT(tab->scrollbar), "value-changed", + G_CALLBACK(scroll_value_changed_cb), tab); + + g_signal_connect ((gpointer) tab->MEntry1, "value-changed", + G_CALLBACK (on_MEntry1_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry2, "value-changed", + G_CALLBACK (on_MEntry2_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry3, "value-changed", + G_CALLBACK (on_MEntry3_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry4, "value-changed", + G_CALLBACK (on_MEntry4_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry5, "value-changed", + G_CALLBACK (on_MEntry5_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry6, "value-changed", + G_CALLBACK (on_MEntry6_value_changed), + tab); + + //g_signal_connect(G_OBJECT(tab->scrollbar), "changed", + // G_CALLBACK(scroll_value_changed_cb), tab); + + //insert tab into notebook gtk_notebook_append_page(notebook, - (GtkWidget*)tab->multi_vpaned, - tab->label); + tab->vbox, + tab->label); list = gtk_container_get_children(GTK_CONTAINER(notebook)); gtk_notebook_set_current_page(notebook,g_list_length(list)-1); // always show : not if(g_list_length(list)>1)