X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_eval.c;h=0c0b7b51a80e86fc3cb48cbf104e9bb14aca369c;hb=05a840dfd988f09861bc96c829f68d3c00efd953;hp=29b1b4493009eabdb2552174a81d289689e1462b;hpb=1d597550379cb00832f73bd5402918fd6ed2e9df;p=lttv.git

diff --git a/lttv/lttv/sync/event_analysis_eval.c b/lttv/lttv/sync/event_analysis_eval.c
index 29b1b449..0c0b7b51 100644
--- a/lttv/lttv/sync/event_analysis_eval.c
+++ b/lttv/lttv/sync/event_analysis_eval.c
@@ -111,6 +111,7 @@ static void writeHistogram(FILE* graphsStream, const struct RttKey* rttKey,
 static void updateBounds(Bounds** const bounds, Event* const e1, Event* const
 	e2);
 
+static void finalizeAnalysisEvalLP(SyncState* const syncState);
 // The next group of functions is only needed when computing synchronization
 // accuracy.
 #ifdef HAVE_LIBGLPK
@@ -121,9 +122,6 @@ static Factors* calculateFactors(glp_prob* const lp, const int direction);
 static void calculateCompleteFactors(glp_prob* const lp, FactorsCHull*
 	factors);
 static FactorsCHull** createAllFactors(const unsigned int traceNb);
-static inline void finalizeAnalysisEvalLP(SyncState* const syncState);
-#else
-static void finalizeAnalysisEvalLP(SyncState* const syncState);
 #endif
 
 
@@ -150,7 +148,6 @@ static AnalysisModule analysisModuleEval= {
 static ModuleOption optionEvalRttFile= {
 	.longName= "eval-rtt-file",
 	.hasArg= REQUIRED_ARG,
-	{.arg= NULL},
 	.optionHelp= "specify the file containing RTT information",
 	.argHelp= "FILE",
 };
@@ -532,7 +529,7 @@ static void writeHistogram(FILE* graphsStream, const struct RttKey* rttKey,
  */
 static void destroyAnalysisEval(SyncState* const syncState)
 {
-	unsigned int i, j;
+	unsigned int i;
 	AnalysisDataEval* analysisData;
 
 	analysisData= (AnalysisDataEval*) syncState->analysisData;
@@ -582,10 +579,12 @@ static void destroyAnalysisEval(SyncState* const syncState)
 #ifdef HAVE_LIBGLPK
 		for (i= 0; i < syncState->traceNb; i++)
 		{
+			unsigned int j;
+
 			for (j= 0; j < i; j++)
 			{
 				// There seems to be a memory leak in glpk, valgrind reports a
-				// loss even if the problem is deleted
+				// loss (reachable) even if the problem is deleted
 				glp_delete_prob(graphs->lps[i][j]);
 			}
 			free(graphs->lps[i]);
@@ -986,6 +985,7 @@ static void printAnalysisStatsEval(SyncState* const syncState)
 	g_hash_table_foreach(analysisData->stats->exchangeRtt,
 		&ghfPrintExchangeRtt, analysisData->rttInfo);
 
+#ifdef HAVE_LIBGLPK
 	printf("\tConvex hull factors comparisons:\n"
 		"\t\tTrace pair  Factors type  Differences (lp - chull)\n"
 		"\t\t                          a0                    a1\n"
@@ -1022,6 +1022,7 @@ static void printAnalysisStatsEval(SyncState* const syncState)
 			}
 		}
 	}
+#endif
 }
 
 
@@ -1725,37 +1726,36 @@ static FactorsCHull** createAllFactors(const unsigned int traceNb)
  * Compute synchronization factors using a linear programming approach.
  * Compute the factors using analysis_chull. Compare the two.
  *
- * There are two definitions of this function. The empty one is used when the
- * solver library, glpk, is not available at build time. In that case, nothing
- * is actually produced.
+ * When the solver library, glpk, is not available at build time, only compute
+ * the factors using analysis_chull. This is to make sure that module runs its
+ * finalize function so that its graph functions can be called later.
  *
  * Args:
  *   syncState:    container for synchronization data
  */
-#ifndef HAVE_LIBGLPK
-static inline void finalizeAnalysisEvalLP(SyncState* const syncState)
-{
-}
-#else
 static void finalizeAnalysisEvalLP(SyncState* const syncState)
 {
-	unsigned int i, j;
 	AnalysisDataEval* analysisData= syncState->analysisData;
+#ifdef HAVE_LIBGLPK
+	unsigned int i, j;
 	AnalysisDataCHull* chAnalysisData= analysisData->chullSS->analysisData;
-	FactorsCHull** lpFactorsArray= createAllFactors(syncState->traceNb);
-	FactorsCHull* lpFactors;
+	FactorsCHull** lpFactorsArray;
 
 	if (!syncState->stats && !syncState->graphsStream)
 	{
 		return;
 	}
 
+	/* Because of matching_distributor, this analysis may be called twice.
+	 * Only run it once */
 	if ((syncState->graphsStream && analysisData->graphs->lps != NULL) ||
 		(syncState->stats && analysisData->stats->chFactorsArray != NULL))
 	{
 		return;
 	}
 
+	lpFactorsArray= createAllFactors(syncState->traceNb);
+
 	if (syncState->stats)
 	{
 		analysisData->stats->chFactorsArray=
@@ -1795,15 +1795,14 @@ static void finalizeAnalysisEvalLP(SyncState* const syncState)
 			else
 			{
 				glp_delete_prob(lp);
-				destroyFactorsCHull(lpFactors);
 			}
 		}
 	}
+#endif
 
 	g_array_free(analysisData->chullSS->analysisModule->finalizeAnalysis(analysisData->chullSS),
 		TRUE);
 }
-#endif
 
 
 /*