X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_processing_lttng_standard.c;h=b5ec8d419ca4bd14257bc7842446c9e12bf65ec1;hb=fafb0a2998296c564cbc26c2c0fa5142b181b332;hp=0f1bda73c65704a0ebd1f1bd8b91a9ebd9d6c32f;hpb=1633c5a57a93a17f02858032c68f98f3d37890bc;p=lttv.git

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index 0f1bda73..b5ec8d41 100644
--- a/lttv/lttv/sync/event_processing_lttng_standard.c
+++ b/lttv/lttv/sync/event_processing_lttng_standard.c
@@ -35,11 +35,6 @@
 #include "event_processing_lttng_standard.h"
 
 
-#ifndef g_info
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#endif
-
-
 // Functions common to all processing modules
 static void initProcessingLTTVStandard(SyncState* const syncState,
 	LttvTracesetContext* const traceSetContext);
@@ -47,7 +42,11 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState);
 
 static void finalizeProcessingLTTVStandard(SyncState* const syncState);
 static void printProcessingStatsLTTVStandard(SyncState* const syncState);
-static void writeProcessingGraphsOptionsLTTVStandard(SyncState* const
+static void writeProcessingGraphVariablesLTTVStandard(SyncState* const
+	syncState, const unsigned int i);
+static void writeProcessingTraceTraceOptionsLTTVStandard(SyncState* const
+	syncState, const unsigned int i, const unsigned int j);
+static void writeProcessingTraceTimeOptionsLTTVStandard(SyncState* const
 	syncState, const unsigned int i, const unsigned int j);
 
 // Functions specific to this module
@@ -62,12 +61,14 @@ static ProcessingModule processingModuleLTTVStandard = {
 	.destroyProcessing= &destroyProcessingLTTVStandard,
 	.finalizeProcessing= &finalizeProcessingLTTVStandard,
 	.printProcessingStats= &printProcessingStatsLTTVStandard,
-	.writeProcessingGraphsPlots= NULL,
-	.writeProcessingGraphsOptions= &writeProcessingGraphsOptionsLTTVStandard,
+	.graphFunctions= {
+		.writeVariables= &writeProcessingGraphVariablesLTTVStandard,
+		.writeTraceTraceOptions= &writeProcessingTraceTraceOptionsLTTVStandard,
+		.writeTraceTimeOptions= &writeProcessingTraceTimeOptionsLTTVStandard,
+	},
 };
 
 
-
 /*
  * Processing Module registering function
  */
@@ -671,6 +672,24 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 }
 
 
+/*
+ * Write the processing-specific variables in the gnuplot script.
+ *
+ * Args:
+ *   syncState:    container for synchronization data
+ *   i:            trace number
+ */
+static void writeProcessingGraphVariablesLTTVStandard(SyncState* const
+	syncState, const unsigned int i)
+{
+	ProcessingDataLTTVStandard* processingData= syncState->processingData;
+	ProcessingGraphsLTTVStandard* traceI= &processingData->graphs[i];
+
+	fprintf(syncState->graphsStream, "clock_freq_%u= %.3f\n", i, (double)
+		traceI->startFreq / traceI->freqScale);
+}
+
+
 /*
  * Write the processing-specific options in the gnuplot script.
  *
@@ -679,7 +698,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
  *   i:            first trace number
  *   j:            second trace number, garanteed to be larger than i
  */
-static void writeProcessingGraphsOptionsLTTVStandard(SyncState* const
+static void writeProcessingTraceTraceOptionsLTTVStandard(SyncState* const
 	syncState, const unsigned int i, const unsigned int j)
 {
 	ProcessingDataLTTVStandard* processingData;
@@ -694,13 +713,43 @@ static void writeProcessingGraphsOptionsLTTVStandard(SyncState* const
         "set key inside right bottom\n"
         "set xlabel \"Clock %1$u\"\n"
         "set xtics nomirror\n"
-        "set ylabel \"Clock %3$u\"\n"
+        "set ylabel \"Clock %2$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 x2range [GPVAL_X_MIN / clock_freq_%1$u : GPVAL_X_MAX / clock_freq_%1$u]\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->startFreq / traceI->freqScale, j,
-		(double) traceJ->startFreq / traceJ->freqScale);
+		"set y2label \"Clock %2$d (s)\"\n"
+		"set y2range [GPVAL_Y_MIN / clock_freq_%2$u : GPVAL_Y_MAX / clock_freq_%2$u]\n"
+		"set y2tics\n", i, j);
+}
+
+
+/*
+ * Write the processing-specific options in the gnuplot script.
+ *
+ * Args:
+ *   syncState:    container for synchronization data
+ *   i:            first trace number
+ *   j:            second trace number, garanteed to be larger than i
+ */
+static void writeProcessingTraceTimeOptionsLTTVStandard(SyncState* const
+	syncState, const unsigned int i, const unsigned int j)
+{
+	ProcessingDataLTTVStandard* processingData;
+	ProcessingGraphsLTTVStandard* traceI, * traceJ;
+
+	processingData= (ProcessingDataLTTVStandard*) syncState->processingData;
+
+	traceI= &processingData->graphs[i];
+	traceJ= &processingData->graphs[j];
+
+	fprintf(syncState->graphsStream,
+        "set key inside right bottom\n"
+        "set xlabel \"Clock %1$u\"\n"
+        "set xtics nomirror\n"
+        "set ylabel \"time (s)\"\n"
+        "set ytics nomirror\n"
+		"set x2label \"Clock %1$d (s)\"\n"
+		"set x2range [GPVAL_X_MIN / clock_freq_%1$u : GPVAL_X_MAX / clock_freq_%1$u]\n"
+		"set x2tics\n", i);
 }