X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Finit_module.c;h=89d7fea7e03e0227ea37aca04706ea5c1d4f5ff1;hb=91fd6881c35fd1146aafc67a803626f733cbeb14;hp=505cc86da3416398df06be904fe51c5c1d53b70d;hpb=6ced96ef9d5c1af6dbef8ef6e26f71ed6abdd676;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 505cc86d..89d7fea7 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,6 +38,7 @@ #include #include #include +#include #include "interface.h" #include "support.h" @@ -46,7 +48,30 @@ #include -GQuark LTTV_TRACES; +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 ; @@ -63,12 +88,19 @@ static char *a_trace; void lttv_trace_option(void *hook_data) { LttTrace *trace; - gchar *path; - - 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[PATH_MAX]; + + 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); + } + } } /***************************************************************************** @@ -110,8 +142,31 @@ 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_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', @@ -125,6 +180,37 @@ static void init() { lttv_hooks_add(main_hooks, window_creation_hook, NULL, LTTV_PRIO_DEFAULT); + { + /* Register state calculator */ + 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); + } + + { + /* Register statistics calculator */ + LttvHooks *hook_adder = lttv_hooks_new(); + lttv_hooks_add(hook_adder, lttv_stats_hook_add_event_hooks, NULL, + LTTV_PRIO_DEFAULT); + LttvHooks *hook_remover = lttv_hooks_new(); + lttv_hooks_add(hook_remover, lttv_stats_hook_remove_event_hooks, + NULL, LTTV_PRIO_DEFAULT); + LttvHooks *after_request = lttv_hooks_new(); + lttv_hooks_add(after_request, lttv_stats_sum_traceset_hook, NULL, + LTTV_PRIO_DEFAULT); + /* Add state computation background hook adder to attributes */ + lttvwindowtraces_register_computation_hooks(g_quark_from_string("stats"), + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + after_request, NULL, NULL, + hook_adder, hook_remover); + } } void @@ -147,6 +233,11 @@ static void destroy() { LttvTrace *trace; GSList *iter = NULL; + lttvwindowtraces_unregister_requests(g_quark_from_string("stats")); + lttvwindowtraces_unregister_requests(g_quark_from_string("state")); + lttvwindowtraces_unregister_computation_hooks(g_quark_from_string("stats")); + lttvwindowtraces_unregister_computation_hooks(g_quark_from_string("state")); + lttv_option_remove("trace"); lttv_hooks_remove_data(main_hooks, window_creation_hook, NULL);