Call the stats and graph functions from sync_chain

[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 1ee27c761567ddbee8e707b149cb00cc708208dd..8c20f975d4bdf054acb3b38455abc9feaa5934bd 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -47,8 +47,6 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState);
 
 static void finalizeProcessingLTTVStandard(SyncState* const syncState);
 static void printProcessingStatsLTTVStandard(SyncState* const syncState);
-static void writeProcessingGraphsPlotsLTTVStandard(FILE* stream, SyncState*
-       const syncState, const unsigned int i, const unsigned int j);
 static void writeProcessingGraphsOptionsLTTVStandard(FILE* stream, SyncState*
        const syncState, const unsigned int i, const unsigned int j);
 
@@ -64,7 +62,7 @@ static ProcessingModule processingModuleLTTVStandard = {
        .destroyProcessing= &destroyProcessingLTTVStandard,
        .finalizeProcessing= &finalizeProcessingLTTVStandard,
        .printProcessingStats= &printProcessingStatsLTTVStandard,
-       .writeProcessingGraphsPlots= &writeProcessingGraphsPlotsLTTVStandard,
+       .writeProcessingGraphsPlots= NULL,
        .writeProcessingGraphsOptions= &writeProcessingGraphsOptionsLTTVStandard,
 };
 
@@ -224,15 +222,14 @@ static void finalizeProcessingLTTVStandard(SyncState* const syncState)
 
 
 /*
- * Print statistics related to processing and downstream modules. Must be
- * called after finalizeProcessing.
+ * Print statistics related to processing Must be called after
+ * finalizeProcessing.
  *
  * Args:
  *   syncState     container for synchronization data.
  */
 static void printProcessingStatsLTTVStandard(SyncState* const syncState)
 {
-       unsigned int i;
        ProcessingDataLTTVStandard* processingData;
 
        if (!syncState->stats)
@@ -261,24 +258,6 @@ static void printProcessingStatsLTTVStandard(SyncState* const syncState)
                printf("\tsent packets that are TCP: %d\n",
                        processingData->stats->totOutE);
        }
-
-       if (syncState->matchingModule->printMatchingStats != NULL)
-       {
-               syncState->matchingModule->printMatchingStats(syncState);
-       }
-
-       printf("Resulting synchronization factors:\n");
-       for (i= 0; i < syncState->traceNb; i++)
-       {
-               LttTrace* t;
-
-               t= processingData->traceSetContext->traces[i]->t;
-
-               printf("\ttrace %u drift= %g offset= %g (%f) start time= %ld.%09ld\n",
-                       i, t->drift, t->offset, (double) tsc_to_uint64(t->freq_scale,
-                               t->start_freq, t->offset) / NANOSECONDS_PER_SECOND,
-                       t->start_time_from_tsc.tv_sec, t->start_time_from_tsc.tv_nsec);
-       }
 }
 
 
@@ -370,8 +349,9 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
        LttvTraceHook* traceHook;
        LttvTracefileContext* tfc;
        LttEvent* event;
-       LttTime time;
        LttCycleCount tsc;
+       LttTime time;
+       WallTime wTime;
        LttTrace* trace;
        unsigned long traceNum;
        struct marker_info* info;
@@ -384,15 +364,17 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
        syncState= (SyncState*) traceHook->hook_data;
        processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
        event= ltt_tracefile_get_event(tfc->tf);
-       time= ltt_event_time(event);
-       tsc= trace->drift * ltt_event_cycle_count(event) + trace->offset;
        info= marker_get_info_from_id(tfc->tf->mdata, event->event_id);
+       tsc= ltt_event_cycle_count(event);
+       time= ltt_event_time(event);
+       wTime.seconds= time.tv_sec;
+       wTime.nanosec= time.tv_nsec;
 
        g_assert(g_hash_table_lookup_extended(processingData->traceNumTable,
                        trace, NULL, (gpointer*) &traceNum));
 
        g_debug("XXXX process event: time: %ld.%09ld trace: %ld (%p) name: %s ",
-               (long) time.tv_sec, time.tv_nsec, traceNum, trace,
+               time.tv_sec, time.tv_nsec, traceNum, trace,
                g_quark_to_string(info->name));
 
        if (info->name == LTT_EVENT_DEV_XMIT_EXTENDED)
@@ -419,18 +401,20 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
                outE= malloc(sizeof(Event));
                outE->traceNum= traceNum;
-               outE->time= tsc;
+               outE->cpuTime= tsc;
+               outE->wallTime= wTime;
                outE->type= TCP;
+               outE->copy= &copyTCPEvent;
                outE->destroy= &destroyTCPEvent;
                outE->event.tcpEvent= malloc(sizeof(TCPEvent));
                outE->event.tcpEvent->direction= OUT;
                outE->event.tcpEvent->segmentKey= malloc(sizeof(SegmentKey));
                outE->event.tcpEvent->segmentKey->connectionKey.saddr=
-                       ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
-                                       3));
+                       htonl(ltt_event_get_unsigned(event,
+                                       lttv_trace_get_hook_field(traceHook, 3)));
                outE->event.tcpEvent->segmentKey->connectionKey.daddr=
-                       ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
-                                       4));
+                       htonl(ltt_event_get_unsigned(event,
+                                       lttv_trace_get_hook_field(traceHook, 4)));
                outE->event.tcpEvent->segmentKey->tot_len=
                        ltt_event_get_unsigned(event, lttv_trace_get_hook_field(traceHook,
                                        5));
