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
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
static ModuleOption optionEvalRttFile= {
.longName= "eval-rtt-file",
.hasArg= REQUIRED_ARG,
- {.arg= NULL},
.optionHelp= "specify the file containing RTT information",
.argHelp= "FILE",
};
convertIP(saddr, rttKey->saddr);
convertIP(daddr, rttKey->daddr);
- cwd= changeToGraphDir(graphsDir);
+ cwd= changeToGraphsDir(graphsDir);
for (i= 0; i < sizeof(loopValues) / sizeof(*loopValues); i++)
{
*/
static void destroyAnalysisEval(SyncState* const syncState)
{
- unsigned int i, j;
+ unsigned int i;
AnalysisDataEval* analysisData;
analysisData= (AnalysisDataEval*) syncState->analysisData;
#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]);
message)
{
AnalysisDataEval* analysisData= syncState->analysisData;
- MessageStats* messageStats=
- &analysisData->stats->messageStats[message->outE->traceNum][message->inE->traceNum];
+ MessageStats* messageStats;
double* rtt;
double tt;
struct RttKey rttKey;
if (syncState->stats)
{
+ messageStats=
+ &analysisData->stats->messageStats[message->outE->traceNum][message->inE->traceNum];
messageStats->total++;
}
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"
}
}
}
+#endif
}
* 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=
else
{
glp_delete_prob(lp);
- destroyFactorsCHull(lpFactors);
}
}
}
+#endif
g_array_free(analysisData->chullSS->analysisModule->finalizeAnalysis(analysisData->chullSS),
TRUE);
}
-#endif
/*
snprintf(fileName, 40, "analysis_eval_accuracy-%03u_and_%03u.data", i, j);
fileName[sizeof(fileName) - 1]= '\0';
- cwd= changeToGraphDir(syncState->graphsDir);
+ cwd= changeToGraphsDir(syncState->graphsDir);
if ((fp= fopen(fileName, "w")) == NULL)
{