X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finit_module.c;h=7b2d8c7def60aa095ec740243466901a56bbace1;hb=b052368a0d53ff62ed9110fbafdb857a2b034ca8;hp=7faf99edfa0bc1b68912f4ca2f87946c92a13703;hpb=7afc14aa328665480b57e91234740392c8a236b1;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c index 7faf99ed..7b2d8c7d 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c @@ -26,6 +26,7 @@ #endif #include +#include #include #include @@ -37,14 +38,41 @@ #include #include #include +#include #include "interface.h" #include "support.h" #include +#include #include "callbacks.h" #include +LttvTraceInfo LTTV_TRACES, + LTTV_COMPUTATION, + LTTV_REQUESTS_QUEUE, + LTTV_REQUESTS_CURRENT, + LTTV_NOTIFY_QUEUE, + LTTV_NOTIFY_CURRENT, + LTTV_COMPUTATION_TRACESET, + LTTV_COMPUTATION_TRACESET_CONTEXT, + LTTV_BEFORE_CHUNK_TRACESET, + LTTV_BEFORE_CHUNK_TRACE, + LTTV_BEFORE_CHUNK_TRACEFILE, + LTTV_AFTER_CHUNK_TRACESET, + LTTV_AFTER_CHUNK_TRACE, + LTTV_AFTER_CHUNK_TRACEFILE, + LTTV_BEFORE_REQUEST, + LTTV_AFTER_REQUEST, + LTTV_EVENT_HOOK, + LTTV_EVENT_HOOK_BY_ID, + LTTV_HOOK_ADDER, + LTTV_HOOK_REMOVER, + LTTV_IN_PROGRESS, + LTTV_READY, + LTTV_LOCK; + + /** Array containing instanced objects. */ GSList * g_main_window_list = NULL ; @@ -56,13 +84,23 @@ LttvTrace *g_init_trace = NULL; static char *a_trace; + void lttv_trace_option(void *hook_data) { LttTrace *trace; - - trace = ltt_trace_open(a_trace); - if(trace == NULL) g_critical("cannot open trace %s", a_trace); - g_init_trace = lttv_trace_new(trace); + gchar *abs_path; + + get_absolute_pathname(a_trace, abs_path); + g_init_trace = lttvwindowtraces_get_trace_by_name(abs_path); + if(g_init_trace == NULL) { + trace = ltt_trace_open(abs_path); + if(trace == NULL) { + g_warning("cannot open trace %s", abs_path); + } else { + g_init_trace = lttv_trace_new(trace); + lttvwindowtraces_add_trace(g_init_trace); + } + } } /***************************************************************************** @@ -104,8 +142,33 @@ static void init() { // Global attributes only used for interaction with main() here. LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + LTTV_TRACES = g_quark_from_string("traces"); + LTTV_COMPUTATION = g_quark_from_string("computation"); + LTTV_REQUESTS_QUEUE = g_quark_from_string("requests_queue"); + LTTV_REQUESTS_CURRENT = g_quark_from_string("requests_current"); + LTTV_NOTIFY_QUEUE = g_quark_from_string("notify_queue"); + LTTV_NOTIFY_CURRENT = g_quark_from_string("notify_current"); + LTTV_COMPUTATION_TRACESET = g_quark_from_string("computation_traceset"); + LTTV_COMPUTATION_TRACESET_CONTEXT = + g_quark_from_string("computation_traceset_context"); + LTTV_BEFORE_CHUNK_TRACESET = g_quark_from_string("before_chunk_traceset"); + LTTV_BEFORE_CHUNK_TRACE = g_quark_from_string("before_chunk_trace"); + LTTV_BEFORE_CHUNK_TRACEFILE = g_quark_from_string("before_chunk_tracefile"); + LTTV_AFTER_CHUNK_TRACESET = g_quark_from_string("after_chunk_traceset"); + LTTV_AFTER_CHUNK_TRACE = g_quark_from_string("after_chunk_trace"); + LTTV_AFTER_CHUNK_TRACEFILE = g_quark_from_string("after_chunk_tracefile"); + LTTV_BEFORE_REQUEST = g_quark_from_string("before_request"); + LTTV_AFTER_REQUEST = g_quark_from_string("after_request"); + LTTV_EVENT_HOOK = g_quark_from_string("event_hook"); + LTTV_EVENT_HOOK_BY_ID = g_quark_from_string("event_hook_by_id"); + LTTV_HOOK_ADDER = g_quark_from_string("hook_adder"); + LTTV_HOOK_REMOVER = g_quark_from_string("hook_remover"); + LTTV_IN_PROGRESS = g_quark_from_string("in_progress"); + LTTV_READY = g_quark_from_string("ready"); + LTTV_LOCK = g_quark_from_string("lock"); + g_debug("GUI init()"); - + lttv_option_add("trace", 't', "add a trace to the trace set to analyse", "pathname of the directory containing the trace", @@ -115,27 +178,28 @@ static void init() { LTTV_POINTER, &value)); g_assert((main_hooks = *(value.v_pointer)) != NULL); - lttv_hooks_add(main_hooks, window_creation_hook, NULL); - + lttv_hooks_add(main_hooks, window_creation_hook, NULL, LTTV_PRIO_DEFAULT); + + LttvHooks *hook_adder = lttv_hooks_new(); + lttv_hooks_add(hook_adder, lttv_state_save_hook_add_event_hooks, NULL, + LTTV_PRIO_DEFAULT); + LttvHooks *hook_remover = lttv_hooks_new(); + lttv_hooks_add(hook_remover, lttv_state_save_hook_remove_event_hooks, + NULL, LTTV_PRIO_DEFAULT); + /* Add state computation background hook adder to attributes */ + lttvwindowtraces_register_computation_hooks(g_quark_from_string("state"), + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + hook_adder, hook_remover); } void main_window_destructor(MainWindow * mw) { - if(GTK_IS_WIDGET(mw->mwindow)){ - gtk_widget_destroy(mw->mwindow); - mw = NULL; - } -} - - -void main_window_destroy_walk(gpointer data, gpointer user_data) -{ - main_window_destructor((MainWindow*)data); + g_assert(GTK_IS_WIDGET(mw->mwindow)); + gtk_widget_destroy(mw->mwindow); } - /** * plugin's destroy function * @@ -146,6 +210,10 @@ static void destroy() { LttvAttributeValue value; LttvTrace *trace; + GSList *iter = NULL; + + lttvwindowtraces_unregister_requests(g_quark_from_string("state")); + lttvwindowtraces_unregister_computation_hooks(g_quark_from_string("state")); lttv_option_remove("trace"); @@ -154,7 +222,9 @@ static void destroy() { g_debug("GUI destroy()"); if(g_main_window_list){ - g_slist_foreach(g_main_window_list, main_window_destroy_walk, NULL ); + for(iter=g_main_window_list;iter!=NULL;iter=g_slist_next(iter)) { + main_window_destructor((MainWindow*)iter->data); + } g_slist_free(g_main_window_list); } @@ -163,4 +233,4 @@ static void destroy() { LTTV_MODULE("lttvwindow", "Viewer main window", \ "Viewer with multiple windows, tabs and panes for graphical modules", \ - init, destroy, "stats") + init, destroy, "stats", "option")