#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
+
+GdkColor drawing_colors[NUM_COLORS] =
+{ /* Pixel, R, G, B */
+ { 0, 0, 0, 0 }, /* COL_BLACK */
+ { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_WHITE */
+ { 0, 0x0fff, 0xffff, 0xfffF }, /* COL_WAIT_FORK : pale blue */
+ { 0, 0xffff, 0xffff, 0x0000 }, /* COL_WAIT_CPU : yeallow */
+ { 0, 0xffff, 0x0000, 0xffff }, /* COL_ZOMBIE : purple */
+ { 0, 0xffff, 0x0000, 0x0000 }, /* COL_WAIT : red */
+ { 0, 0x0000, 0xffff, 0x0000 } /* COL_RUN : green */
+};
+
+
+
/*****************************************************************************
* drawing functions *
*****************************************************************************/
motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
-//FIXME Colors will need to be dynamic. Graphic context part not done so far.
-typedef enum
-{
- RED,
- GREEN,
- BLUE,
- WHITE,
- BLACK
-
-} ControlFlowColors;
-
-/* Vector of unallocated colors */
-static GdkColor CF_Colors [] =
-{
- { 0, 0xffff, 0x0000, 0x0000 }, // RED
- { 0, 0x0000, 0xffff, 0x0000 }, // GREEN
- { 0, 0x0000, 0x0000, 0xffff }, // BLUE
- { 0, 0xffff, 0xffff, 0xffff }, // WHITE
- { 0, 0x0000, 0x0000, 0x0000 } // BLACK
-};
-
-
/* Function responsible for updating the exposed area.
* It must do an events request to the lttvwindow API to ask for this update.
* Note : this function cannot clear the background, because it may
LttvHooks *event = lttv_hooks_new();
LttvHooks *before_chunk_traceset = lttv_hooks_new();
LttvHooks *after_chunk_traceset = lttv_hooks_new();
+ LttvHooks *before_request_hook = lttv_hooks_new();
+ LttvHooks *after_request_hook = lttv_hooks_new();
lttv_hooks_add(before_chunk_traceset,
- before_data_request,
+ before_chunk,
events_request,
LTTV_PRIO_DEFAULT);
lttv_hooks_add(after_chunk_traceset,
- after_data_request,
+ after_chunk,
events_request,
LTTV_PRIO_DEFAULT);
+
+ lttv_hooks_add(before_request_hook,
+ before_request,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ lttv_hooks_add(after_request_hook,
+ after_request,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ /* FIXME : hooks are registered global instead of by ID.
+ * This is due to the lack of granularity of main window's events requests.
+ * Should be fixed for gain of performance.
+ */
lttv_hooks_add(event,
- draw_event_hook,
+ before_schedchange_hook,
events_request,
LTTV_PRIO_STATE-5);
lttv_hooks_add(event,
- draw_after_hook,
+ after_schedchange_hook,
+ events_request,
+ LTTV_PRIO_STATE+5);
+ lttv_hooks_add(event,
+ after_fork_hook,
events_request,
LTTV_PRIO_STATE+5);
-
// Fill the events request
events_request->owner = control_flow_data;
events_request->after_chunk_tracefile = NULL;
events_request->after_chunk_trace = NULL;
events_request->after_chunk_traceset = after_chunk_traceset;
- events_request->before_request = NULL;
- events_request->after_request = NULL;
+ events_request->before_request = before_request_hook;
+ events_request->after_request = after_request_hook;
g_debug("req : start : %u, %u", start.tv_sec,
start.tv_nsec);
control_flow_data);
lttvwindow_events_request(tab, events_request);
}
-
+
+
+static void set_last_start(gpointer key, gpointer value, gpointer user_data)
+{
+ ProcessInfo *process_info = (ProcessInfo*)key;
+ HashedProcessData *hashed_process_data = (HashedProcessData*)value;
+ guint x = (guint)user_data;
+
+ hashed_process_data->x = x;
+ return;
+}
void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState *tss)
{
- g_debug("Begin of data request chunk");
+ g_debug("Begin of data request");
ControlFlowData *cfd = events_request->viewer_data;
LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ TimeWindow time_window =
+ lttvwindow_get_time_window(cfd->tab);
+ LttTime end_time = ltt_time_add(time_window.start_time,
+ time_window.time_width);
+ guint width = cfd->drawing->width;
+ guint x=0;
+
+ cfd->drawing->last_start = events_request->start_time;
+
+ convert_time_to_pixels(
+ time_window.start_time,
+ end_time,
+ events_request->start_time,
+ width,
+ &x);
+
+ g_hash_table_foreach(cfd->process_list->process_hash, set_last_start,
+ (gpointer)x);
+}
+void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
+{
+ g_debug("Begin of chunk");
+ ControlFlowData *cfd = events_request->viewer_data;
+ LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
- cfd->drawing->last_start = current_time;
+ cfd->drawing->last_start = LTT_TIME_MIN(current_time,
+ events_request->end_time);
}
-void drawing_data_request_end(EventsRequest *events_request, LttvTracesetState *tss)
+
+void drawing_request_expose(EventsRequest *events_request,
+ LttvTracesetState *tss,
+ LttTime end_time)
{
gint x, x_end, width;
TimeWindow time_window =
lttvwindow_get_time_window(cfd->tab);
- g_debug("End of data request chunk");
+ g_debug("request expose");
LttTime window_end = ltt_time_add(time_window.time_width,
time_window.start_time);
- LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
-
convert_time_to_pixels(
time_window.start_time,
window_end,
convert_time_to_pixels(
time_window.start_time,
window_end,
- current_time,
+ end_time,
drawing->width,
&x_end);
/* ask for the buffer to be redrawn */
- gtk_widget_queue_draw_area ( drawing->drawing_area,
- 0, 0,
- drawing->width, drawing->height);
+ //gtk_widget_queue_draw_area ( drawing->drawing_area,
+ // 0, 0,
+ // drawing->width, drawing->height);
/* FIXME
* will need more precise pixel_to_time and time_to_pixel conversion
* functions to redraw only the needed area. */
- //gtk_widget_queue_draw_area ( drawing->drawing_area,
- // x, 0,
- // width, drawing->height);
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ x, 0,
+ width, drawing->height);
}
LttTime window_end = ltt_time_add(time_window.time_width,
time_window.start_time);
- convert_time_to_pixels(
- time_window.start_time,
- window_end,
- current_time,
- drawing->width,
- &cursor_x);
-
/* update the screen from the pixmap buffer */
gdk_draw_pixmap(widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
event->area.x, event->area.y,
event->area.width, event->area.height);
+
+ if(ltt_time_compare(time_window.start_time, current_time) <= 0 &&
+ ltt_time_compare(window_end, current_time) >= 0)
+ {
+ /* Draw the dotted lines */
+ convert_time_to_pixels(
+ time_window.start_time,
+ window_end,
+ current_time,
+ drawing->width,
+ &cursor_x);
+
- /* Draw the dotted lines */
+ if(drawing->dotted_gc == NULL) {
- if(drawing->dotted_gc == NULL) {
+ drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window);
+ gdk_gc_copy(drawing->dotted_gc, widget->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->dotted_gc = gdk_gc_new(drawing->drawing_area->window);
- gdk_gc_copy(drawing->dotted_gc, widget->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_draw_line(NULL, widget->window,
+ cursor_x, 0,
+ cursor_x, drawing->height,
+ drawing->dotted_gc);
}
-
- drawing_draw_line(NULL, widget->window,
- cursor_x, 0,
- cursor_x, drawing->height,
- drawing->dotted_gc);
return FALSE;
}
window_end,
&time);
- lttvwindow_report_current_time(control_flow_data->tab, &time);
+ lttvwindow_report_current_time(control_flow_data->tab, time);
}
- lttvwindow_report_focus(control_flow_data->tab,
- gtk_widget_get_parent(guicontrolflow_get_widget(control_flow_data)));
-
return FALSE;
}
static gboolean
-scrollbar_size_request(GtkWidget *widget,
- GtkRequisition *requisition,
- gpointer user_data)
+scrollbar_size_allocate(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer user_data)
{
Drawing_t *drawing = (Drawing_t*)user_data;
- gtk_widget_set_size_request(drawing->padding, requisition->width, -1);
+ gtk_widget_set_size_request(drawing->padding, allocation->width, -1);
//gtk_widget_queue_resize(drawing->padding);
//gtk_widget_queue_resize(drawing->ruler);
gtk_container_check_resize(GTK_CONTAINER(drawing->ruler_hbox));
drawing->ruler_hbox = gtk_hbox_new(FALSE, 1);
drawing->ruler = gtk_drawing_area_new ();
- gtk_widget_add_events(drawing->ruler, GDK_BUTTON_PRESS_MASK);
- gtk_widget_set_size_request(drawing->ruler, -1, 27);
+ //gtk_widget_set_size_request(drawing->ruler, -1, 27);
drawing->padding = gtk_drawing_area_new ();
- gtk_widget_add_events(drawing->padding, GDK_BUTTON_PRESS_MASK);
//gtk_widget_set_size_request(drawing->padding, -1, 27);
gtk_box_pack_start(GTK_BOX(drawing->ruler_hbox), drawing->ruler,
TRUE, TRUE, 0);
// drawing->drawing_area->allocation.height,
// -1);
- gtk_widget_add_events(drawing->drawing_area, GDK_BUTTON_PRESS_MASK);
-
g_signal_connect (G_OBJECT(drawing->drawing_area),
"configure_event",
G_CALLBACK (configure_event),
g_signal_connect (G_OBJECT(drawing->scrollbar),
- "size-request",
- G_CALLBACK(scrollbar_size_request),
+ "size-allocate",
+ G_CALLBACK(scrollbar_size_allocate),
(gpointer)drawing);
guint *x)
{
LttTime window_time_interval;
- float interval_float, time_float;
+ double interval_double, time_double;
+
+ g_assert(ltt_time_compare(window_time_begin, time) <= 0 &&
+ ltt_time_compare(window_time_end, time) >= 0);
window_time_interval = ltt_time_sub(window_time_end,window_time_begin);
time = ltt_time_sub(time, window_time_begin);
- interval_float = ltt_time_to_double(window_time_interval);
- time_float = ltt_time_to_double(time);
+ /* LttTime to double conversions here should really be under 4000 hours.. */
+ interval_double = ltt_time_to_double(window_time_interval);
+ time_double = ltt_time_to_double(time);
- *x = (guint)(time_float/interval_float * width);
+ *x = (guint)(time_double/interval_double * width);
}
x1, y1, x2, y2);
}
+void drawing_clear(Drawing_t *drawing)
+{
+ if (drawing->pixmap)
+ gdk_pixmap_unref(drawing->pixmap);
+ drawing->height = 1;
+ /* Allocate a new pixmap with new height */
+ drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ drawing->height,
+ -1);
+
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ drawing->height);
+ gtk_widget_queue_resize_no_redraw(drawing->drawing_area);
+
+ /* ask for the buffer to be redrawn */
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ 0, 0,
+ drawing->width, drawing->height);
+}
/* Insert a square corresponding to a new process in the list */
gtk_widget_queue_draw_area ( drawing->drawing_area,
0, y,
drawing->width, drawing->height-y);
-
}
guint y,
guint height)
{
- //GdkRectangle update_rect;
-
- /* Allocate a new pixmap with new height */
- GdkPixmap *pixmap = gdk_pixmap_new(
- drawing->drawing_area->window,
- drawing->width + SAFETY,
- drawing->height - height,
- -1);
-
- /* Copy the high region */
- gdk_draw_drawable (pixmap,
- drawing->drawing_area->style->black_gc,
- drawing->pixmap,
- 0, 0,
- 0, 0,
- drawing->width + SAFETY, y);
-
+ GdkPixmap *pixmap;
+ if(drawing->height == height) {
+ pixmap = gdk_pixmap_new(
+ drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ 1,
+ -1);
+ drawing->height=1;
+ } else {
+ /* Allocate a new pixmap with new height */
+ pixmap = gdk_pixmap_new(
+ drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ drawing->height - height,
+ -1);
+
+ /* Copy the high region */
+ gdk_draw_drawable (pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, 0,
+ 0, 0,
+ drawing->width + SAFETY, y);
- /* Copy up the bottom of the region */
- gdk_draw_drawable (pixmap,
- drawing->drawing_area->style->black_gc,
- drawing->pixmap,
- 0, y + height,
- 0, y,
- drawing->width, drawing->height - y - height);
+ /* Copy up the bottom of the region */
+ gdk_draw_drawable (pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, y + height,
+ 0, y,
+ drawing->width, drawing->height - y - height);
+ drawing->height-=height;
+ }
if (drawing->pixmap)
gdk_pixmap_unref(drawing->pixmap);
drawing->pixmap = pixmap;
- drawing->height-=height;
-
gtk_widget_set_size_request(drawing->drawing_area,
-1,
drawing->height);
/* ask for the buffer to be redrawn */
gtk_widget_queue_draw_area ( drawing->drawing_area,
0, y,
- drawing->width, drawing->height-y);
+ drawing->width, MAX(drawing->height-y, 1));
}
void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window)
projects / lttv.git / blobdiff