X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Ftext%2Fsync_chain_batch.c;h=c88b13c5962623fdf3491829d9e1c0bf4f91ae8a;hb=1d597550379cb00832f73bd5402918fd6ed2e9df;hp=8ac77fd9fb2188ddcc6c592d5a7b6fa46cbd04e3;hpb=e072e1abc02d780d84664fcb2c971eb5a317f664;p=lttv.git

diff --git a/lttv/modules/text/sync_chain_batch.c b/lttv/modules/text/sync_chain_batch.c
index 8ac77fd9..c88b13c5 100644
--- a/lttv/modules/text/sync_chain_batch.c
+++ b/lttv/modules/text/sync_chain_batch.c
@@ -295,35 +295,10 @@ void setupSyncChain(LttvTracesetContext* const traceSetContext)
 
 	if (optionEvalGraphs)
 	{
-		char* cwd;
-		int graphsFp;
-
 		// Create the graph directory right away in case the module initialization
 		// functions have something to write in it.
 		syncState->graphsDir= optionEvalGraphsDir;
-		cwd= changeToGraphDir(optionEvalGraphsDir);
-
-		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
-				| S_IWOTH | S_IXOTH)) == -1)
-		{
-			g_error(strerror(errno));
-		}
-		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)
-		{
-			g_error(strerror(errno));
-		}
-		free(cwd);
+		syncState->graphsStream= createGraphsDir(syncState->graphsDir);
 	}
 	else
 	{
@@ -374,84 +349,7 @@ void teardownSyncChain(LttvTracesetContext* const traceSetContext)
 	// Write graphs file
 	if (optionEvalGraphs)
 	{
-		// 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);
-				pos1= ftell(syncState->graphsStream);
-
-				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 \"%1$03d-%2$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)
 		{