X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_processing_lttng_standard.c;h=1bec81f0ef01058a445adb91a88f6945a3231e4b;hb=d5b038ec901e9753a8569f33516a49361c54254c;hp=cc9ada288353797096f954d5ea3361baf7840224;hpb=467066eeab8b0a4e5ea07d24f1840310730fd470;p=lttv.git

diff --git a/lttv/lttv/sync/event_processing_lttng_standard.c b/lttv/lttv/sync/event_processing_lttng_standard.c
index cc9ada28..1bec81f0 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,6 +42,8 @@ static void destroyProcessingLTTVStandard(SyncState* const syncState);
 
 static void finalizeProcessingLTTVStandard(SyncState* const syncState);
 static void printProcessingStatsLTTVStandard(SyncState* const syncState);
+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
@@ -65,6 +62,7 @@ static ProcessingModule processingModuleLTTVStandard = {
 	.finalizeProcessing= &finalizeProcessingLTTVStandard,
 	.printProcessingStats= &printProcessingStatsLTTVStandard,
 	.graphFunctions= {
+		.writeVariables= &writeProcessingGraphVariablesLTTVStandard,
 		.writeTraceTraceOptions= &writeProcessingTraceTraceOptionsLTTVStandard,
 		.writeTraceTimeOptions= &writeProcessingTraceTimeOptionsLTTVStandard,
 	},
@@ -234,7 +232,7 @@ static void finalizeProcessingLTTVStandard(SyncState* const syncState)
 	lttv_traceset_context_compute_time_span(processingData->traceSetContext,
 		&processingData->traceSetContext->time_span);
 
-	g_debug("traceset start %ld.%09ld end %ld.%09ld\n",
+	g_debug("traceset start %ld.%09ld end %ld.%09ld",
 		processingData->traceSetContext->time_span.start_time.tv_sec,
 		processingData->traceSetContext->time_span.start_time.tv_nsec,
 		processingData->traceSetContext->time_span.end_time.tv_sec,
@@ -349,7 +347,7 @@ static void partialDestroyProcessingLTTVStandard(SyncState* const syncState)
 	for(i= 0; i < syncState->traceNb; i++)
 	{
 
-		g_debug("Cleaning up pendingRecv list\n");
+		g_debug("Cleaning up pendingRecv list");
 		g_hash_table_destroy(processingData->pendingRecv[i]);
 	}
 	free(processingData->pendingRecv);
@@ -399,7 +397,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 	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 ",
+	g_debug("Process event: time: %ld.%09ld trace: %ld (%p) name: %s ",
 		time.tv_sec, time.tv_nsec, traceNum, trace,
 		g_quark_to_string(info->name));
 
@@ -470,7 +468,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 		syncState->matchingModule->matchEvent(syncState, outE);
 
-		g_debug("Output event done\n");
+		g_debug("Output event done");
 	}
 	else if (info->name == LTT_EVENT_DEV_RECEIVE)
 	{
@@ -507,11 +505,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 			g_hash_table_replace(processingData->pendingRecv[traceNum], skb,
 				inE);
 
-			g_debug("Adding inE %p for skb %p to pendingRecv\n", inE, skb);
-		}
-		else
-		{
-			g_debug("\n");
+			g_debug("Adding inE %p for skb %p to pendingRecv", inE, skb);
 		}
 	}
 	else if (info->name == LTT_EVENT_TCPV4_RCV_EXTENDED)
@@ -588,7 +582,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 			syncState->matchingModule->matchEvent(syncState, inE);
 
-			g_debug("TCP input event %p for skb %p done\n", inE, skb);
+			g_debug("TCP input event %p for skb %p done", inE, skb);
 		}
 	}
 	else if (info->name == LTT_EVENT_UDPV4_RCV_EXTENDED)
@@ -662,7 +656,7 @@ static gboolean processEventLTTVStandard(void* hookData, void* callData)
 
 			syncState->matchingModule->matchEvent(syncState, inE);
 
-			g_debug("UDP input event %p for skb %p done\n", inE, skb);
+			g_debug("UDP input event %p for skb %p done", inE, skb);
 		}
 	}
 	else
@@ -674,6 +668,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.
  *
@@ -697,15 +709,14 @@ static void writeProcessingTraceTraceOptionsLTTVStandard(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);
 }
 
 
@@ -735,6 +746,6 @@ static void writeProcessingTraceTimeOptionsLTTVStandard(SyncState* const
         "set ylabel \"time (s)\"\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", i, (double) traceI->startFreq / traceI->freqScale);
+		"set x2range [GPVAL_X_MIN / clock_freq_%1$u : GPVAL_X_MAX / clock_freq_%1$u]\n"
+		"set x2tics\n", i);
 }