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

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index 8c20f975..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,8 +42,12 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState);
 
 static void finalizeProcessingLTTVStandard(SyncState* const syncState);
 static void printProcessingStatsLTTVStandard(SyncState* const syncState);
-static void writeProcessingGraphsOptionsLTTVStandard(FILE* stream, SyncState*
-	const syncState, const unsigned int i, const unsigned int j);
+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
 static void registerProcessingLTTVStandard() __attribute__((constructor (102)));
@@ -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
  */
@@ -123,6 +124,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,
@@ -287,6 +306,11 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState)
 		free(processingData->stats);
 	}
 
+	if (syncState->graphsStream)
+	{
+		free(processingData->graphs);
+	}
+
 	free(syncState->processingData);
 	syncState->processingData= NULL;
 }
@@ -648,37 +672,84 @@ 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.
  *
  * 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 writeProcessingTraceTraceOptionsLTTVStandard(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 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->start_freq / traceI->freq_scale,
-		j, (double) traceJ->start_freq / traceJ->freq_scale);
+		"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);
 }