* line/background.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
//#define PANGO_ENABLE_BACKEND
#include <gtk/gtk.h>
#include "cfv.h"
#include "processlist.h"
#include "drawing.h"
-#include "cfv-private.h"
#define MAX_PATH_LEN 256
{
ControlFlowData *control_flow_data = (ControlFlowData *)hook_data;
LttvTrace *trace = (LttvTrace*)call_data;
- LttvTracesetContext *tsc =
- lttvwindow_get_traceset_context(control_flow_data->tab);
control_flow_data->background_info_waiting--;
drawing_clear(control_flow_data->drawing);
processlist_clear(control_flow_data->process_list);
+ gtk_widget_set_size_request(
+ control_flow_data->drawing->drawing_area,
+ -1, processlist_get_height(control_flow_data->process_list));
redraw_notify(control_flow_data, NULL);
}
control_flow_data->tab = tab;
- //g_debug("time width2 : %u",time_window->time_width);
// Unreg done in the GuiControlFlow_Destructor
lttvwindow_register_traceset_notify(tab,
traceset_notify,
g_debug("DEBUG : event selected by main window : %u", *event_number);
+ return 0;
}
/* Function that selects the color of status&exemode line */
-static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
+static inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
{
PropertiesLine prop_line;
prop_line.line_width = 2;
prop_line.y = MIDDLE;
//GdkColormap *colormap = gdk_colormap_get_system();
- g_debug("prepare_status_line for state : %s",
- g_quark_to_string(process->state->s));
-
if(process->state->s == LTTV_STATE_RUN) {
if(process->state->t == LTTV_STATE_USER_MODE)
prop_line.color = drawing_colors[COL_RUN_USER_MODE];
}
#if 0
-static __inline PropertiesLine prepare_status_line(LttvProcessState *process)
+static inline PropertiesLine prepare_status_line(LttvProcessState *process)
{
PropertiesLine prop_line;
prop_line.line_width = 2;
{
EventsRequest *events_request = (EventsRequest*)hook_data;
ControlFlowData *control_flow_data = events_request->viewer_data;
- Drawing_t *drawing = control_flow_data->drawing;
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
- guint width = drawing->width;
/* we are in a schedchange, before the state update. We must draw the
* items corresponding to the state before it changes : now is the right
pid_out = ltt_event_get_long_unsigned(e,element);
element = ltt_field_member(f,1);
pid_in = ltt_event_get_long_unsigned(e,element);
- g_debug("out : %u in : %u", pid_out, pid_in);
}
{
* present, it's a new process and it was not present : it will
* be added after the state update. */
LttvProcessState *process;
- process = lttv_state_find_process(tfs, pid_out);
- //process = tfs->process;
+ /* unknown state, bad current pid */
+ if(tfs->process->pid != pid_out)
+ process = lttv_state_find_process(tfs, pid_out);
+ else
+ process = tfs->process;
if(process != NULL) {
/* Well, the process_out existed : we must get it in the process hash
* or add it, and draw its items.
*/
/* Add process to process list (if not present) */
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
- if(processlist_get_process_pixels(process_list,
+ hashed_process_data = processlist_get_process_data(process_list,
pid_out,
- process->last_cpu,
+ process->last_cpu_index,
&birth,
- tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
+ tfc->t_context->index);
+ if(hashed_process_data == NULL)
{
g_assert(pid_out == 0 || pid_out != process->ppid);
+ const gchar *name = g_quark_to_string(process->name);
/* Process not present */
ProcessInfo *process_info;
+ Drawing_t *drawing = control_flow_data->drawing;
processlist_add(process_list,
+ drawing,
pid_out,
- process->last_cpu,
+ process->last_cpu_index,
process->ppid,
&birth,
tfc->t_context->index,
&pl_height,
&process_info,
&hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( drawing, y, height);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+
}
-
+
/* Now, the process is in the state hash and our own process hash.
* We definitely can draw the items related to the ending state.
*/
- /* Check if the x position is unset. In can have been left unset by
- * a draw closure from a after chunk hook. This should never happen,
- * because it must be set by before chunk hook to the damage_begin
- * value.
- */
- g_assert(hashed_process_data->x.middle != -1);
if(ltt_time_compare(hashed_process_data->next_good_time,
evtime) > 0)
{
if(hashed_process_data->x.middle_marked == FALSE) {
+
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
time_window,
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
} else {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
time_window,
if(hashed_process_data->x.middle_marked == FALSE) {
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
/* Now create the drawing context that will be used to draw
* items related to the last state. */
- draw_context.drawable = drawing->pixmap;
+ draw_context.drawable = hashed_process_data->pixmap;
draw_context.gc = drawing->gc;
draw_context.pango_layout = drawing->pango_layout;
draw_context.drawinfo.start.x = hashed_process_data->x.middle;
draw_context.drawinfo.end.x = x;
- draw_context.drawinfo.y.over = y+1;
- draw_context.drawinfo.y.middle = y+(height/2);
- draw_context.drawinfo.y.under = y+height;
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
draw_context.drawinfo.start.offset.over = 0;
draw_context.drawinfo.start.offset.middle = 0;
* or add it, and draw its items.
*/
/* Add process to process list (if not present) */
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
- if(processlist_get_process_pixels(process_list,
+ hashed_process_data = processlist_get_process_data(process_list,
pid_in,
- process->last_cpu,
+ process->last_cpu_index,
&birth,
- tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
+ tfc->t_context->index);
+ if(hashed_process_data == NULL)
{
g_assert(pid_in == 0 || pid_in != process->ppid);
+ const gchar *name = g_quark_to_string(process->name);
/* Process not present */
ProcessInfo *process_info;
+ Drawing_t *drawing = control_flow_data->drawing;
processlist_add(process_list,
+ drawing,
pid_in,
- process->last_cpu,
+ process->last_cpu_index,
process->ppid,
&birth,
tfc->t_context->index,
&pl_height,
&process_info,
&hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( drawing, y, height);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+
}
+ //We could set the current process and hash here, but will be done
+ //by after schedchange hook
/* Now, the process is in the state hash and our own process hash.
* We definitely can draw the items related to the ending state.
*/
- /* Check if the x position is unset. In can have been left unset by
- * a draw closure from a after chunk hook. This should never happen,
- * because it must be set by before chunk hook to the damage_begin
- * value.
- */
- g_assert(hashed_process_data->x.middle != -1);
-
if(ltt_time_compare(hashed_process_data->next_good_time,
evtime) > 0)
{
if(hashed_process_data->x.middle_marked == FALSE) {
+
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
time_window,
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
} else {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
if(hashed_process_data->x.middle_marked == FALSE) {
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
/* Now create the drawing context that will be used to draw
* items related to the last state. */
- draw_context.drawable = drawing->pixmap;
+ draw_context.drawable = hashed_process_data->pixmap;
draw_context.gc = drawing->gc;
draw_context.pango_layout = drawing->pango_layout;
draw_context.drawinfo.start.x = hashed_process_data->x.middle;
draw_context.drawinfo.end.x = x;
- draw_context.drawinfo.y.over = y+1;
- draw_context.drawinfo.y.middle = y+(height/2);
- draw_context.drawinfo.y.under = y+height;
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
draw_context.drawinfo.start.offset.over = 0;
draw_context.drawinfo.start.offset.middle = 0;
TimeWindow time_window =
lttvwindow_get_time_window(tab);
- LttTime end_time = time_window.end_time;
+ LttTime time_window.end_time = time_window.time_window.end_time;
//if(time < time_beg || time > time_end) return;
if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
return;
if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0)
LttTime time = ltt_event_time(e);
- LttTime window_end = time_window.end_time;
+ LttTime window_end = time_window.time_window.end_time;
convert_time_to_pixels(
time_window,
control_flow_data->drawing->damage_begin;
draw_context_out->previous->under->x =
control_flow_data->drawing->damage_begin;
-
g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin);
}
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = control_flow_data->drawing->width;
/* Add process to process list (if not present) */
- LttvProcessState *process_out, *process_in;
+ LttvProcessState *process_in;
LttTime birth;
- guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data_in = NULL;
ProcessList *process_list = control_flow_data->process_list;
pid_out = ltt_event_get_long_unsigned(e,element);
element = ltt_field_member(f,1);
pid_in = ltt_event_get_long_unsigned(e,element);
- g_debug("out : %u in : %u", pid_out, pid_in);
}
/* Find process pid_in in the list... */
- process_in = lttv_state_find_process(tfs, pid_in);
+ //process_in = lttv_state_find_process(tfs, pid_in);
+ process_in = tfs->process;
/* It should exist, because we are after the state update. */
+#ifdef EXTRA_CHECK
g_assert(process_in != NULL);
-
+#endif //EXTRA_CHECK
birth = process_in->creation_time;
- const gchar *name = g_quark_to_string(process_in->name);
- if(processlist_get_process_pixels(process_list,
+ hashed_process_data_in = processlist_get_process_data(process_list,
pid_in,
- process_in->last_cpu,
+ process_in->last_cpu_index,
&birth,
- tfc->t_context->index,
- &y_in,
- &height,
- &hashed_process_data_in) == 1)
+ tfc->t_context->index);
+ if(hashed_process_data_in == NULL)
{
g_assert(pid_in == 0 || pid_in != process_in->ppid);
+ const gchar *name = g_quark_to_string(process_in->name);
ProcessInfo *process_info;
+ Drawing_t *drawing = control_flow_data->drawing;
/* Process not present */
processlist_add(process_list,
+ drawing,
pid_in,
- process_in->last_cpu,
+ process_in->last_cpu_index,
process_in->ppid,
&birth,
tfc->t_context->index,
&pl_height,
&process_info,
&hashed_process_data_in);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data_in,
- &y_in,
- &height);
- drawing_insert_square( control_flow_data->drawing, y_in, height);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
}
+ /* Set the current process */
+ process_list->current_hash_data[process_in->last_cpu_index] =
+ hashed_process_data_in;
if(ltt_time_compare(hashed_process_data_in->next_good_time,
evtime) <= 0)
{
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint new_x;
convert_time_to_pixels(
TimeWindow time_window =
lttvwindow_get_time_window(control_flow_data->tab);
- LttTime end_time = time_window.end_time;
+ LttTime time_window.end_time = time_window.time_window.end_time;
//if(time < time_beg || time > time_end) return;
if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
return;
//LttTime time = ltt_event_time(e);
- //LttTime window_end = time_window->end_time;
+ //LttTime window_end = time_window->time_window.end_time;
//convert_time_to_pixels(
}
#if 0
-static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process)
+static inline PropertiesLine prepare_execmode_line(LttvProcessState *process)
{
PropertiesLine prop_line;
prop_line.line_width = 1;
{
EventsRequest *events_request = (EventsRequest*)hook_data;
ControlFlowData *control_flow_data = events_request->viewer_data;
- Drawing_t *drawing = control_flow_data->drawing;
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = drawing->width;
/* we are in a execmode, before the state update. We must draw the
* items corresponding to the state before it changes : now is the right
* or add it, and draw its items.
*/
/* Add process to process list (if not present) */
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
-
- if(processlist_get_process_pixels(process_list,
+
+ if(likely(process_list->current_hash_data[tfc->index] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[tfc->index];
+ } else {
+ hashed_process_data = processlist_get_process_data(process_list,
+ pid,
+ process->last_cpu_index,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ ProcessInfo *process_info;
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process->name);
+ processlist_add(process_list,
+ drawing,
pid,
- process->last_cpu,
+ process->last_cpu_index,
+ process->ppid,
&birth,
tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
- {
- g_assert(pid == 0 || pid != process->ppid);
- ProcessInfo *process_info;
- /* Process not present */
- processlist_add(process_list,
- pid,
- process->last_cpu,
- process->ppid,
- &birth,
- tfc->t_context->index,
- name,
- &pl_height,
- &process_info,
- &hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( drawing, y, height);
+ name,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
+ /* Set the current process */
+ process_list->current_hash_data[process->last_cpu_index] =
+ hashed_process_data;
}
/* Now, the process is in the state hash and our own process hash.
* We definitely can draw the items related to the ending state.
*/
-
- /* Check if the x position is unset. In can have been left unset by
- * a draw closure from a after chunk hook. This should never happen,
- * because it must be set by before chunk hook to the damage_begin
- * value.
- */
- g_assert(hashed_process_data->x.over != -1);
- if(ltt_time_compare(hashed_process_data->next_good_time,
- evtime) > 0)
+ if(likely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) > 0))
{
- if(hashed_process_data->x.middle_marked == FALSE) {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
time_window,
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
} else {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
/* Jump over draw if we are at the same x position */
- if(x == hashed_process_data->x.middle &&
- hashed_process_data->x.middle_used)
+ if(unlikely(x == hashed_process_data->x.middle &&
+ hashed_process_data->x.middle_used))
{
- if(hashed_process_data->x.middle_marked == FALSE) {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
DrawContext draw_context;
/* Now create the drawing context that will be used to draw
* items related to the last state. */
- draw_context.drawable = drawing->pixmap;
+ draw_context.drawable = hashed_process_data->pixmap;
draw_context.gc = drawing->gc;
draw_context.pango_layout = drawing->pango_layout;
draw_context.drawinfo.start.x = hashed_process_data->x.middle;
draw_context.drawinfo.end.x = x;
- draw_context.drawinfo.y.over = y+1;
- draw_context.drawinfo.y.middle = y+(height/2);
- draw_context.drawinfo.y.under = y+height;
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
draw_context.drawinfo.start.offset.over = 0;
draw_context.drawinfo.start.offset.middle = 0;
*/
int after_execmode_hook(void *hook_data, void *call_data)
{
+ /**************** DOES NOTHING!! *************/
+ /* hook desactivated in drawing.c */
+ return 0;
+
+
+
EventsRequest *events_request = (EventsRequest*)hook_data;
ControlFlowData *control_flow_data = events_request->viewer_data;
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = control_flow_data->drawing->width;
/* Add process to process list (if not present) */
LttvProcessState *process;
LttTime birth;
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
guint pid = process->pid;
birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
- if(processlist_get_process_pixels(process_list,
+ if(likely(process_list->current_hash_data[tfc->index] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[tfc->index];
+ } else {
+ hashed_process_data = processlist_get_process_data(process_list,
+ pid,
+ process->last_cpu_index,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process->name);
+ ProcessInfo *process_info;
+ processlist_add(process_list,
+ drawing,
pid,
- process->last_cpu,
+ process->last_cpu_index,
+ process->ppid,
&birth,
tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
- {
- g_assert(pid == 0 || pid != process->ppid);
- /* Process not present */
- ProcessInfo *process_info;
- processlist_add(process_list,
- pid,
- process->last_cpu,
- process->ppid,
- &birth,
- tfc->t_context->index,
- name,
- &pl_height,
- &process_info,
- &hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( control_flow_data->drawing, y, height);
+ name,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
+ /* Set the current process */
+ process_list->current_hash_data[process->last_cpu_index] =
+ hashed_process_data;
}
-
- if(ltt_time_compare(hashed_process_data->next_good_time,
- evtime) <= 0)
+
+ if(unlikely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) <= 0))
{
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint new_x;
convert_time_to_pixels(
{
EventsRequest *events_request = (EventsRequest*)hook_data;
ControlFlowData *control_flow_data = events_request->viewer_data;
- Drawing_t *drawing = control_flow_data->drawing;
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = control_flow_data->drawing->width;
guint sub_id;
{
LttvProcessState *process = tfs->process;
guint pid = process->pid;
LttTime birth;
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
g_assert(process != NULL);
birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
- if(processlist_get_process_pixels(process_list,
+ if(likely(process_list->current_hash_data[tfc->index] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[tfc->index];
+ } else {
+ hashed_process_data = processlist_get_process_data(process_list,
pid,
- process->last_cpu,
+ process->last_cpu_index,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process->name);
+ ProcessInfo *process_info;
+ processlist_add(process_list,
+ drawing,
+ pid,
+ process->last_cpu_index,
+ process->ppid,
&birth,
tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
- {
- g_assert(pid == 0 || pid != process->ppid);
- /* Process not present */
- ProcessInfo *process_info;
- processlist_add(process_list,
- pid,
- process->last_cpu,
- process->ppid,
- &birth,
- tfc->t_context->index,
- name,
- &pl_height,
- &process_info,
- &hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( control_flow_data->drawing, y, height);
+ name,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
}
/* Now, the process is in the state hash and our own process hash.
* We definitely can draw the items related to the ending state.
*/
- /* Check if the x position is unset. In can have been left unset by
- * a draw closure from a after chunk hook. This should never happen,
- * because it must be set by before chunk hook to the damage_begin
- * value.
- */
- g_assert(hashed_process_data->x.over != -1);
-
- if(ltt_time_compare(hashed_process_data->next_good_time,
- evtime) > 0)
+ if(likely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) > 0))
{
- if(hashed_process_data->x.middle_marked == FALSE) {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
time_window,
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
} else {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint x;
convert_time_to_pixels(
/* Jump over draw if we are at the same x position */
- if(x == hashed_process_data->x.middle &&
- hashed_process_data->x.middle_used)
+ if(unlikely(x == hashed_process_data->x.middle &&
+ hashed_process_data->x.middle_used))
{
- if(hashed_process_data->x.middle_marked == FALSE) {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
/* Draw collision indicator */
gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
- gdk_draw_point(drawing->pixmap,
+ gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- y+(height/2)-3);
+ (hashed_process_data->height/2)-3);
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
/* Now create the drawing context that will be used to draw
* items related to the last state. */
- draw_context.drawable = drawing->pixmap;
+ draw_context.drawable = hashed_process_data->pixmap;
draw_context.gc = drawing->gc;
draw_context.pango_layout = drawing->pango_layout;
draw_context.drawinfo.start.x = hashed_process_data->x.middle;
draw_context.drawinfo.end.x = x;
- draw_context.drawinfo.y.over = y+1;
- draw_context.drawinfo.y.middle = y+(height/2);
- draw_context.drawinfo.y.under = y+height;
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
draw_context.drawinfo.start.offset.over = 0;
draw_context.drawinfo.start.offset.middle = 0;
}
}
+ } else if(sub_id == 7) /* release */ {
+
+ guint pid;
+ {
+ LttField *f = ltt_event_field(e);
+ LttField *element;
+ element = ltt_field_member(f,1);
+ pid = ltt_event_get_long_unsigned(e,element);
+ }
+
+ /* Add process to process list (if not present) */
+ /* Don't care about the process if it's not in the state hash already :
+ * that means a process that has never done anything in the trace and
+ * unknown suddently gets destroyed : no state meaningful to show. */
+ LttvProcessState *process = lttv_state_find_process(tfs, pid);
+
+ if(process != NULL) {
+ LttTime birth;
+ guint pl_height = 0;
+ HashedProcessData *hashed_process_data = NULL;
+
+ ProcessList *process_list = control_flow_data->process_list;
+
+ birth = process->creation_time;
+
+ /* Cannot use current process : this event happens on another process,
+ * action done by the parent. */
+ hashed_process_data = processlist_get_process_data(process_list,
+ pid,
+ process->last_cpu_index,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process->name);
+ ProcessInfo *process_info;
+ processlist_add(process_list,
+ drawing,
+ pid,
+ process->last_cpu_index,
+ process->ppid,
+ &birth,
+ tfc->t_context->index,
+ name,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
+
+ /* Now, the process is in the state hash and our own process hash.
+ * We definitely can draw the items related to the ending state.
+ */
+
+ if(likely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) > 0))
+ {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
+ guint x;
+ convert_time_to_pixels(
+ time_window,
+ evtime,
+ width,
+ &x);
+
+ /* Draw collision indicator */
+ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+ gdk_draw_point(hashed_process_data->pixmap,
+ drawing->gc,
+ x,
+ (hashed_process_data->height/2)-3);
+ hashed_process_data->x.middle_marked = TRUE;
+ }
+ } else {
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
+ guint x;
+
+ convert_time_to_pixels(
+ time_window,
+ evtime,
+ width,
+ &x);
+
+
+ /* Jump over draw if we are at the same x position */
+ if(unlikely(x == hashed_process_data->x.middle &&
+ hashed_process_data->x.middle_used))
+ {
+ if(unlikely(hashed_process_data->x.middle_marked == FALSE)) {
+ /* Draw collision indicator */
+ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+ gdk_draw_point(hashed_process_data->pixmap,
+ drawing->gc,
+ x,
+ (hashed_process_data->height/2)-3);
+ hashed_process_data->x.middle_marked = TRUE;
+ }
+ /* jump */
+ } else {
+ DrawContext draw_context;
+
+ /* Now create the drawing context that will be used to draw
+ * items related to the last state. */
+ draw_context.drawable = hashed_process_data->pixmap;
+ draw_context.gc = drawing->gc;
+ draw_context.pango_layout = drawing->pango_layout;
+ draw_context.drawinfo.start.x = hashed_process_data->x.middle;
+ draw_context.drawinfo.end.x = x;
+
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
+
+ draw_context.drawinfo.start.offset.over = 0;
+ draw_context.drawinfo.start.offset.middle = 0;
+ draw_context.drawinfo.start.offset.under = 0;
+ draw_context.drawinfo.end.offset.over = 0;
+ draw_context.drawinfo.end.offset.middle = 0;
+ draw_context.drawinfo.end.offset.under = 0;
+
+ {
+ /* Draw the line */
+ PropertiesLine prop_line = prepare_s_e_line(process);
+ draw_line((void*)&prop_line, (void*)&draw_context);
+
+ }
+ /* become the last x position */
+ hashed_process_data->x.middle = x;
+ hashed_process_data->x.middle_used = TRUE;
+ hashed_process_data->x.middle_marked = FALSE;
+
+ /* Calculate the next good time */
+ convert_pixels_to_time(width, x+1, time_window,
+ &hashed_process_data->next_good_time);
+ }
+ }
+ }
+
}
return 0;
LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
LttvTracefileState *tfs = (LttvTracefileState *)call_data;
- LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
LttEvent *e;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = control_flow_data->drawing->width;
guint sub_id;
guint param1;
/* Add process to process list (if not present) */
LttvProcessState *process_child;
LttTime birth;
- guint y_child = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data_child = NULL;
ProcessList *process_list = control_flow_data->process_list;
g_assert(process_child != NULL);
birth = process_child->creation_time;
- const gchar *name = g_quark_to_string(process_child->name);
- if(processlist_get_process_pixels(process_list,
+ /* Cannot use current process, because this action is done by the parent
+ * on its child. */
+ hashed_process_data_child = processlist_get_process_data(process_list,
child_pid,
- process_child->last_cpu,
+ process_child->last_cpu_index,
&birth,
- tfc->t_context->index,
- &y_child,
- &height,
- &hashed_process_data_child) == 1)
+ tfc->t_context->index);
+ if(likely(hashed_process_data_child == NULL))
{
g_assert(child_pid == 0 || child_pid != process_child->ppid);
/* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process_child->name);
ProcessInfo *process_info;
processlist_add(process_list,
+ drawing,
child_pid,
- process_child->last_cpu,
+ process_child->last_cpu_index,
process_child->ppid,
&birth,
tfc->t_context->index,
&pl_height,
&process_info,
&hashed_process_data_child);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data_child,
- &y_child,
- &height);
- drawing_insert_square( control_flow_data->drawing, y_child, height);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
}
- if(ltt_time_compare(hashed_process_data_child->next_good_time,
- evtime) <= 0)
+
+ if(likely(ltt_time_compare(hashed_process_data_child->next_good_time,
+ evtime) <= 0))
{
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint new_x;
convert_time_to_pixels(
time_window,
width,
&new_x);
- if(hashed_process_data_child->x.over != new_x) {
+ if(likely(hashed_process_data_child->x.over != new_x)) {
hashed_process_data_child->x.over = new_x;
hashed_process_data_child->x.over_used = FALSE;
hashed_process_data_child->x.over_marked = FALSE;
}
- if(hashed_process_data_child->x.middle != new_x) {
+ if(likely(hashed_process_data_child->x.middle != new_x)) {
hashed_process_data_child->x.middle = new_x;
hashed_process_data_child->x.middle_used = FALSE;
hashed_process_data_child->x.middle_marked = FALSE;
}
- if(hashed_process_data_child->x.under != new_x) {
+ if(likely(hashed_process_data_child->x.under != new_x)) {
hashed_process_data_child->x.under = new_x;
hashed_process_data_child->x.under_used = FALSE;
hashed_process_data_child->x.under_marked = FALSE;
LttvProcessState *process = tfs->process;
guint pid = process->pid;
LttTime birth;
- guint y = 0, height = 0, pl_height = 0;
+ guint pl_height = 0;
HashedProcessData *hashed_process_data = NULL;
ProcessList *process_list = control_flow_data->process_list;
g_assert(process != NULL);
birth = process->creation_time;
- const gchar *name = g_quark_to_string(process->name);
- if(processlist_get_process_pixels(process_list,
+ if(likely(process_list->current_hash_data[tfc->index] != NULL) ){
+ hashed_process_data = process_list->current_hash_data[tfc->index];
+ } else {
+ hashed_process_data = processlist_get_process_data(process_list,
+ pid,
+ process->last_cpu_index,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ const gchar *name = g_quark_to_string(process->name);
+ ProcessInfo *process_info;
+ processlist_add(process_list,
+ drawing,
pid,
- process->last_cpu,
+ process->last_cpu_index,
+ process->ppid,
&birth,
tfc->t_context->index,
- &y,
- &height,
- &hashed_process_data) == 1)
- {
- g_assert(pid == 0 || pid != process->ppid);
- /* Process not present */
- ProcessInfo *process_info;
- processlist_add(process_list,
- pid,
- process->last_cpu,
- process->ppid,
- &birth,
- tfc->t_context->index,
- name,
- &pl_height,
- &process_info,
- &hashed_process_data);
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
- drawing_insert_square( control_flow_data->drawing, y, height);
+ name,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
+
+ /* Set the current process */
+ process_list->current_hash_data[process->last_cpu_index] =
+ hashed_process_data;
}
- if(ltt_time_compare(hashed_process_data->next_good_time,
- evtime) <= 0)
+ if(unlikely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) <= 0))
{
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
guint new_x;
convert_time_to_pixels(
time_window,
evtime,
width,
&new_x);
- if(hashed_process_data->x.middle != new_x) {
+ if(unlikely(hashed_process_data->x.middle != new_x)) {
hashed_process_data->x.middle = new_x;
hashed_process_data->x.middle_used = FALSE;
hashed_process_data->x.middle_marked = FALSE;
{
ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
Drawing_t *drawing = control_flow_data->drawing;
+ ProcessList *process_list = control_flow_data->process_list;
const TimeWindowNotifyData *time_window_nofify_data =
((const TimeWindowNotifyData *)call_data);
* currently shown time interval. (reuse is only for scrolling)
*/
- g_info("Old time window HOOK : %u, %u to %u, %u",
+ g_info("Old time window HOOK : %lu, %lu to %lu, %lu",
old_time_window->start_time.tv_sec,
old_time_window->start_time.tv_nsec,
old_time_window->time_width.tv_sec,
old_time_window->time_width.tv_nsec);
- g_info("New time window HOOK : %u, %u to %u, %u",
+ g_info("New time window HOOK : %lu, %lu to %lu, %lu",
new_time_window->start_time.tv_sec,
new_time_window->start_time.tv_nsec,
new_time_window->time_width.tv_sec,
&x);
/* Copy old data to new location */
- gdk_draw_drawable (control_flow_data->drawing->pixmap,
- control_flow_data->drawing->drawing_area->style->black_gc,
- control_flow_data->drawing->pixmap,
- x, 0,
- 0, 0,
- control_flow_data->drawing->width-x+SAFETY, -1);
-
+ copy_pixmap_region(process_list,
+ NULL,
+ control_flow_data->drawing->drawing_area->style->black_gc,
+ NULL,
+ x, 0,
+ 0, 0,
+ control_flow_data->drawing->width-x+SAFETY, -1);
+
if(drawing->damage_begin == drawing->damage_end)
drawing->damage_begin = control_flow_data->drawing->width-x;
else
drawing->damage_end = control_flow_data->drawing->width;
/* Clear the data request background, but not SAFETY */
- gdk_draw_rectangle (control_flow_data->drawing->pixmap,
- //control_flow_data->drawing->drawing_area->style->black_gc,
+ rectangle_pixmap(process_list,
control_flow_data->drawing->drawing_area->style->black_gc,
TRUE,
drawing->damage_begin+SAFETY, 0,
drawing->damage_end - drawing->damage_begin, // do not overlap
- control_flow_data->drawing->height);
-
- gtk_widget_queue_draw_area (drawing->drawing_area,
- 0,0,
- control_flow_data->drawing->width,
- control_flow_data->drawing->height);
+ -1);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ //gtk_widget_queue_draw_area (drawing->drawing_area,
+ // 0,0,
+ // control_flow_data->drawing->width,
+ // control_flow_data->drawing->height);
/* Get new data for the rest. */
drawing_data_request(control_flow_data->drawing,
- &control_flow_data->drawing->pixmap,
drawing->damage_begin, 0,
drawing->damage_end - drawing->damage_begin,
control_flow_data->drawing->height);
width,
&x);
-
/* Copy old data to new location */
- gdk_draw_drawable (control_flow_data->drawing->pixmap,
+ copy_pixmap_region (process_list,
+ NULL,
control_flow_data->drawing->drawing_area->style->black_gc,
- control_flow_data->drawing->pixmap,
+ NULL,
0, 0,
x, 0,
-1, -1);
drawing->damage_begin = 0;
- gdk_draw_rectangle (control_flow_data->drawing->pixmap,
+ rectangle_pixmap (process_list,
control_flow_data->drawing->drawing_area->style->black_gc,
TRUE,
drawing->damage_begin, 0,
drawing->damage_end - drawing->damage_begin, // do not overlap
- control_flow_data->drawing->height);
+ -1);
- gtk_widget_queue_draw_area (drawing->drawing_area,
- 0,0,
- control_flow_data->drawing->width,
- control_flow_data->drawing->height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ //gtk_widget_queue_draw_area (drawing->drawing_area,
+ // 0,0,
+ // control_flow_data->drawing->width,
+ // control_flow_data->drawing->height);
/* Get new data for the rest. */
drawing_data_request(control_flow_data->drawing,
- &control_flow_data->drawing->pixmap,
drawing->damage_begin, 0,
drawing->damage_end - drawing->damage_begin,
control_flow_data->drawing->height);
/* Cannot reuse any part of the screen : far jump */
- gdk_draw_rectangle (control_flow_data->drawing->pixmap,
+ rectangle_pixmap (process_list,
control_flow_data->drawing->drawing_area->style->black_gc,
TRUE,
0, 0,
control_flow_data->drawing->width+SAFETY, // do not overlap
- control_flow_data->drawing->height);
+ -1);
- gtk_widget_queue_draw_area (drawing->drawing_area,
- 0,0,
- control_flow_data->drawing->width,
- control_flow_data->drawing->height);
+ //gtk_widget_queue_draw_area (drawing->drawing_area,
+ // 0,0,
+ // control_flow_data->drawing->width,
+ // control_flow_data->drawing->height);
+ gtk_widget_queue_draw(drawing->drawing_area);
drawing->damage_begin = 0;
drawing->damage_end = control_flow_data->drawing->width;
drawing_data_request(control_flow_data->drawing,
- &control_flow_data->drawing->pixmap,
0, 0,
control_flow_data->drawing->width,
control_flow_data->drawing->height);
/* Different scale (zoom) */
g_info("zoom");
- gdk_draw_rectangle (control_flow_data->drawing->pixmap,
+ rectangle_pixmap (process_list,
control_flow_data->drawing->drawing_area->style->black_gc,
TRUE,
0, 0,
control_flow_data->drawing->width+SAFETY, // do not overlap
- control_flow_data->drawing->height);
+ -1);
- gtk_widget_queue_draw_area (drawing->drawing_area,
- 0,0,
- control_flow_data->drawing->width,
- control_flow_data->drawing->height);
+ //gtk_widget_queue_draw_area (drawing->drawing_area,
+ // 0,0,
+ // control_flow_data->drawing->width,
+ // control_flow_data->drawing->height);
+ gtk_widget_queue_draw(drawing->drawing_area);
drawing->damage_begin = 0;
drawing->damage_end = control_flow_data->drawing->width;
drawing_data_request(control_flow_data->drawing,
- &control_flow_data->drawing->pixmap,
0, 0,
control_flow_data->drawing->width,
control_flow_data->drawing->height);
{
ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
Drawing_t *drawing = control_flow_data->drawing;
- GtkWidget *widget = drawing->drawing_area;
drawing_clear(control_flow_data->drawing);
processlist_clear(control_flow_data->process_list);
+ gtk_widget_set_size_request(
+ control_flow_data->drawing->drawing_area,
+ -1, processlist_get_height(control_flow_data->process_list));
redraw_notify(control_flow_data, NULL);
request_background_data(control_flow_data);
-#if 0
- drawing->damage_begin = 0;
- drawing->damage_end = drawing->width;
- if(drawing->damage_begin < drawing->damage_end)
- {
- drawing_data_request(drawing,
- &drawing->pixmap,
- drawing->damage_begin,
- 0,
- drawing->damage_end-drawing->damage_begin,
- drawing->height);
- }
-
- gtk_widget_queue_draw_area(drawing->drawing_area,
- 0,0,
- drawing->width,
- drawing->height);
-#endif //0
return FALSE;
}
/* fun feature, to be separated someday... */
drawing_clear(control_flow_data->drawing);
processlist_clear(control_flow_data->process_list);
-
- // Clear the image
- gdk_draw_rectangle (drawing->pixmap,
+ gtk_widget_set_size_request(
+ control_flow_data->drawing->drawing_area,
+ -1, processlist_get_height(control_flow_data->process_list));
+ // Clear the images
+ rectangle_pixmap (control_flow_data->process_list,
widget->style->black_gc,
TRUE,
0, 0,
- drawing->width+SAFETY,
- drawing->height);
+ drawing->alloc_width,
+ -1);
+ gtk_widget_queue_draw(drawing->drawing_area);
if(drawing->damage_begin < drawing->damage_end)
{
drawing_data_request(drawing,
- &drawing->pixmap,
drawing->damage_begin,
0,
drawing->damage_end-drawing->damage_begin,
drawing->height);
}
- 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);
return FALSE;
}
{
ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
Drawing_t *drawing = control_flow_data->drawing;
- GtkWidget *widget = drawing->drawing_area;
//g_assert(widget->allocation.width == drawing->damage_end);
if(drawing->damage_begin < drawing->damage_end)
{
drawing_data_request(drawing,
- &drawing->pixmap,
drawing->damage_begin,
0,
drawing->damage_end-drawing->damage_begin,
LttTime trace_start = tsc->time_span.start_time;
LttTime trace_end = tsc->time_span.end_time;
- g_info("New current time HOOK : %u, %u", current_time.tv_sec,
+ g_info("New current time HOOK : %lu, %lu", current_time.tv_sec,
current_time.tv_nsec);
* at one end of the trace. */
- if(ltt_time_compare(current_time, time_begin) == -1)
+ if(ltt_time_compare(current_time, time_begin) < 0)
{
TimeWindow new_time_window;
if(ltt_time_compare(current_time,
- ltt_time_add(trace_start,half_width)) == -1)
+ ltt_time_add(trace_start,half_width)) < 0)
time_begin = trace_start;
else
time_begin = ltt_time_sub(current_time,half_width);
lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
}
- else if(ltt_time_compare(current_time, time_end) == 1)
+ else if(ltt_time_compare(current_time, time_end) > 0)
{
TimeWindow new_time_window;
- if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) == 1)
+ if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) > 0)
time_begin = ltt_time_sub(trace_end,width);
else
time_begin = ltt_time_sub(current_time,half_width);
lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
}
- //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
- gtk_widget_queue_draw_area(drawing->drawing_area,
- 0,0,
- drawing->width,
- drawing->height);
+ gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+
return 0;
}
EventsRequest *events_request;
LttvTracesetState *tss;
LttTime end_time;
+ guint x_end;
} ClosureData;
EventsRequest *events_request = closure_data->events_request;
ControlFlowData *control_flow_data = events_request->viewer_data;
- Drawing_t *drawing = control_flow_data->drawing;
LttvTracesetState *tss = closure_data->tss;
- LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss;
+ LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
LttTime evtime = closure_data->end_time;
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
- LttTime end_time = time_window.end_time;
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, end_time) == 1)
- return;
-#endif //EXTRA_CHECK
-
- guint width = drawing->width;
{
/* For the process */
* draw items from the beginning of the read for it. If it is not
* present, it's a new process and it was not present : it will
* be added after the state update. */
+#ifdef EXTRA_CHECK
g_assert(lttv_traceset_number(tsc->ts) > 0);
+#endif //EXTRA_CHECK
- /* tracefiles[0] is ok here, because we draw for every PID, and
- * assume CPU 0 for PID 0 //FIXME */
LttvTracefileState *tfs =
- (LttvTracefileState*)tsc->traces[process_info->trace_num]->tracefiles[0];
-
+ (LttvTracefileState*)tsc->traces[process_info->trace_num]->
+ tracefiles[process_info->cpu];
+
LttvProcessState *process;
process = lttv_state_find_process(tfs,
process_info->pid);
- if(process != NULL) {
+ if(unlikely(process != NULL)) {
/* Only draw for processes that are currently in the trace states */
- guint y = 0, height = 0, pl_height = 0;
ProcessList *process_list = control_flow_data->process_list;
- LttTime birth = process_info->birth;
-
+#ifdef EXTRA_CHECK
/* Should be alike when background info is ready */
if(control_flow_data->background_info_waiting==0)
g_assert(ltt_time_compare(process->creation_time,
process_info->birth) == 0);
- const gchar *name = g_quark_to_string(process->name);
-
- /* process HAS to be present */
- processlist_get_pixels_from_data(process_list,
- process_info,
- hashed_process_data,
- &y,
- &height);
+#endif //EXTRA_CHECK
/* Now, the process is in the state hash and our own process hash.
* We definitely can draw the items related to the ending state.
*/
- /* Check if the x position is unset. In can have been left unset by
- * a draw closure from a after chunk hook. This should never happen,
- * because it must be set by before chunk hook to the damage_begin
- * value.
- */
- g_assert(hashed_process_data->x.over != -1);
-
- if(ltt_time_compare(hashed_process_data->next_good_time,
- evtime) <= 0)
+ if(unlikely(ltt_time_compare(hashed_process_data->next_good_time,
+ evtime) <= 0))
{
- guint x;
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
- convert_time_to_pixels(
- time_window,
- evtime,
- width,
- &x);
+#ifdef EXTRA_CHECK
+ if(ltt_time_compare(evtime, time_window.start_time) == -1
+ || ltt_time_compare(evtime, time_window.end_time) == 1)
+ return;
+#endif //EXTRA_CHECK
+ Drawing_t *drawing = control_flow_data->drawing;
+ guint width = drawing->width;
+
+ guint x = closure_data->x_end;
DrawContext draw_context;
/* Now create the drawing context that will be used to draw
* items related to the last state. */
- draw_context.drawable = drawing->pixmap;
+ draw_context.drawable = hashed_process_data->pixmap;
draw_context.gc = drawing->gc;
draw_context.pango_layout = drawing->pango_layout;
draw_context.drawinfo.end.x = x;
- draw_context.drawinfo.y.over = y+1;
- draw_context.drawinfo.y.middle = y+(height/2);
- draw_context.drawinfo.y.under = y+height;
+ draw_context.drawinfo.y.over = 1;
+ draw_context.drawinfo.y.middle = (hashed_process_data->height/2);
+ draw_context.drawinfo.y.under = hashed_process_data->height;
draw_context.drawinfo.start.offset.over = 0;
draw_context.drawinfo.start.offset.middle = 0;
}
#endif //0
- if(x == hashed_process_data->x.middle &&
- hashed_process_data->x.middle_used) {
+ if(unlikely(x == hashed_process_data->x.middle &&
+ hashed_process_data->x.middle_used)) {
#if 0 /* do not mark closure : not missing information */
if(hashed_process_data->x.middle_marked == FALSE) {
/* Draw collision indicator */
draw_line((void*)&prop_line, (void*)&draw_context);
/* become the last x position */
- if(x != hashed_process_data->x.middle) {
+ if(likely(x != hashed_process_data->x.middle)) {
hashed_process_data->x.middle = x;
/* but don't use the pixel */
hashed_process_data->x.middle_used = FALSE;
{
EventsRequest *events_request = (EventsRequest*)hook_data;
LttvTracesetState *tss = (LttvTracesetState*)call_data;
-
+ ControlFlowData *cfd = (ControlFlowData*)events_request->viewer_data;
+#if 0
+ /* Desactivate sort */
+ gtk_tree_sortable_set_sort_column_id(
+ GTK_TREE_SORTABLE(cfd->process_list->list_store),
+ TRACE_COLUMN,
+ GTK_SORT_ASCENDING);
+#endif //0
drawing_chunk_begin(events_request, tss);
return 0;
{
EventsRequest *events_request = (EventsRequest*)hook_data;
LttvTracesetState *tss = (LttvTracesetState*)call_data;
-
+
drawing_data_request_begin(events_request, tss);
return 0;
EventsRequest *events_request = (EventsRequest*)hook_data;
ControlFlowData *control_flow_data = events_request->viewer_data;
LttvTracesetState *tss = (LttvTracesetState*)call_data;
- LttvTracesetContext *tsc = (LttvTracesetContext*)call_data;
ProcessList *process_list = control_flow_data->process_list;
LttTime end_time = events_request->end_time;
closure_data.tss = tss;
closure_data.end_time = end_time;
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+ guint width = control_flow_data->drawing->width;
+ convert_time_to_pixels(
+ time_window,
+ end_time,
+ width,
+ &closure_data.x_end);
+
+
/* Draw last items */
g_hash_table_foreach(process_list->process_hash, draw_closure,
(void*)&closure_data);
+
/* Request expose */
drawing_request_expose(events_request, tss, end_time);
ProcessList *process_list = control_flow_data->process_list;
+ g_free(process_list->current_hash_data);
+ process_list->current_hash_data = NULL;
+
if(tfc != NULL)
end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
else /* end of traceset, or position now out of request : end */
closure_data.tss = tss;
closure_data.end_time = end_time;
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+ guint width = control_flow_data->drawing->width;
+ convert_time_to_pixels(
+ time_window,
+ end_time,
+ width,
+ &closure_data.x_end);
+
/* Draw last items */
g_hash_table_foreach(process_list->process_hash, draw_closure,
(void*)&closure_data);
-
- /* Request expose */
+#if 0
+ /* Reactivate sort */
+ gtk_tree_sortable_set_sort_column_id(
+ GTK_TREE_SORTABLE(control_flow_data->process_list->list_store),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+ GTK_SORT_ASCENDING);
+
+ update_index_to_pixmap(control_flow_data->process_list);
+ /* Request a full expose : drawing scrambled */
+ gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+#endif //0
+ /* Request expose (updates damages zone also) */
drawing_request_expose(events_request, tss, end_time);
return 0;
projects / lttv.git / blobdiff