git-svn-id: http://ltt.polymtl.ca/svn@175 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 646dd1c820b1f553c09eaaf5e0476a26a21b2362..8723204c70bc58d1b7afa0f9b6da33acf7558205 100644 (file)
--- a/ltt/branches/poly/lttv/processTrace.c
+++ b/ltt/branches/poly/lttv/processTrace.c
@@ -257,21 +257,21 @@ void lttv_traceset_context_remove_hooks(LttvTracesetContext *self,
 }
 
 
-LttvTracesetContext *
+static LttvTracesetContext *
 new_traceset_context(LttvTracesetContext *self)
 {
   return g_object_new(LTTV_TRACESET_CONTEXT_TYPE, NULL);
 }
 
 
-LttvTraceContext * 
+static LttvTraceContext * 
 new_trace_context(LttvTracesetContext *self)
 {
   return g_object_new(LTTV_TRACE_CONTEXT_TYPE, NULL);
 }
 
 
-LttvTracefileContext *
+static LttvTracefileContext *
 new_tracefile_context(LttvTracesetContext *self)
 {
   return g_object_new(LTTV_TRACEFILE_CONTEXT_TYPE, NULL);
@@ -466,7 +466,8 @@ void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset,
      read one event and insert in the pqueue based on the event time. */
 
   lttv_hooks_call(context->before, context);
-  nbi = ltt_trace_set_number(traceset);
+  nbi = lttv_traceset_number(traceset);
+  //  nbi = ltt_trace_set_number(traceset);
 
   for(i = 0 ; i < nbi ; i++) {
     tc = context->traces[i];
@@ -524,7 +525,7 @@ void lttv_process_trace(LttTime start, LttTime end, LttvTraceset *traceset,
     g_tree_remove(pqueue, &(tfc->timestamp));
 
     if(!lttv_hooks_call(tfc->check_event, context)) {
-      id = lttv_event_id(tfc->e);
+      id = ltt_event_eventtype_id(tfc->e);
       lttv_hooks_call(tfc->before_event, tfc);
       lttv_hooks_call(lttv_hooks_by_id_get(tfc->before_event_by_id, id), tfc);
       lttv_hooks_call(tfc->after_event, context);