Initialize traceNb in the processing modules

[lttv.git] / lttv / lttv / sync / event_processing_lttng_standard.c

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index 1bec81f0ef01058a445adb91a88f6945a3231e4b..e6457fa4e96a0278b6457834e5639b7b87928e36 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -25,6 +25,7 @@
 #include <linux/if_ether.h>
 #include <math.h>
 #include <netinet/in.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,8 +37,7 @@
 
 
 // Functions common to all processing modules
-static void initProcessingLTTVStandard(SyncState* const syncState,
-       LttvTracesetContext* const traceSetContext);
+static void initProcessingLTTVStandard(SyncState* const syncState, ...);
 static void destroyProcessingLTTVStandard(SyncState* const syncState);
 
 static void finalizeProcessingLTTVStandard(SyncState* const syncState);
@@ -91,37 +91,46 @@ static void registerProcessingLTTVStandard()
  *                 pendingRecv
  *                 hookListList
  *                 stats
- *   traceSetContext: set of LTTV traces
+ *   traceSetContext: LttvTracesetContext*, set of LTTV traces
  */
-static void initProcessingLTTVStandard(SyncState* const syncState, LttvTracesetContext*
-       const traceSetContext)
+static void initProcessingLTTVStandard(SyncState* const syncState, ...)
 {
        unsigned int i;
        ProcessingDataLTTVStandard* processingData;
+       va_list ap;
 
        processingData= malloc(sizeof(ProcessingDataLTTVStandard));
        syncState->processingData= processingData;
-       processingData->traceSetContext= traceSetContext;
+       va_start(ap, syncState);
+       processingData->traceSetContext= va_arg(ap, LttvTracesetContext*);
+       va_end(ap);
+       syncState->traceNb=
+               lttv_traceset_number(processingData->traceSetContext->ts);
+       processingData->hookListList= g_array_sized_new(FALSE, FALSE,
+               sizeof(GArray*), syncState->traceNb);
 
-       if (syncState->stats)
-       {
-               processingData->stats= calloc(1, sizeof(ProcessingStatsLTTVStandard));
-       }
-       else
+       processingData->traceNumTable= g_hash_table_new(&g_direct_hash, NULL);
+       for(i= 0; i < syncState->traceNb; i++)
        {
-               processingData->stats= NULL;
+               g_hash_table_insert(processingData->traceNumTable,
+                       processingData->traceSetContext->traces[i]->t, (gpointer) i);
        }
 
-       processingData->traceNumTable= g_hash_table_new(&g_direct_hash, NULL);
-       processingData->hookListList= g_array_sized_new(FALSE, FALSE,
-               sizeof(GArray*), syncState->traceNb);
        processingData->pendingRecv= malloc(sizeof(GHashTable*) *
                syncState->traceNb);
-
        for(i= 0; i < syncState->traceNb; i++)
        {
-               g_hash_table_insert(processingData->traceNumTable,
-                       processingData->traceSetContext->traces[i]->t, (gpointer) i);
+               processingData->pendingRecv[i]= g_hash_table_new_full(&g_direct_hash,
+                       NULL, NULL, &gdnDestroyEvent);
+       }
+
+       if (syncState->stats)
+       {
+               processingData->stats= calloc(1, sizeof(ProcessingStatsLTTVStandard));
+       }
+       else
+       {
+               processingData->stats= NULL;
        }
 
        if (syncState->graphsStream)
@@ -131,7 +140,7 @@ static void initProcessingLTTVStandard(SyncState* const syncState, LttvTracesetC
 
                for(i= 0; i < syncState->traceNb; i++)
                {
-                       LttTrace* traceI= traceSetContext->traces[i]->t;
+                       LttTrace* traceI= processingData->traceSetContext->traces[i]->t;
 
                        processingData->graphs[i].startFreq= traceI->start_freq;
                        processingData->graphs[i].freqScale= traceI->freq_scale;
@@ -142,14 +151,8 @@ static void initProcessingLTTVStandard(SyncState* const syncState, LttvTracesetC
                processingData->graphs= NULL;
        }
 
-       for(i= 0; i < syncState->traceNb; i++)
-       {
-               processingData->pendingRecv[i]= g_hash_table_new_full(&g_direct_hash,
-                       NULL, NULL, &gdnDestroyEvent);
-       }
-
-       registerHooks(processingData->hookListList, traceSetContext,
-               &processEventLTTVStandard, syncState,
+       registerHooks(processingData->hookListList,
+               processingData->traceSetContext, &processEventLTTVStandard, syncState,
                syncState->matchingModule->canMatch);
 }