X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fsync_chain_lttv.c;h=dc207babfb6bb949c46764c0fb4dce53787c874b;hb=482fe4814d81bd6109f8ddcada7784b288bfabda;hp=58ef078df37e4eca867023816bfbfabe53f737d4;hpb=1d597550379cb00832f73bd5402918fd6ed2e9df;p=lttv.git

diff --git a/lttv/lttv/sync/sync_chain_lttv.c b/lttv/lttv/sync/sync_chain_lttv.c
index 58ef078d..dc207bab 100644
--- a/lttv/lttv/sync/sync_chain_lttv.c
+++ b/lttv/lttv/sync/sync_chain_lttv.c
@@ -34,33 +34,28 @@
 #include <lttv/option.h>
 
 #include "sync_chain.h"
+#include "sync_chain_lttv.h"
 
 
 static void init();
 static void destroy();
 
-static void gfAppendAnalysisName(gpointer data, gpointer user_data);
 static void gfAddModuleOption(gpointer data, gpointer user_data);
 static void gfRemoveModuleOption(gpointer data, gpointer user_data);
 
-static char* argHelpNone= "none";
 static ModuleOption optionSync= {
 	.longName= "sync",
 	.hasArg= NO_ARG,
-	{.present= false},
 	.optionHelp= "synchronize the time between the traces",
 };
-static char graphsDir[20];
 static ModuleOption optionSyncStats= {
 	.longName= "sync-stats",
 	.hasArg= NO_ARG,
-	{.present= false},
 	.optionHelp= "print statistics about the time synchronization",
 };
 static ModuleOption optionSyncNull= {
 	.longName= "sync-null",
 	.hasArg= NO_ARG,
-	{.present= false},
 	.optionHelp= "read the events but do not perform any processing",
 };
 static GString* analysisModulesNames;
