projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update LTTV to trace format 2.3
[lttv.git]
/
trunk
/
lttv
/
lttv
/
modules
/
gui
/
resourceview
/
drawing.c
diff --git
a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
index 3af879f76ca64af26c415cde405c7047931e32e1..2959cac79fc7a580d4c2f288f7fd29b5dc2ad602 100644
(file)
--- a/
trunk/lttv/lttv/modules/gui/resourceview/drawing.c
+++ b/
trunk/lttv/lttv/modules/gui/resourceview/drawing.c
@@
-210,7
+210,8
@@
void drawing_data_request(Drawing_t *drawing,
EventsRequest *events_request = g_new(EventsRequest, 1);
// Create the hooks
//LttvHooks *event = lttv_hooks_new();
EventsRequest *events_request = g_new(EventsRequest, 1);
// Create the hooks
//LttvHooks *event = lttv_hooks_new();
- LttvHooksById *event_by_id = lttv_hooks_by_id_new();
+ LttvHooksByIdChannelArray *event_by_id_channel =
+ lttv_hooks_by_id_channel_new();
LttvHooks *before_chunk_traceset = lttv_hooks_new();
LttvHooks *after_chunk_traceset = lttv_hooks_new();
LttvHooks *before_request_hook = lttv_hooks_new();
LttvHooks *before_chunk_traceset = lttv_hooks_new();
LttvHooks *after_chunk_traceset = lttv_hooks_new();
LttvHooks *before_request_hook = lttv_hooks_new();
@@
-263,7
+264,7
@@
void drawing_data_request(Drawing_t *drawing,
// &hooks);
//
lttv_trace_find_hook(ts->parent.t,
// &hooks);
//
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_TRAP_ENTRY,
FIELD_ARRAY(LTT_FIELD_TRAP_ID),
before_execmode_hook,
LTT_EVENT_TRAP_ENTRY,
FIELD_ARRAY(LTT_FIELD_TRAP_ID),
before_execmode_hook,
@@
-271,7
+272,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_TRAP_EXIT,
NULL,
before_execmode_hook,
LTT_EVENT_TRAP_EXIT,
NULL,
before_execmode_hook,
@@
-279,7
+280,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_IRQ_ENTRY,
FIELD_ARRAY(LTT_FIELD_IRQ_ID),
before_execmode_hook,
LTT_EVENT_IRQ_ENTRY,
FIELD_ARRAY(LTT_FIELD_IRQ_ID),
before_execmode_hook,
@@
-287,7
+288,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_IRQ_EXIT,
NULL,
before_execmode_hook,
LTT_EVENT_IRQ_EXIT,
NULL,
before_execmode_hook,
@@
-295,7
+296,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_SOFT_IRQ_RAISE,
FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
before_execmode_hook,
LTT_EVENT_SOFT_IRQ_RAISE,
FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
before_execmode_hook,
@@
-303,7
+304,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_SOFT_IRQ_ENTRY,
FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
before_execmode_hook,
LTT_EVENT_SOFT_IRQ_ENTRY,
FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
before_execmode_hook,
@@
-311,7
+312,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_SOFT_IRQ_EXIT,
NULL,
before_execmode_hook,
LTT_EVENT_SOFT_IRQ_EXIT,
NULL,
before_execmode_hook,
@@
-320,7
+321,7
@@
void drawing_data_request(Drawing_t *drawing,
lttv_trace_find_hook(ts->parent.t,
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_SCHED_SCHEDULE,
FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
before_schedchange_hook,
LTT_EVENT_SCHED_SCHEDULE,
FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
before_schedchange_hook,
@@
-328,7
+329,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
// lttv_trace_find_hook(ts->parent.t,
&hooks);
// lttv_trace_find_hook(ts->parent.t,
-// LTT_
FACILITY
_KERNEL,
+// LTT_
CHANNEL
_KERNEL,
// LTT_EVENT_PROCESS_EXIT,
// FIELD_ARRAY(LTT_FIELD_PID),
// before_process_exit_hook,
// LTT_EVENT_PROCESS_EXIT,
// FIELD_ARRAY(LTT_FIELD_PID),
// before_process_exit_hook,
@@
-336,7
+337,7
@@
void drawing_data_request(Drawing_t *drawing,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
-// LTT_
FACILITY
_KERNEL,
+// LTT_
CHANNEL
_KERNEL,
// LTT_EVENT_PROCESS_FREE,
// FIELD_ARRAY(LTT_FIELD_PID),
// before_process_release_hook,
// LTT_EVENT_PROCESS_FREE,
// FIELD_ARRAY(LTT_FIELD_PID),
// before_process_release_hook,
@@
-352,7
+353,7
@@
void drawing_data_request(Drawing_t *drawing,
// &hooks);
lttv_trace_find_hook(ts->parent.t,
// &hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY_KERNEL
,
+ LTT_
CHANNEL_BLOCK
,
LTT_EVENT_REQUEST_ISSUE,
FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
before_bdev_event_hook,
LTT_EVENT_REQUEST_ISSUE,
FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
before_bdev_event_hook,
@@
-360,7
+361,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
lttv_trace_find_hook(ts->parent.t,
&hooks);
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY_KERNEL
,
+ LTT_
CHANNEL_BLOCK
,
LTT_EVENT_REQUEST_COMPLETE,
FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
before_bdev_event_hook,
LTT_EVENT_REQUEST_COMPLETE,
FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
before_bdev_event_hook,
@@
-371,7
+372,7
@@
void drawing_data_request(Drawing_t *drawing,
first_after = hooks->len;
lttv_trace_find_hook(ts->parent.t,
first_after = hooks->len;
lttv_trace_find_hook(ts->parent.t,
- LTT_
FACILITY
_KERNEL,
+ LTT_
CHANNEL
_KERNEL,
LTT_EVENT_SCHED_SCHEDULE,
FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
after_schedchange_hook,
LTT_EVENT_SCHED_SCHEDULE,
FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
after_schedchange_hook,
@@
-379,7
+380,7
@@
void drawing_data_request(Drawing_t *drawing,
&hooks);
// lttv_trace_find_hook(ts->parent.t,
&hooks);
// lttv_trace_find_hook(ts->parent.t,
-// LTT_
FACILITY
_KERNEL,
+// LTT_
CHANNEL
_KERNEL,
// LTT_EVENT_PROCESS_FORK,
// FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
// after_process_fork_hook,
// LTT_EVENT_PROCESS_FORK,
// FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
// after_process_fork_hook,
@@
-387,7
+388,7
@@
void drawing_data_request(Drawing_t *drawing,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
-// LTT_
FACILITY
_KERNEL,
+// LTT_
CHANNEL
_KERNEL,
// LTT_EVENT_PROCESS_EXIT,
// FIELD_ARRAY(LTT_FIELD_PID),
// after_process_exit_hook,
// LTT_EVENT_PROCESS_EXIT,
// FIELD_ARRAY(LTT_FIELD_PID),
// after_process_exit_hook,
@@
-395,7
+396,7
@@
void drawing_data_request(Drawing_t *drawing,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
// &hooks);
//
// lttv_trace_find_hook(ts->parent.t,
-// LTT_
FACILITY
_KERNEL,
+// LTT_
CHANNEL
_KERNEL,
// LTT_EVENT_EXEC,
// NULL,
// after_fs_exec_hook,
// LTT_EVENT_EXEC,
// NULL,
// after_fs_exec_hook,
@@
-423,19
+424,21
@@
void drawing_data_request(Drawing_t *drawing,
/* add before */
for(k = 0 ; k < first_after ; k++) {
th = &g_array_index(hooks, LttvTraceHook, k);
/* add before */
for(k = 0 ; k < first_after ; k++) {
th = &g_array_index(hooks, LttvTraceHook, k);
- lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
- th->h,
- th,
- LTTV_PRIO_STATE-5);
+ lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
+ th->channel, th->id),
+ th->h,
+ th,
+ LTTV_PRIO_STATE-5);
}
/* add after */
for(k = first_after ; k < hooks->len ; k++) {
th = &g_array_index(hooks, LttvTraceHook, k);
}
/* add after */
for(k = first_after ; k < hooks->len ; k++) {
th = &g_array_index(hooks, LttvTraceHook, k);
- lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
- th->h,
- th,
- LTTV_PRIO_STATE+5);
+ lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
+ th->channel, th->id),
+ th->h,
+ th,
+ LTTV_PRIO_STATE+5);
}
events_request->hooks = hooks;
}
events_request->hooks = hooks;
@@
-455,7
+458,7
@@
void drawing_data_request(Drawing_t *drawing,
events_request->before_chunk_trace = NULL;
events_request->before_chunk_tracefile = NULL;
events_request->event = NULL;
events_request->before_chunk_trace = NULL;
events_request->before_chunk_tracefile = NULL;
events_request->event = NULL;
- events_request->event_by_id
= event_by_id
;
+ events_request->event_by_id
_channel = event_by_id_channel
;
events_request->after_chunk_tracefile = NULL;
events_request->after_chunk_trace = NULL;
events_request->after_chunk_traceset = after_chunk_traceset;
events_request->after_chunk_tracefile = NULL;
events_request->after_chunk_trace = NULL;
events_request->after_chunk_traceset = after_chunk_traceset;
@@
-479,7
+482,7
@@
static void set_last_start(gpointer key, gpointer value, gpointer user_data)
{
//ResourceInfo *process_info = (ResourceInfo*)key;
HashedResourceData *hashed_process_data = (HashedResourceData*)value;
{
//ResourceInfo *process_info = (ResourceInfo*)key;
HashedResourceData *hashed_process_data = (HashedResourceData*)value;
- guint x = (guint)user_data;
+ guint x = (guint)
(gulong)
user_data;
hashed_process_data->x.over = x;
hashed_process_data->x.over_used = FALSE;
hashed_process_data->x.over = x;
hashed_process_data->x.over_used = FALSE;
@@
-518,7
+521,7
@@
void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
for(i=0; i<RV_RESOURCE_COUNT; i++) {
g_hash_table_foreach(cfd->process_list->restypes[i].hash_table, set_last_start,
for(i=0; i<RV_RESOURCE_COUNT; i++) {
g_hash_table_foreach(cfd->process_list->restypes[i].hash_table, set_last_start,
- (gpointer)x);
+ (gpointer)
(gulong)
x);
}
}
}
}
This page took
0.025624 seconds
and
4
git commands to generate.