projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added options to run different tests in module batchtest
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
modules
/
gui
/
detailedevents
/
events.c
diff --git
a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 02ad79a094c4c5f365a596c325c0fc8e43a07e1f..17cc9321c5255f45f969668d3e270801245fc1cc 100644
(file)
--- a/
ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/
ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@
-46,7
+46,7
@@
#include <lttv/module.h>
#include <lttv/hook.h>
#include <lttv/module.h>
#include <lttv/hook.h>
-#include <lttv/gtk
TraceS
et.h>
+#include <lttv/gtk
traces
et.h>
#include <lttv/processTrace.h>
#include <lttv/state.h>
#include <ltt/ltt.h>
#include <lttv/processTrace.h>
#include <lttv/state.h>
#include <ltt/ltt.h>
@@
-478,12
+478,12
@@
gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
G_OBJECT(event_viewer_data->hbox_v),
MAX_NUMBER_EVENT,
&event_viewer_data->size);
G_OBJECT(event_viewer_data->hbox_v),
MAX_NUMBER_EVENT,
&event_viewer_data->size);
-
+/*
g_object_set_data(
G_OBJECT(event_viewer_data->hbox_v),
TRACESET_TIME_SPAN,
&event_viewer_data->time_span);
g_object_set_data(
G_OBJECT(event_viewer_data->hbox_v),
TRACESET_TIME_SPAN,
&event_viewer_data->time_span);
-
+*/
event_viewer_data->filter_key = g_strdup(key);
g_object_set_data(
G_OBJECT(event_viewer_data->hbox_v),
event_viewer_data->filter_key = g_strdup(key);
g_object_set_data(
G_OBJECT(event_viewer_data->hbox_v),
@@
-805,6
+805,12
@@
gboolean show_event_detail(void * hook_data, void * call_data)
EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
+ if(event_viewer_data->raw_trace_data_queue_tmp->length == 0 &&
+ event_viewer_data->raw_trace_data_queue->length == 0){
+ event_viewer_data->shown = FALSE;
+ return FALSE;
+ }
+
if(event_viewer_data->shown == FALSE){
event_viewer_data->shown = TRUE;
update_raw_data_array(event_viewer_data,
if(event_viewer_data->shown == FALSE){
event_viewer_data->shown = TRUE;
update_raw_data_array(event_viewer_data,
@@
-1201,6
+1207,7
@@
gui_events_free(EventViewerData *event_viewer_data)
unreg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw);
unreg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw);
unreg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw);
unreg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw);
+ g_free(event_viewer_data->filter_key);
g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data);
g_free(event_viewer_data);
}
g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data);
g_free(event_viewer_data);
}
@@
-1213,8
+1220,8
@@
gui_events_destructor(EventViewerData *event_viewer_data)
/* May already been done by GTK window closing */
if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
/* May already been done by GTK window closing */
if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
+ gui_events_free(event_viewer_data);
gtk_widget_destroy(event_viewer_data->hbox_v);
gtk_widget_destroy(event_viewer_data->hbox_v);
- g_free(event_viewer_data->filter_key);
event_viewer_data = NULL;
}
event_viewer_data = NULL;
}
@@
-1266,7
+1273,7
@@
void add_context_hooks(EventViewerData * event_viewer_data,
LttvTracesetContext * tsc)
{
gint i, j, k, m,n, nbi, id;
LttvTracesetContext * tsc)
{
gint i, j, k, m,n, nbi, id;
- gint nb_tracefile, nb_
control, nb_per_cpu, nb_
facility, nb_event;
+ gint nb_tracefile, nb_facility, nb_event;
LttTrace *trace;
LttvTraceContext *tc;
LttvTracefileContext *tfc;
LttTrace *trace;
LttvTraceContext *tc;
LttvTracefileContext *tfc;
@@
-1292,19
+1299,14
@@
void add_context_hooks(EventViewerData * event_viewer_data,
trace = tc->t;
//if there are hooks for trace, add them here
trace = tc->t;
//if there are hooks for trace, add them here
- nb_control = ltt_trace_control_tracefile_number(trace);
- nb_per_cpu = ltt_trace_per_cpu_tracefile_number(trace);
- nb_tracefile = nb_control + nb_per_cpu;
+ nb_tracefile = ltt_trace_control_tracefile_number(trace) +
+ ltt_trace_per_cpu_tracefile_number(trace);
for(j = 0 ; j < nb_tracefile ; j++) {
tf_s = lttv_trace_selector_tracefile_get(t_s,j);
selected = lttv_tracefile_selector_get_selected(tf_s);
if(!selected) continue;
for(j = 0 ; j < nb_tracefile ; j++) {
tf_s = lttv_trace_selector_tracefile_get(t_s,j);
selected = lttv_tracefile_selector_get_selected(tf_s);
if(!selected) continue;
-
- if(j < nb_control)
- tfc = tc->control_tracefiles[j];
- else
- tfc = tc->per_cpu_tracefiles[j - nb_control];
+ tfc = tc->tracefiles[j];
//if there are hooks for tracefile, add them here
// lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL,
//if there are hooks for tracefile, add them here
// lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL,
@@
-1342,7
+1344,7
@@
void remove_context_hooks(EventViewerData * event_viewer_data,
LttvTracesetContext * tsc)
{
gint i, j, k, m, nbi, n, id;
LttvTracesetContext * tsc)
{
gint i, j, k, m, nbi, n, id;
- gint nb_tracefile, nb_
control, nb_per_cpu, nb_
facility, nb_event;
+ gint nb_tracefile, nb_facility, nb_event;
LttTrace *trace;
LttvTraceContext *tc;
LttvTracefileContext *tfc;
LttTrace *trace;
LttvTraceContext *tc;
LttvTracefileContext *tfc;
@@
-1368,19
+1370,14
@@
void remove_context_hooks(EventViewerData * event_viewer_data,
trace = tc->t;
//if there are hooks for trace, remove them here
trace = tc->t;
//if there are hooks for trace, remove them here
- nb_control = ltt_trace_control_tracefile_number(trace);
- nb_per_cpu = ltt_trace_per_cpu_tracefile_number(trace);
- nb_tracefile = nb_control + nb_per_cpu;
+ nb_tracefile = ltt_trace_control_tracefile_number(trace) +
+ ltt_trace_per_cpu_tracefile_number(trace);
for(j = 0 ; j < nb_tracefile ; j++) {
tf_s = lttv_trace_selector_tracefile_get(t_s,j);
selected = lttv_tracefile_selector_get_selected(tf_s);
if(!selected) continue;
for(j = 0 ; j < nb_tracefile ; j++) {
tf_s = lttv_trace_selector_tracefile_get(t_s,j);
selected = lttv_tracefile_selector_get_selected(tf_s);
if(!selected) continue;
-
- if(j < nb_control)
- tfc = tc->control_tracefiles[j];
- else
- tfc = tc->per_cpu_tracefiles[j - nb_control];
+ tfc = tc->tracefiles[j];
//if there are hooks for tracefile, remove them here
// lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL,
//if there are hooks for tracefile, remove them here
// lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL,
@@
-1441,6
+1438,8
@@
gboolean update_current_time(void * hook_data, void * call_data)
int i, j;
LttTime t;
int i, j;
LttTime t;
+ if(!event_viewer_data->raw_trace_data_queue->head) return FALSE;
+
if(event_viewer_data->current_time_updated ){
event_viewer_data->current_time_updated = FALSE;
return FALSE;
if(event_viewer_data->current_time_updated ){
event_viewer_data->current_time_updated = FALSE;
return FALSE;
This page took
0.025614 seconds
and
4
git commands to generate.