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

diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c
index 9652f346..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;
-	FILE* graphsStream;
+	unsigned int i;
 	int retval;
 
 	if (!optionSync.present)
@@ -198,39 +198,14 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	}
 
 	if (optionSyncGraphs.present)
-	{
-		syncState->graphs= optionSyncGraphsDir.arg;
-	}
-	else
-	{
-		syncState->graphs= NULL;
-	}
-
-	// Identify and initialize processing module
-	syncState->processingData= NULL;
-	if (optionSyncNull.present)
-	{
-		result= g_queue_find_custom(&processingModules, "LTTV-null",
-			&gcfCompareProcessing);
-	}
-	else
-	{
-		result= g_queue_find_custom(&processingModules, "LTTV-standard",
-			&gcfCompareProcessing);
-	}
-	g_assert(result != NULL);
-	syncState->processingModule= (ProcessingModule*) result->data;
-
-	graphsStream= NULL;
-	if (syncState->graphs &&
-		syncState->processingModule->writeProcessingGraphsPlots != NULL)
 	{
 		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
@@ -238,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\n");
+
 		retval= chdir(cwd);
 		if (retval == -1)
 		{
@@ -250,12 +229,33 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		}
 		free(cwd);
 	}
+	else
+	{
+		syncState->graphsStream= NULL;
+		syncState->graphsDir= NULL;
+	}
 
-	// Identify matching and analysis modules
+	// Identify and initialize modules
+	syncState->processingData= NULL;
+	if (optionSyncNull.present)
+	{
+		result= g_queue_find_custom(&processingModules, "LTTV-null",
+			&gcfCompareProcessing);
+	}
+	else
+	{
+		result= g_queue_find_custom(&processingModules, "LTTV-standard",
+			&gcfCompareProcessing);
+	}
+	g_assert(result != NULL);
+	syncState->processingModule= (ProcessingModule*) result->data;
+
+	syncState->matchingData= NULL;
 	result= g_queue_find_custom(&matchingModules, "TCP", &gcfCompareMatching);
 	g_assert(result != NULL);
 	syncState->matchingModule= (MatchingModule*) result->data;
 
+	syncState->analysisData= NULL;
 	result= g_queue_find_custom(&analysisModules, optionSyncAnalysis.arg,
 		&gcfCompareAnalysis);
 	if (result != NULL)
@@ -267,16 +267,12 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		g_error("Analysis module '%s' not found", optionSyncAnalysis.arg);
 	}
 
-	syncState->processingModule->initProcessing(syncState, traceSetContext);
-
-	syncState->matchingData= NULL;
-	syncState->analysisData= NULL;
-
 	if (!optionSyncNull.present)
 	{
-		syncState->matchingModule->initMatching(syncState);
 		syncState->analysisModule->initAnalysis(syncState);
+		syncState->matchingModule->initMatching(syncState);
 	}
+	syncState->processingModule->initProcessing(syncState, traceSetContext);
 
 	// Process traceset
 	lttv_process_traceset_seek_time(traceSetContext, ltt_time_zero);
@@ -287,58 +283,11 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	syncState->processingModule->finalizeProcessing(syncState);
 
 	// Write graphs file
-	if (graphsStream != NULL)
+	if (optionSyncGraphs.present)
 	{
-		unsigned int i, j;
+		writeGraphsScript(syncState);
 
-		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;
-
-				fprintf(graphsStream,
-					"\nset output \"%03d-%03d.eps\"\n"
-					"plot \\\n", i, j);
-
-				syncState->processingModule->writeProcessingGraphsPlots(graphsStream,
-					syncState, i, j);
-
-				// Remove the ", \\\n" from the last graph plot line
-				fflush(graphsStream);
-				pos= ftell(graphsStream);
-				if (ftruncate(fileno(graphsStream), pos - 4) == -1)
-				{
-					g_error(strerror(errno));
-				}
-				if (fseek(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);
-
-				syncState->processingModule->writeProcessingGraphsOptions(graphsStream,
-					syncState, i, j);
-
-				fprintf(graphsStream,
-					"replot\n");
-			}
-		}
-
-		if (fclose(graphsStream) != 0)
+		if (fclose(syncState->graphsStream) != 0)
 		{
 			g_error(strerror(errno));
 		}
@@ -348,6 +297,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)