@@ -72,15 +67,16 @@ static ModuleOption optionSyncAnalysis= {
 static ModuleOption optionSyncGraphs= {
 	.longName= "sync-graphs",
 	.hasArg= NO_ARG,
-	{.present= false},
 	.optionHelp= "output gnuplot graph showing synchronization points",
 };
+static char graphsDir[20];
 static ModuleOption optionSyncGraphsDir= {
 	.longName= "sync-graphs-dir",
 	.hasArg= REQUIRED_ARG,
 	.optionHelp= "specify the directory where to store the graphs",
 };
 
+
 /*
  * Module init function
  *
@@ -99,7 +95,7 @@ static void init()
 	g_debug("Sync init");
 
 	g_assert(g_queue_get_length(&analysisModules) > 0);
-	optionSyncAnalysis.arg = ((AnalysisModule*)
+	optionSyncAnalysis.arg= ((AnalysisModule*)
 		g_queue_peek_head(&analysisModules))->name;
 	analysisModulesNames= g_string_new("");
 	g_queue_foreach(&analysisModules, &gfAppendAnalysisName,
@@ -124,7 +120,6 @@ static void init()
 	g_queue_push_head(&moduleOptions, &optionSync);
 
 	g_queue_foreach(&moduleOptions, &gfAddModuleOption, NULL);
-
 }
 
 
@@ -152,8 +147,11 @@ static void destroy()
  *
  * Args:
  *   traceSetContext: traceset
+ *
+ * Returns:
+ *   false if synchronization was not performed, true otherwise
  */
-void syncTraceset(LttvTracesetContext* const traceSetContext)
+bool syncTraceset(LttvTracesetContext* const traceSetContext)
 {
 	SyncState* syncState;
 	struct timeval startTime, endTime;
@@ -165,7 +163,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	if (!optionSync.present)
 	{
 		g_debug("Not synchronizing traceset because option is disabled");
-		return;
+		return false;
 	}
 
 	if (optionSyncStats.present)
@@ -176,7 +174,6 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 
 	// Initialize data structures
 	syncState= malloc(sizeof(SyncState));
-	syncState->traceNb= lttv_traceset_number(traceSetContext->ts);
 
 	if (optionSyncStats.present)
 	{
@@ -187,7 +184,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		syncState->stats= false;
 	}
 
-	if (optionSyncGraphs.present)
+	if (!optionSyncNull.present && optionSyncGraphs.present)
 	{
 		// Create the graph directory right away in case the module initialization
 		// functions have something to write in it.
@@ -232,12 +229,12 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		g_error("Analysis module '%s' not found", optionSyncAnalysis.arg);
 	}
 
+	syncState->processingModule->initProcessing(syncState, traceSetContext);
 	if (!optionSyncNull.present)
 	{
-		syncState->analysisModule->initAnalysis(syncState);
 		syncState->matchingModule->initMatching(syncState);
+		syncState->analysisModule->initAnalysis(syncState);
 	}
-	syncState->processingModule->initProcessing(syncState, traceSetContext);
 
 	// Process traceset
 	lttv_process_traceset_seek_time(traceSetContext, ltt_time_zero);
@@ -248,7 +245,7 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 	syncState->processingModule->finalizeProcessing(syncState);
 
 	// Write graphs file
-	if (optionSyncGraphs.present)
+	if (!optionSyncNull.present && optionSyncGraphs.present)
 	{
 		writeGraphsScript(syncState);
 
@@ -258,21 +255,10 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		}
 	}
 
-	if (syncState->processingModule->printProcessingStats != NULL)
-	{
-		syncState->processingModule->printProcessingStats(syncState);
-	}
-	if (syncState->matchingModule->printMatchingStats != NULL)
-	{
-		syncState->matchingModule->printMatchingStats(syncState);
-	}
-	if (syncState->analysisModule->printAnalysisStats != NULL)
+	if (!optionSyncNull.present && optionSyncStats.present)
 	{
-		syncState->analysisModule->printAnalysisStats(syncState);
-	}
+		printStats(syncState);
 
-	if (optionSyncStats.present)
-	{
 		printf("Resulting synchronization factors:\n");
 		for (i= 0; i < syncState->traceNb; i++)
 		{
@@ -316,22 +302,8 @@ void syncTraceset(LttvTracesetContext* const traceSetContext)
 		printf("\tsystem time: %ld.%06ld\n", endUsage.ru_stime.tv_sec,
 			endUsage.ru_stime.tv_usec);
 	}
-}
-
 
-/*
- * A GFunc for g_queue_foreach()
- *
- * Concatenate analysis module names.
- *
- * Args:
- *   data:         AnalysisModule*
- *   user_data:    GString*, concatenated names
- */
-static void gfAppendAnalysisName(gpointer data, gpointer user_data)
-{
-	g_string_append((GString*) user_data, ((AnalysisModule*) data)->name);
-	g_string_append((GString*) user_data, ", ");
+	return true;
 }
 
 
@@ -344,18 +316,33 @@ static void gfAppendAnalysisName(gpointer data, gpointer user_data)
  */
 static void gfAddModuleOption(gpointer data, gpointer user_data)
 {
-	ModuleOption* option;
+	ModuleOption* option= data;
 	LttvOptionType conversion[]= {
 		[NO_ARG]= LTTV_OPT_NONE,
+		[OPTIONAL_ARG]= LTTV_OPT_NONE,
 		[REQUIRED_ARG]= LTTV_OPT_STRING,
 	};
+	size_t fieldOffset[]= {
+		[NO_ARG]= offsetof(ModuleOption, present),
+		[REQUIRED_ARG]= offsetof(ModuleOption, arg),
+	};
+	static const char* argHelpNone= "none";
 
 	g_assert_cmpuint(sizeof(conversion) / sizeof(*conversion), ==,
 		HAS_ARG_COUNT);
-	option= (ModuleOption*) data;
-	lttv_option_add(option->longName, '\0', option->optionHelp,
-		option->argHelp ? option->argHelp : argHelpNone,
-		conversion[option->hasArg], &option->arg, NULL, NULL);
+	if (option->hasArg == OPTIONAL_ARG)
+	{
+		g_warning("Parameters with optional arguments not supported by the "
+			"lttv option scheme, parameter '%s' will not be available",
+			option->longName);
+	}
+	else
+	{
+		lttv_option_add(option->longName, '\0', option->optionHelp,
+			option->argHelp ? option->argHelp : argHelpNone,
+			conversion[option->hasArg], (void*) option + fieldOffset[option->hasArg],
+			NULL, NULL);
+	}
 }