X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fsync_chain_lttv.c;h=4a70154884a63a59ac703abecc95dca5753a6c76;hb=e072e1abc02d780d84664fcb2c971eb5a317f664;hp=cd8532a990c5eed3ff640dc19ec807fedb3dd17a;hpb=d4721e1a5216f34570d7e10257f85601cb3991bc;p=lttv.git

diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c
index cd8532a9..4a701548 100644
--- a/lttv/lttv/sync/sync_chain_lttv.c
+++ b/lttv/lttv/sync/sync_chain_lttv.c
@@ -169,7 +169,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	struct timeval startTime, endTime;
 	struct rusage startUsage, endUsage;
 	GList* result;
-	FILE* graphsStream;
+	unsigned int i, j;
 	int retval;
 
 	if (!optionSync.present)
@@ -198,23 +198,14 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	}
 
 	if (optionSyncGraphs.present)
-	{
-		syncState->graphs= optionSyncGraphsDir.arg;
-	}
-	else
-	{
-		syncState->graphs= NULL;
-	}
-
-	graphsStream= NULL;
-	if (syncState->graphs)
 	{
 		char* cwd;
 		int graphsFp;
 
 		// Create the graph directory right away in case the module initialization
 		// functions have something to write in it.
-		cwd= changeToGraphDir(syncState->graphs);
+		syncState->graphsDir= optionSyncGraphsDir.arg;
+		cwd= changeToGraphDir(optionSyncGraphsDir.arg);
 
 		if ((graphsFp= open("graphs.gnu", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR |
 				S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH
@@ -222,11 +213,15 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		{
 			g_error(strerror(errno));
 		}
-		if ((graphsStream= fdopen(graphsFp, "w")) == NULL)
+		if ((syncState->graphsStream= fdopen(graphsFp, "w")) == NULL)
 		{
 			g_error(strerror(errno));
 		}
 
+		fprintf(syncState->graphsStream,
+			"#!/usr/bin/gnuplot\n\n"
+			"set terminal postscript eps color size 8in,6in\n");
+
 		retval= chdir(cwd);
 		if (retval == -1)
 		{
@@ -234,6 +229,11 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		}
 		free(cwd);
 	}
+	else
+	{
+		syncState->graphsStream= NULL;
+		syncState->graphsDir= NULL;
+	}
 
 	// Identify and initialize modules
 	syncState->processingData= NULL;
@@ -283,58 +283,87 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	syncState->processingModule->finalizeProcessing(syncState);
 
 	// Write graphs file
-	if (graphsStream != NULL)
+	if (optionSyncGraphs.present)
 	{
-		unsigned int i, j;
-
-		fprintf(graphsStream,
-			"#!/usr/bin/gnuplot\n\n"
-			"set terminal postscript eps color size 8in,6in\n");
-
 		// Cover the upper triangular matrix, i is the reference node.
 		for (i= 0; i < syncState->traceNb; i++)
 		{
 			for (j= i + 1; j < syncState->traceNb; j++)
 			{
-				long pos;
+				long pos1, pos2, trunc;
 
-				fprintf(graphsStream,
-					"\nset output \"%03d-%03d.eps\"\n"
+				fprintf(syncState->graphsStream,
+					"\nreset\n"
+					"set output \"%03d-%03d.eps\"\n"
 					"plot \\\n", i, j);
 
-				syncState->processingModule->writeProcessingGraphsPlots(graphsStream,
-					syncState, i, j);
+				if (syncState->processingModule->writeProcessingGraphsPlots)
+				{
+					syncState->processingModule->writeProcessingGraphsPlots(syncState,
+						i, j);
+				}
+				if (syncState->matchingModule->writeMatchingGraphsPlots)
+				{
+					syncState->matchingModule->writeMatchingGraphsPlots(syncState,
+						i, j);
+				}
+				if (syncState->analysisModule->writeAnalysisGraphsPlots)
+				{
+					syncState->analysisModule->writeAnalysisGraphsPlots(syncState,
+						i, j);
+				}
 
-				// Remove the ", \\\n" from the last graph plot line
-				fflush(graphsStream);
-				pos= ftell(graphsStream);
-				if (ftruncate(fileno(graphsStream), pos - 4) == -1)
+				fflush(syncState->graphsStream);
+				pos2= ftell(syncState->graphsStream);
+				if (pos1 != pos2)
+				{
+					// Remove the ", \\\n" from the last graph plot line
+					trunc= pos2 - 4;
+				}
+				else
+				{
+					// Remove the "plot \\\n" line to avoid creating an invalid
+					// gnuplot script
+					trunc= pos2 - 7;
+				}
+
+				if (ftruncate(fileno(syncState->graphsStream), trunc) == -1)
 				{
 					g_error(strerror(errno));
 				}
-				if (fseek(graphsStream, 0, SEEK_END) == -1)
+				if (fseek(syncState->graphsStream, 0, SEEK_END) == -1)
 				{
 					g_error(strerror(errno));
 				}
 
-				fprintf(graphsStream,
-					"\nset output \"%1$03d-%2$03d.eps\"\n"
-					"set key inside right bottom\n"
-					"set title \"\"\n"
-					"set xlabel \"Clock %1$u\"\n"
-					"set xtics nomirror\n"
-					"set ylabel \"Clock %2$u\"\n"
-					"set ytics nomirror\n", i, j);
+				fprintf(syncState->graphsStream,
+					"\nset output \"%03d-%03d.eps\"\n"
+					"set title \"\"\n", i, j);
 
-				syncState->processingModule->writeProcessingGraphsOptions(graphsStream,
-					syncState, i, j);
+				if (syncState->processingModule->writeProcessingGraphsOptions)
+				{
+					syncState->processingModule->writeProcessingGraphsOptions(syncState,
+						i, j);
+				}
+				if (syncState->matchingModule->writeMatchingGraphsOptions)
+				{
+					syncState->matchingModule->writeMatchingGraphsOptions(syncState,
+						i, j);
+				}
+				if (syncState->analysisModule->writeAnalysisGraphsOptions)
+				{
+					syncState->analysisModule->writeAnalysisGraphsOptions(syncState,
+						i, j);
+				}
 
-				fprintf(graphsStream,
-					"replot\n");
+				if (pos1 != pos2)
+				{
+					fprintf(syncState->graphsStream, "replot\n");
+				}
 			}
 		}
 
-		if (fclose(graphsStream) != 0)
+		if (fclose(syncState->graphsStream) != 0)
 		{
 			g_error(strerror(errno));
 		}
@@ -344,6 +373,31 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	{
 		syncState->processingModule->printProcessingStats(syncState);
 	}
+	if (syncState->matchingModule->printMatchingStats != NULL)
+	{
+		syncState->matchingModule->printMatchingStats(syncState);
+	}
+	if (syncState->analysisModule->printAnalysisStats != NULL)
+	{
+		syncState->analysisModule->printAnalysisStats(syncState);
+	}
+
+	if (optionSyncStats.present)
+	{
+		printf("Resulting synchronization factors:\n");
+		for (i= 0; i < syncState->traceNb; i++)
+		{
+			LttTrace* t;
+
+			t= 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);
+		}
+	}
 
 	syncState->processingModule->destroyProcessing(syncState);
 	if (syncState->matchingModule != NULL)