X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftraceset-process.c;h=56543855f64a20bb6163ba7191eb181feeb516ed;hb=2dd99ee20f5205f235e36af08b89cbc8252c642e;hp=ee23cbcbac03dcc93f03fbcd09850a1291aff033;hpb=f1e5df2aa25d27006641b2ea87f292ce59f2c324;p=lttv.git

diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c
index ee23cbcb..56543855 100644
--- a/lttv/lttv/traceset-process.c
+++ b/lttv/lttv/traceset-process.c
@@ -73,12 +73,17 @@ guint lttv_process_traceset_middle(LttvTraceset *traceset,
 
 		if((bt_event = bt_ctf_iter_read_event(traceset->iter)) != NULL) {
 			
+			if(ltt_time_compare(end, ltt_time_from_uint64( bt_ctf_get_timestamp(bt_event))) <= 0) {
+				break;
+			}
+
 			count++;
 
 			event.bt_event = bt_event;
-			/* TODO ybrosseau 2012-04-01: use bt_ctf_get_trace_handle 
-			   to retrieve the right state container */
-			event.state = traceset->tmpState;
+
+			/* Retreive the associated state */
+			event.state = g_ptr_array_index(traceset->state_trace_handle_index,
+							bt_ctf_event_get_handle_id(bt_event));
 			
 			lttv_hooks_call(traceset->event_hooks, &event);