git-svn-id: http://ltt.polymtl.ca/svn@249 04897980-b3bd-0310-b5e0-8ef037075253

[lttv.git] / ltt / branches / poly / lttv / processTrace.c

diff --git a/ltt/branches/poly/lttv/processTrace.c b/ltt/branches/poly/lttv/processTrace.c
index 94b5e2d90f37685abb688f70784f7e3ddcb3389b..122ce5109b14c5f3c0f5bba9886bcb46115b7c03 100644 (file)
--- a/ltt/branches/poly/lttv/processTrace.c
+++ b/ltt/branches/poly/lttv/processTrace.c
@@ -33,7 +33,7 @@ lttv_context_new_trace_context(LttvTracesetContext *self)
 LttvTracefileContext *
 lttv_context_new_tracefile_context(LttvTracesetContext *self)
 {
-  LTTV_TRACESET_CONTEXT_GET_CLASS(self)->new_tracefile_context(self);
+  return LTTV_TRACESET_CONTEXT_GET_CLASS(self)->new_tracefile_context(self);
 }
 
 
@@ -365,7 +365,7 @@ lttv_trace_context_get_type(void)
       (GClassInitFunc) trace_context_class_init,   /* class_init */
       NULL,   /* class_finalize */
       NULL,   /* class_data */
-      sizeof (LttvTracesetContext),
+      sizeof (LttvTraceContext),
       0,      /* n_preallocs */
       (GInstanceInitFunc) trace_context_instance_init    /* instance_init */
     };
@@ -441,7 +441,7 @@ gboolean get_first(gpointer key, gpointer value, gpointer user_data) {
 
 
 void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset, 
-    LttvTracesetContext *context)
+    LttvTracesetContext *context, unsigned maxNumEvents)
 {
   GPtrArray *traces = g_ptr_array_new();
 
@@ -460,6 +460,8 @@ void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset,
   LttvTracefileContext *tfc;
 
   LttEvent *event;
+  unsigned count = 0;
+  LttTime preTimestamp;
 
   /* Call all before_traceset, before_trace, and before_tracefile hooks.
      For all qualifying tracefiles, seek to the start time, create a context,
@@ -521,6 +523,23 @@ void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset,
        or more tracefiles have events for the same time, hope that lookup
        and remove are consistent. */
 
+    count++;
+    if(count > maxNumEvents){
+      if(tfc->timestamp.tv_sec == preTimestamp.tv_sec &&
+        tfc->timestamp.tv_nsec == preTimestamp.tv_nsec) {
+       count--;
+      }else{   
+       while(TRUE){
+         tfc = NULL;
+         g_tree_foreach(pqueue, get_first, &tfc);
+         if(tfc == NULL) break;
+         g_tree_remove(pqueue, &(tfc->timestamp));
+       }
+       break;
+      }
+    }
+    preTimestamp = tfc->timestamp;
+
     tfc = g_tree_lookup(pqueue, &(tfc->timestamp));
     g_tree_remove(pqueue, &(tfc->timestamp));
 
@@ -536,7 +555,9 @@ void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset,
     if(event != NULL) {
       tfc->e = event;
       tfc->timestamp = ltt_event_time(event);
-      g_tree_insert(pqueue, &(tfc->timestamp), tfc);
+      if(tfc->timestamp.tv_sec < end.tv_sec ||
+        (tfc->timestamp.tv_sec == end.tv_sec && tfc->timestamp.tv_nsec <= end.tv_nsec))
+       g_tree_insert(pqueue, &(tfc->timestamp), tfc);
     }
   }