#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
//FIXME
-#define TRACE_NUMBER 0
+// fixed #define TRACE_NUMBER 0
#define EXTRA_ALLOC 1024 // pixels
{ 0, 0x0000, 0xFF00, 0x0000 }, /* COL_RUN_USER_MODE : green */
{ 0, 0x0100, 0x9E00, 0xFFFF }, /* COL_RUN_SYSCALL : pale blue */
{ 0, 0xFF00, 0xFF00, 0x0100 }, /* COL_RUN_TRAP : yellow */
- { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : red */
+ { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : orange */
+ { 0, 0xFFFF, 0x9400, 0x9600 }, /* COL_RUN_SOFT_IRQ : pink */
{ 0, 0x6600, 0x0000, 0x0000 }, /* COL_WAIT : dark red */
{ 0, 0x7700, 0x7700, 0x0000 }, /* COL_WAIT_CPU : dark yellow */
{ 0, 0x6400, 0x0000, 0x5D00 }, /* COL_ZOMBIE : dark purple */
if(width < 0) return ;
if(height < 0) return ;
+
Tab *tab = drawing->control_flow_data->tab;
TimeWindow time_window =
lttvwindow_get_time_window(tab);
LttvTraceHookByFacility *thf;
guint ret;
+ gint before_hn, after_hn;
nb_trace = lttv_traceset_number(traceset);
- // FIXME : eventually request for more traces
- // for(i = 0 ; i < nb_trace ; i++) {
- for(i = 0; i<MIN(TRACE_NUMBER+1, nb_trace);i++)
- {
+ // FIXME (fixed) : eventually request for more traces
+ for(i = 0 ; i < nb_trace ; i++) {
+ //for(i = 0; i<MIN(TRACE_NUMBER+1, nb_trace);i++) {
EventsRequest *events_request = g_new(EventsRequest, 1);
// Create the hooks
//LttvHooks *event = lttv_hooks_new();
associated by id hooks. */
hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
- hooks = g_array_set_size(hooks, 13);
+ hooks = g_array_set_size(hooks, 17);
+ before_hn = after_hn = 0;
/* before hooks */
ret = lttv_trace_find_hook(ts->parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
LTT_FIELD_SYSCALL_ID, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 0));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
- LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
+ LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
0, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 1));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
LTT_FIELD_TRAP_ID, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 2));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
0, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 3));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
LTT_FIELD_IRQ_ID, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 4));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
0, 0, 0,
before_execmode_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 5));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
+
+ ret = lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
+ LTT_FIELD_SOFT_IRQ_ID, 0, 0,
+ before_execmode_hook,
+ events_request,
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
+
+ ret = lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
+ 0, 0, 0,
+ before_execmode_hook,
+ events_request,
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
+
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
before_schedchange_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 6));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
LTT_FIELD_PID, 0, 0,
before_process_exit_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 7));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
LTT_FIELD_PID, 0, 0,
before_process_release_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 8));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, before_hn++));
+ if(ret) before_hn--;
#if 0
lttv_trace_find_hook(ts->parent.t,
"core", "process", "event_sub_id",
"event_data1", "event_data2", before_process_hook,
- &g_array_index(hooks, LttvTraceHook, 7));
+ &g_array_index(hooks, LttvTraceHook, hn++));
#endif //0
#if 0
lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid",
- NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7));
+ NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, hn++));
lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL,
- NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8));
+ NULL, process_exit, &g_array_index(hooks, LttvTraceHook, hn++));
#endif //0
/* after hooks */
#if 0
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id",
- NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 8));
+ NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL,
- NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9));
+ NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id",
- NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 10));
+ NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL,
- after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 11));
+ after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL,
- NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 12));
+ NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
/**** DESACTIVATED ****/
lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL,
- after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13));
+ after_execmode_hook, &g_array_index(hooks, LttvTraceHook, hn++));
#endif //0
#if 0
lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out",
"out_state", after_schedchange_hook,
- &g_array_index(hooks, LttvTraceHook, 8));
+ &g_array_index(hooks, LttvTraceHook, hn++));
lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id",
"event_data1", "event_data2", after_process_hook,
- &g_array_index(hooks, LttvTraceHook, 9));
+ &g_array_index(hooks, LttvTraceHook, hn++));
#endif //0
+ after_hn = before_hn;
+
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
after_schedchange_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 9));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_FORK,
LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
after_process_fork_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 10));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
LTT_FIELD_PID, 0, 0,
after_process_exit_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 11));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
ret = lttv_trace_find_hook(ts->parent.t,
LTT_FACILITY_FS, LTT_EVENT_EXEC,
0, 0, 0,
after_fs_exec_hook,
events_request,
- &g_array_index(hooks, LttvTraceHook, 12));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
+ ret = lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND,
+ LTT_FIELD_NAME, 0, 0,
+ after_user_generic_thread_brand_hook,
+ events_request,
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
+ ret = lttv_trace_find_hook(ts->parent.t,
+ LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE,
+ LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+ after_event_enum_process_hook,
+ events_request,
+ &g_array_index(hooks, LttvTraceHook, after_hn++));
+ if(ret) after_hn--;
+
+ hooks = g_array_set_size(hooks, after_hn);
#if 0
lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid",
- NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7));
+ NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, hn++));
lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL,
- NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8));
+ NULL, process_exit, &g_array_index(hooks, LttvTraceHook, hn++));
#endif //0
/* Add these hooks to each event_by_id hooks list */
/* add before */
- for(k = 0 ; k < 9 ; k++) {
+ for(k = 0 ; k < before_hn ; k++) {
hook = &g_array_index(hooks, LttvTraceHook, k);
for(l=0;l<hook->fac_list->len;l++) {
thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
}
/* add after */
- for(k = 9 ; k < 13 ; k++) {
+ for(k = before_hn ; k < after_hn ; k++) {
hook = &g_array_index(hooks, LttvTraceHook, k);
for(l=0;l<hook->fac_list->len;l++) {
thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
events_request->end_time = time_end;
events_request->num_events = G_MAXUINT;
events_request->end_position = NULL;
- events_request->trace = i; /* FIXME */
+ events_request->trace = i; //fixed /* FIXME */
events_request->before_chunk_traceset = before_chunk_traceset;
events_request->before_chunk_trace = NULL;
events_request->before_chunk_tracefile = NULL;
{
g_debug("Begin of chunk");
ControlFlowData *cfd = events_request->viewer_data;
- LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ LttvTracesetContext *tsc = &tss->parent.parent;
//LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
- guint num_cpu =
- ltt_trace_get_num_cpu(tss->parent.traces[TRACE_NUMBER]->t);
-
- cfd->process_list->current_hash_data = g_new(HashedProcessData*,num_cpu);
- memset(cfd->process_list->current_hash_data, 0,
- sizeof(HashedProcessData*)*num_cpu);
+ guint i;
+ LttvTraceset *traceset = tsc->ts;
+ guint nb_trace = lttv_traceset_number(traceset);
+
+ if(!cfd->process_list->current_hash_data) {
+ cfd->process_list->current_hash_data = g_new(HashedProcessData**,nb_trace);
+ for(i = 0 ; i < nb_trace ; i++) {
+ guint num_cpu = ltt_trace_get_num_cpu(tss->parent.traces[i]->t);
+ cfd->process_list->current_hash_data[i] = g_new(HashedProcessData*,num_cpu);
+ memset(cfd->process_list->current_hash_data[i], 0,
+ sizeof(HashedProcessData*)*num_cpu);
+ }
+ }
//cfd->drawing->last_start = LTT_TIME_MIN(current_time,
// events_request->end_time);
}
LttvTracesetState *tss,
LttTime end_time)
{
- gint x, x_end, width;
+ gint x, width;
+ guint x_end;
ControlFlowData *cfd = events_request->viewer_data;
LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
x, 0,
width, drawing->drawing_area->allocation.height);
+ /* Update directly when scrolling */
+ gdk_window_process_updates(drawing->drawing_area->window,
+ TRUE);
}
drawing->alloc_height = drawing->height + EXTRA_ALLOC;
update_pixmap_size(drawing->control_flow_data->process_list,
drawing->alloc_width);
+ update_index_to_pixmap(drawing->control_flow_data->process_list);
}
//drawing->height = widget->allocation.height;
(ControlFlowData*)g_object_get_data(
G_OBJECT(widget),
"control_flow_data");
+#if 0
if(unlikely(drawing->gc == NULL)) {
drawing->gc = gdk_gc_new(drawing->drawing_area->window);
gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc);
}
-
+#endif //0
TimeWindow time_window =
lttvwindow_get_time_window(control_flow_data->tab);
LttTime current_time =
event->area.width, event->area.height);
#endif //0
drawing->height = processlist_get_height(control_flow_data->process_list);
+#if 0
copy_pixmap_to_screen(control_flow_data->process_list,
widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
event->area.x, event->area.y,
event->area.width, event->area.height);
+#endif //0
+ copy_pixmap_to_screen(control_flow_data->process_list,
+ widget->window,
+ drawing->gc,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
/* Erase the dotted lines left.. */
drawing->width,
&cursor_x);
-
+#if 0
if(drawing->dotted_gc == NULL) {
drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window);
dash_list,
2);
}
+#endif //0
gint height_tot = MAX(widget->allocation.height, drawing->height);
gdk_draw_line(widget->window,
drawing->dotted_gc,
drawing->pango_layout =
gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
- drawing->dotted_gc = NULL;
-
drawing->height = 1;
drawing->width = 1;
drawing->depth = 0;
G_CALLBACK (button_press_event),
(gpointer)drawing);
+
gtk_widget_show(drawing->ruler);
gtk_widget_show(drawing->padding);
gtk_widget_show(drawing->ruler_hbox);
gdk_colormap_alloc_colors(colormap, drawing_colors, NUM_COLORS, FALSE,
TRUE, success);
+ drawing->gc =
+ gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+ drawing->dotted_gc =
+ gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+
+ gdk_gc_copy(drawing->gc,
+ main_window_get_widget(control_flow_data->tab)->style->black_gc);
+ gdk_gc_copy(drawing->dotted_gc,
+ main_window_get_widget(control_flow_data->tab)->style->white_gc);
+
+ gint8 dash_list[] = { 1, 2 };
+ gdk_gc_set_line_attributes(drawing->dotted_gc,
+ 1,
+ GDK_LINE_ON_OFF_DASH,
+ GDK_CAP_BUTT,
+ GDK_JOIN_MITER);
+ gdk_gc_set_dashes(drawing->dotted_gc,
+ 0,
+ dash_list,
+ 2);
+
+ drawing->ruler_gc_butt =
+ gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+ gdk_gc_copy(drawing->ruler_gc_butt,
+ main_window_get_widget(control_flow_data->tab)->style->black_gc);
+ drawing->ruler_gc_round =
+ gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+ gdk_gc_copy(drawing->ruler_gc_round,
+ main_window_get_widget(control_flow_data->tab)->style->black_gc);
+
+
+ gdk_gc_set_line_attributes(drawing->ruler_gc_butt,
+ 2,
+ GDK_LINE_SOLID,
+ GDK_CAP_BUTT,
+ GDK_JOIN_MITER);
+
+ gdk_gc_set_line_attributes(drawing->ruler_gc_round,
+ 2,
+ GDK_LINE_SOLID,
+ GDK_CAP_ROUND,
+ GDK_JOIN_ROUND);
+
+
return drawing;
}
if(drawing->gc != NULL)
gdk_gc_unref(drawing->gc);
- g_free(drawing->pango_layout);
+ g_object_unref(drawing->pango_layout);
if(drawing->dotted_gc != NULL) gdk_gc_unref(drawing->dotted_gc);
+ if(drawing->ruler_gc_butt != NULL) gdk_gc_unref(drawing->ruler_gc_butt);
+ if(drawing->ruler_gc_round != NULL) gdk_gc_unref(drawing->ruler_gc_round);
+
g_free(drawing);
g_info("drawing_destroy end");
}
event->area.width,
event->area.height);
- GdkGC *gc = gdk_gc_new(drawing->ruler->window);
- gdk_gc_copy(gc, drawing->ruler->style->black_gc);
- gdk_gc_set_line_attributes(gc,
- 2,
- GDK_LINE_SOLID,
- GDK_CAP_BUTT,
- GDK_JOIN_MITER);
gdk_draw_line (drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
event->area.x, 1,
event->area.x + event->area.width, 1);
global_width += ink_rect.width;
gdk_draw_layout_with_colors(drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
0,
6,
layout, &foreground, &background);
- gdk_gc_set_line_attributes(gc,
- 2,
- GDK_LINE_SOLID,
- GDK_CAP_ROUND,
- GDK_JOIN_ROUND);
-
gdk_draw_line (drawing->ruler->window,
- gc,
+ drawing->ruler_gc_round,
1, 1,
1, 7);
if(global_width <= drawing->ruler->allocation.width)
{
gdk_draw_layout_with_colors(drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
drawing->ruler->allocation.width - ink_rect.width,
6,
layout, &foreground, &background);
- gdk_gc_set_line_attributes(gc,
- 2,
- GDK_LINE_SOLID,
- GDK_CAP_ROUND,
- GDK_JOIN_ROUND);
-
gdk_draw_line (drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
drawing->ruler->allocation.width-1, 1,
drawing->ruler->allocation.width-1, 7);
}
if(global_width <= drawing->ruler->allocation.width)
{
gdk_draw_layout_with_colors(drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
(drawing->ruler->allocation.width - ink_rect.width)/2,
6,
layout, &foreground, &background);
- gdk_gc_set_line_attributes(gc,
- 2,
- GDK_LINE_SOLID,
- GDK_CAP_ROUND,
- GDK_JOIN_ROUND);
-
gdk_draw_line (drawing->ruler->window,
- gc,
+ drawing->ruler_gc_butt,
drawing->ruler->allocation.width/2, 1,
drawing->ruler->allocation.width/2, 7);
}
- gdk_gc_unref(gc);
g_object_unref(layout);
return FALSE;
{
//g_debug("motion");
//eventually follow mouse and show time here
+ return 0;
}
projects / lttv.git / blobdiff