X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=924f3711ba8660b2ba34c61559bddff37386e942;hb=a2aab3a3417958dbbb2dff69c15d1206ec7d28b1;hp=49a2109a98502dea28c2e46340d0e0d2d66ed6d7;hpb=4e86ae2e22548733054ffe05644d4a66030c859e;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 49a2109a..924f3711 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -385,7 +385,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -393,11 +393,9 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
   guint width = drawing->width;
@@ -731,11 +729,11 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   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)
@@ -842,7 +840,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
 
     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,
@@ -1340,7 +1338,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -1349,11 +1347,9 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -1458,11 +1454,11 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   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;
 
 
@@ -1571,7 +1567,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 
     //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(
@@ -1952,7 +1948,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -1961,11 +1957,9 @@ int before_execmode_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -2135,7 +2129,7 @@ int after_execmode_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -2144,11 +2138,9 @@ int after_execmode_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -2243,7 +2235,7 @@ int before_process_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -2252,11 +2244,9 @@ int before_process_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -2438,7 +2428,7 @@ int after_process_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
@@ -2447,11 +2437,9 @@ int after_process_hook(void *hook_data, void *call_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -3035,11 +3023,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   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)
+        || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
 
@@ -3180,7 +3166,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
 int before_chunk(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
-  LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
+  LttvTracesetState *tss = (LttvTracesetState*)call_data;
 
   drawing_chunk_begin(events_request, tss);
 
@@ -3190,7 +3176,7 @@ int before_chunk(void *hook_data, void *call_data)
 int before_request(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
-  LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
+  LttvTracesetState *tss = (LttvTracesetState*)call_data;
 
   drawing_data_request_begin(events_request, tss);
 
@@ -3211,8 +3197,8 @@ int after_request(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
-  LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
-  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_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;
@@ -3240,8 +3226,8 @@ int after_chunk(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
-  LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
-  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data);
+  LttvTracesetState *tss = (LttvTracesetState*)call_data;
+  LttvTracesetContext *tsc = (LttvTracesetContext*)call_data;
   LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc);
   LttTime end_time;