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

diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c
index 4a701548..ae41ff67 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;
-	unsigned int i, j;
+	unsigned int i;
 	int retval;
 
 	if (!optionSync.present)
@@ -220,7 +220,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 
 		fprintf(syncState->graphsStream,
 			"#!/usr/bin/gnuplot\n\n"
-			"set terminal postscript eps color size 8in,6in\n");
+			"set terminal postscript eps color size 8in,6in\n\n");
 
 		retval= chdir(cwd);
 		if (retval == -1)
@@ -285,83 +285,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	// Write graphs file
 	if (optionSyncGraphs.present)
 	{
-		// 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 pos1, pos2, trunc;
-
-				fprintf(syncState->graphsStream,
-					"\nreset\n"
-					"set output \"%03d-%03d.eps\"\n"
-					"plot \\\n", 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);
-				}
-
-				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(syncState->graphsStream, 0, SEEK_END) == -1)
-				{
-					g_error(strerror(errno));
-				}
-
-				fprintf(syncState->graphsStream,
-					"\nset output \"%03d-%03d.eps\"\n"
-					"set title \"\"\n", 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);
-				}
-
-				if (pos1 != pos2)
-				{
-					fprintf(syncState->graphsStream, "replot\n");
-				}
-			}
-		}
+		writeGraphsScript(syncState);
 
 		if (fclose(syncState->graphsStream) != 0)
 		{