@@ -486,8 +470,10 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
                        inE= malloc(sizeof(Event));
                        inE->traceNum= traceNum;
-                       inE->time= tsc;
+                       inE->cpuTime= tsc;
+                       inE->wallTime= wTime;
                        inE->event.tcpEvent= NULL;
+                       inE->copy= &copyEvent;
                        inE->destroy= &destroyEvent;
 
                        skb= (void*) (long) ltt_event_get_long_unsigned(event,
@@ -530,15 +516,16 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
                        inE->type= TCP;
                        inE->event.tcpEvent= malloc(sizeof(TCPEvent));
+                       inE->copy= &copyTCPEvent;
                        inE->destroy= &destroyTCPEvent;
                        inE->event.tcpEvent->direction= IN;
                        inE->event.tcpEvent->segmentKey= malloc(sizeof(SegmentKey));
                        inE->event.tcpEvent->segmentKey->connectionKey.saddr=
-                               ltt_event_get_unsigned(event,
-                                       lttv_trace_get_hook_field(traceHook, 1));
+                               htonl(ltt_event_get_unsigned(event,
+                                               lttv_trace_get_hook_field(traceHook, 1)));
                        inE->event.tcpEvent->segmentKey->connectionKey.daddr=
-                               ltt_event_get_unsigned(event,
-                                       lttv_trace_get_hook_field(traceHook, 2));
+                               htonl(ltt_event_get_unsigned(event,
+                                               lttv_trace_get_hook_field(traceHook, 2)));
                        inE->event.tcpEvent->segmentKey->tot_len=
                                ltt_event_get_unsigned(event,
                                        lttv_trace_get_hook_field(traceHook, 3));
@@ -608,15 +595,16 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
                        inE->type= UDP;
                        inE->event.udpEvent= malloc(sizeof(UDPEvent));
+                       inE->copy= &copyUDPEvent;
                        inE->destroy= &destroyUDPEvent;
                        inE->event.udpEvent->direction= IN;
                        inE->event.udpEvent->datagramKey= malloc(sizeof(DatagramKey));
                        inE->event.udpEvent->datagramKey->saddr=
-                               ltt_event_get_unsigned(event,
-                                       lttv_trace_get_hook_field(traceHook, 1));
+                               htonl(ltt_event_get_unsigned(event,
+                                       lttv_trace_get_hook_field(traceHook, 1)));
                        inE->event.udpEvent->datagramKey->daddr=
-                               ltt_event_get_unsigned(event,
-                                       lttv_trace_get_hook_field(traceHook, 2));
+                               htonl(ltt_event_get_unsigned(event,
+                                       lttv_trace_get_hook_field(traceHook, 2)));
                        inE->event.udpEvent->unicast= ltt_event_get_unsigned(event,
                                lttv_trace_get_hook_field(traceHook, 3)) == 0 ? false : true;
                        inE->event.udpEvent->datagramKey->ulen=
@@ -661,29 +649,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 
 /*
- * Write the processing-specific graph lines in the gnuplot script (none at
- * the moment). Call the downstream module's graph function.
- *
- * Args:
- *   stream:       stream where to write the data
- *   syncState:    container for synchronization data
- *   i:            first trace number
- *   j:            second trace number, garanteed to be larger than i
- */
-static void writeProcessingGraphsPlotsLTTVStandard(FILE* stream, SyncState*
-       const syncState, const unsigned int i, const unsigned int j)
-{
-       if (syncState->matchingModule->writeMatchingGraphsPlots != NULL)
-       {
-               syncState->matchingModule->writeMatchingGraphsPlots(stream, syncState,
-                       i, j);
-       }
-}
-
-
-/*
- * Write the processing-specific options in the gnuplot script. Call the
- * downstream module's options function.
+ * Write the processing-specific options in the gnuplot script.
  *
  * Args:
  *   stream:       stream where to write the data
@@ -703,6 +669,11 @@ static void writeProcessingGraphsOptionsLTTVStandard(FILE* stream, SyncState*
        traceJ= processingData->traceSetContext->traces[j]->t;
 
        fprintf(stream,
+        "set key inside right bottom\n"
+        "set xlabel \"Clock %1$u\"\n"
+        "set xtics nomirror\n"
+        "set ylabel \"Clock %3$u\"\n"
+        "set ytics nomirror\n"
                "set x2label \"Clock %1$d (s)\"\n"
                "set x2range [GPVAL_X_MIN / %2$.1f : GPVAL_X_MAX / %2$.1f]\n"
                "set x2tics\n"
@@ -710,10 +681,4 @@ static void writeProcessingGraphsOptionsLTTVStandard(FILE* stream, SyncState*
                "set y2range [GPVAL_Y_MIN / %4$.1f : GPVAL_Y_MAX / %4$.1f]\n"
                "set y2tics\n", i, (double) traceI->start_freq / traceI->freq_scale,
                j, (double) traceJ->start_freq / traceJ->freq_scale);
-
-       if (syncState->matchingModule->writeMatchingGraphsOptions != NULL)
-       {
-               syncState->matchingModule->writeMatchingGraphsOptions(stream,
-                       syncState, i, j);
-       }
 }