X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_chull.c;h=c080235ce009e1713900a6f9bc7541fab306c987;hb=fafb0a2998296c564cbc26c2c0fa5142b181b332;hp=257360183f3a888a7b8e66839c88c69c9a172ef0;hpb=467066eeab8b0a4e5ea07d24f1840310730fd470;p=lttv.git diff --git a/lttv/lttv/sync/event_analysis_chull.c b/lttv/lttv/sync/event_analysis_chull.c index 25736018..c080235c 100644 --- a/lttv/lttv/sync/event_analysis_chull.c +++ b/lttv/lttv/sync/event_analysis_chull.c @@ -33,11 +33,6 @@ #include "event_analysis_chull.h" -#ifndef g_info -#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) -#endif - - typedef enum { LOWER, @@ -77,10 +72,8 @@ static int jointCmp(const Point* const p1, const Point* const p2, const Point* const p3) __attribute__((pure)); static double crossProductK(const Point const* p1, const Point const* p2, const Point const* p3, const Point const* p4) __attribute__((pure)); -static FactorsCHull** calculateAllFactors(SyncState* const syncState); static Factors* calculateFactorsExact(GQueue* const cu, GQueue* const cl, const LineType lineType) __attribute__((pure)); -static void calculateFactorsMiddle(FactorsCHull* factors); static void calculateFactorsFallback(GQueue* const cr, GQueue* const cs, FactorsCHull* const result); static double slope(const Point* const p1, const Point* const p2) @@ -89,8 +82,6 @@ static double intercept(const Point* const p1, const Point* const p2) __attribute__((pure)); static GArray* reduceFactors(SyncState* const syncState, FactorsCHull** allFactors); -static void freeAllFactors(const SyncState* const syncState, FactorsCHull** - const allFactors); static double verticalDistance(Point* p1, Point* p2, Point* const point) __attribute__((pure)); static void floydWarshall(SyncState* const syncState, FactorsCHull** const @@ -111,10 +102,19 @@ static AnalysisModule analysisModuleCHull= { .finalizeAnalysis= &finalizeAnalysisCHull, .printAnalysisStats= &printAnalysisStatsCHull, .graphFunctions= { - .writeTraceTracePlots= &writeAnalysisGraphsPlotsCHull, + .writeTraceTraceForePlots= &writeAnalysisGraphsPlotsCHull, } }; +const char* const approxNames[]= { + [EXACT]= "Exact", + [MIDDLE]= "Middle", + [FALLBACK]= "Fallback", + [INCOMPLETE]= "Incomplete", + [ABSENT]= "Absent", + [SCREWED]= "Screwed", +}; + /* * Analysis module registering function @@ -350,7 +350,7 @@ static void destroyAnalysisCHull(SyncState* const syncState) { if (analysisData->stats->allFactors != NULL) { - freeAllFactors(syncState, analysisData->stats->allFactors); + freeAllFactors(syncState->traceNb, analysisData->stats->allFactors); } free(analysisData->stats); @@ -365,7 +365,7 @@ static void destroyAnalysisCHull(SyncState* const syncState) if (!syncState->stats && analysisData->graphsData->allFactors != NULL) { - freeAllFactors(syncState, analysisData->graphsData->allFactors); + freeAllFactors(syncState->traceNb, analysisData->graphsData->allFactors); } free(analysisData->graphsData); @@ -533,7 +533,7 @@ static GArray* finalizeAnalysisCHull(SyncState* const syncState) } else { - freeAllFactors(syncState, allFactors); + freeAllFactors(syncState->traceNb, allFactors); } return factors; @@ -584,18 +584,19 @@ static void printAnalysisStatsCHull(SyncState* const syncState) FactorsCHull* factorsCHull; factorsCHull= &analysisData->stats->allFactors[j][i]; - printf("\t\t%3d - %-3d: ", i, j); + printf("\t\t%3d - %-3d: %s", i, j, + approxNames[factorsCHull->type]); if (factorsCHull->type == EXACT) { - printf("Exact a0= % 7g a1= 1 %c %7g\n", + printf(" a0= % 7g a1= 1 %c %7g\n", factorsCHull->approx->offset, factorsCHull->approx->drift < 0. ? '-' : '+', fabs(factorsCHull->approx->drift)); } else if (factorsCHull->type == MIDDLE) { - printf("Middle a0= % 7g a1= 1 %c %7g accuracy %7g\n", + printf(" a0= % 7g a1= 1 %c %7g accuracy %7g\n", factorsCHull->approx->offset, factorsCHull->approx->drift - 1. < 0. ? '-' : '+', fabs(factorsCHull->approx->drift - 1.), factorsCHull->accuracy); @@ -608,14 +609,14 @@ static void printAnalysisStatsCHull(SyncState* const syncState) } else if (factorsCHull->type == FALLBACK) { - printf("Fallback a0= % 7g a1= 1 %c %7g error= %7g\n", + printf(" a0= % 7g a1= 1 %c %7g error= %7g\n", factorsCHull->approx->offset, factorsCHull->approx->drift - 1. < 0. ? '-' : '+', fabs(factorsCHull->approx->drift - 1.), factorsCHull->accuracy); } else if (factorsCHull->type == INCOMPLETE) { - printf("Incomplete\n"); + printf("\n"); if (factorsCHull->min->drift != -INFINITY) { @@ -634,7 +635,7 @@ static void printAnalysisStatsCHull(SyncState* const syncState) } else if (factorsCHull->type == SCREWED) { - printf("Screwed\n"); + printf("\n"); if (factorsCHull->min != NULL && factorsCHull->min->drift != -INFINITY) { @@ -653,7 +654,7 @@ static void printAnalysisStatsCHull(SyncState* const syncState) } else if (factorsCHull->type == ABSENT) { - printf("Absent\n"); + printf("\n"); } else { @@ -741,44 +742,19 @@ static double crossProductK(const Point const* p1, const Point const* p2, * Free a container of FactorsCHull * * Args: - * syncState: container for synchronization data. - * allFactors: container of Factors + * traceNb: number of traces + * allFactors: container of FactorsCHull */ -static void freeAllFactors(const SyncState* const syncState, FactorsCHull** - const allFactors) +void freeAllFactors(const unsigned int traceNb, FactorsCHull** const + allFactors) { unsigned int i, j; - for (i= 0; i < syncState->traceNb; i++) + for (i= 0; i < traceNb; i++) { for (j= 0; j <= i; j++) { - FactorsCHull* factorsCHull; - - factorsCHull= &allFactors[i][j]; - if (factorsCHull->type == MIDDLE || factorsCHull->type == - INCOMPLETE || factorsCHull->type == ABSENT) - { - free(factorsCHull->min); - free(factorsCHull->max); - } - else if (factorsCHull->type == SCREWED) - { - if (factorsCHull->min != NULL) - { - free(factorsCHull->min); - } - if (factorsCHull->max != NULL) - { - free(factorsCHull->max); - } - } - - if (factorsCHull->type == EXACT || factorsCHull->type == MIDDLE || - factorsCHull->type == FALLBACK) - { - free(factorsCHull->approx); - } + destroyFactorsCHull(&allFactors[i][j]); } free(allFactors[i]); } @@ -786,6 +762,40 @@ static void freeAllFactors(const SyncState* const syncState, FactorsCHull** } +/* + * Free a FactorsCHull + * + * Args: + * factorsCHull: container of Factors + */ +void destroyFactorsCHull(FactorsCHull* factorsCHull) +{ + if (factorsCHull->type == MIDDLE || factorsCHull->type == + INCOMPLETE || factorsCHull->type == ABSENT) + { + free(factorsCHull->min); + free(factorsCHull->max); + } + else if (factorsCHull->type == SCREWED) + { + if (factorsCHull->min != NULL) + { + free(factorsCHull->min); + } + if (factorsCHull->max != NULL) + { + free(factorsCHull->max); + } + } + + if (factorsCHull->type == EXACT || factorsCHull->type == MIDDLE || + factorsCHull->type == FALLBACK) + { + free(factorsCHull->approx); + } +} + + /* * Analyze the convex hulls to determine the synchronization factors between * each pair of trace. @@ -797,7 +807,7 @@ static void freeAllFactors(const SyncState* const syncState, FactorsCHull** * FactorsCHull*[TraceNum][TraceNum] array. See the documentation for the * member allFactors of AnalysisStatsCHull. */ -static FactorsCHull** calculateAllFactors(SyncState* const syncState) +FactorsCHull** calculateAllFactors(SyncState* const syncState) { unsigned int traceNumA, traceNumB; FactorsCHull** allFactors; @@ -907,7 +917,7 @@ static FactorsCHull** calculateAllFactors(SyncState* const syncState) * Args: * factors: contains the min and max limits, used to store the result */ -static void calculateFactorsMiddle(FactorsCHull* factors) +void calculateFactorsMiddle(FactorsCHull* const factors) { double amin, amax, bmin, bmax, bhat; @@ -1566,7 +1576,7 @@ void writeAnalysisGraphsPlotsCHull(SyncState* const syncState, const unsigned fprintf(syncState->graphsStream, "\t%.2f + %.10f * x " "title \"Middle conversion\" with lines " - "linecolor rgb \"gray60\" linetype 1, \\\n", + "linecolor rgb \"black\" linetype 1, \\\n", factorsCHull->approx->offset, factorsCHull->approx->drift); } else if (factorsCHull->type == FALLBACK)