projects / lttv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use a timescale without correction in the graphs
[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 af1c93bb18156c2bd8ee60329342cc642b3f0569..0f1bda73c65704a0ebd1f1bd8b91a9ebd9d6c32f 100644 (file)
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -47,10 +47,8 @@ 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);
+static void writeProcessingGraphsOptionsLTTVStandard(SyncState* const
+       syncState, const unsigned int i, const unsigned int j);
 
 // Functions specific to this module
 static void registerProcessingLTTVStandard() __attribute__((constructor (102)));
@@ -64,7 +62,7 @@ static ProcessingModule processingModuleLTTVStandard = {
        .destroyProcessing= &destroyProcessingLTTVStandard,
        .finalizeProcessing= &finalizeProcessingLTTVStandard,
        .printProcessingStats= &printProcessingStatsLTTVStandard,
-       .writeProcessingGraphsPlots= &writeProcessingGraphsPlotsLTTVStandard,
+       .writeProcessingGraphsPlots= NULL,
        .writeProcessingGraphsOptions= &writeProcessingGraphsOptionsLTTVStandard,
 };
 
@@ -125,6 +123,24 @@ static void initProcessingLTTVStandard(SyncState* const syncState, LttvTracesetC
                        processingData->traceSetContext->traces[i]->t, (gpointer) i);
        }
 
+       if (syncState->graphsStream)
+       {
+               processingData->graphs= malloc(syncState->traceNb *
+                       sizeof(ProcessingGraphsLTTVStandard));
+
+               for(i= 0; i < syncState->traceNb; i++)
+               {
+                       LttTrace* traceI= traceSetContext->traces[i]->t;
+
+                       processingData->graphs[i].startFreq= traceI->start_freq;
+                       processingData->graphs[i].freqScale= traceI->freq_scale;
+               }
+       }
+       else
+       {
+               processingData->graphs= NULL;
+       }
+
        for(i= 0; i < syncState->traceNb; i++)
        {
                processingData->pendingRecv[i]= g_hash_table_new_full(&g_direct_hash,
@@ -224,15 +240,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 +276,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);
-       }
 }
 
 
@@ -308,6 +305,11 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState)
                free(processingData->stats);
        }
 
+       if (syncState->graphsStream)
+       {
+               free(processingData->graphs);
+       }
+
        free(syncState->processingData);
        syncState->processingData= NULL;
 }
@@ -425,16 +427,17 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
                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));
@@ -493,6 +496,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
                        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,
@@ -535,15 +539,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));
@@ -613,15 +618,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=
@@ -666,59 +672,35 @@ 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.
+ * Write the processing-specific options in the gnuplot script.
  *
  * 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.
- *
- * 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 writeProcessingGraphsOptionsLTTVStandard(FILE* stream, SyncState*
-       const syncState, const unsigned int i, const unsigned int j)
+static void writeProcessingGraphsOptionsLTTVStandard(SyncState* const
+       syncState, const unsigned int i, const unsigned int j)
 {
        ProcessingDataLTTVStandard* processingData;
-       LttTrace* traceI, * traceJ;
+       ProcessingGraphsLTTVStandard* traceI, * traceJ;
 
        processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
 
-       traceI= processingData->traceSetContext->traces[i]->t;
-       traceJ= processingData->traceSetContext->traces[j]->t;
+       traceI= &processingData->graphs[i];
+       traceJ= &processingData->graphs[j];
 
-       fprintf(stream,
+       fprintf(syncState->graphsStream,
+        "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"
                "set y2label \"Clock %3$d (s)\"\n"
                "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);
-       }
+               "set y2tics\n", i, (double) traceI->startFreq / traceI->freqScale, j,
+               (double) traceJ->startFreq / traceJ->freqScale);
 }
LTTng 2.x Viewer (LTTV)
This page took 0.025889 seconds and 4 git commands to generate.