Make the accuracy area easier to see on the broadcast graphs

Replots the contour of the area over the broadcast points.

Signed-off-by: Benjamin Poirier <benjamin.poirier@polymtl.ca>

diff --git a/lttv/lttv/sync/event_analysis_eval.c b/lttv/lttv/sync/event_analysis_eval.c
index 63dd0e876fa025454c9781797fd67cead5d90016..3c1b110aeeee1e7f766cd7805952b60694c90566 100644 (file)
--- a/lttv/lttv/sync/event_analysis_eval.c
+++ b/lttv/lttv/sync/event_analysis_eval.c
@@ -68,8 +68,10 @@ static void analyzeBroadcastEval(SyncState* const syncState, Broadcast* const
        broadcast);
 static GArray* finalizeAnalysisEval(SyncState* const syncState);
 static void printAnalysisStatsEval(SyncState* const syncState);
-static void writeAnalysisTraceTimePlotsEval(SyncState* const syncState, const
-       unsigned int i, const unsigned int j);
+static void writeAnalysisTraceTimeBackPlotsEval(SyncState* const syncState,
+       const unsigned int i, const unsigned int j);
+static void writeAnalysisTraceTimeForePlotsEval(SyncState* const syncState,
+       const unsigned int i, const unsigned int j);
 static void writeAnalysisTraceTraceBackPlotsEval(SyncState* const syncState,
        const unsigned int i, const unsigned int j);
 static void writeAnalysisTraceTraceForePlotsEval(SyncState* const syncState,
@@ -138,7 +140,8 @@ static AnalysisModule analysisModuleEval= {
        .finalizeAnalysis= &finalizeAnalysisEval,
        .printAnalysisStats= &printAnalysisStatsEval,
        .graphFunctions= {
-               .writeTraceTimeBackPlots= &writeAnalysisTraceTimePlotsEval,
+               .writeTraceTimeBackPlots= &writeAnalysisTraceTimeBackPlotsEval,
+               .writeTraceTimeForePlots= &writeAnalysisTraceTimeForePlotsEval,
                .writeTraceTraceBackPlots= &writeAnalysisTraceTraceBackPlotsEval,
                .writeTraceTraceForePlots= &writeAnalysisTraceTraceForePlotsEval,
        }
@@ -1807,24 +1810,18 @@ static void finalizeAnalysisEvalLP(SyncState* const syncState)
  * approach. Write the neccessary data files and plot lines in the gnuplot
  * script.
  *
- * 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 nothing is
+ * actually produced.
  *
  * Args:
  *   syncState:    container for synchronization data
  *   i:            first trace number
  *   j:            second trace number, garanteed to be larger than i
  */
-#ifndef HAVE_LIBGLPK
-static inline void writeAccuracyGraphs(SyncState* const syncState, const
-       unsigned int i, const unsigned int j)
-{
-}
-#else
-static void writeAccuracyGraphs(SyncState* const syncState, const unsigned int
-       i, const unsigned int j)
+static void writeAnalysisTraceTimeBackPlotsEval(SyncState* const syncState,
+       const unsigned int i, const unsigned int j)
 {
+#ifdef HAVE_LIBGLPK
        unsigned int it;
        AnalysisDataEval* analysisData= syncState->analysisData;
        AnalysisGraphsEval* graphs= analysisData->graphs;
@@ -1934,34 +1931,40 @@ static void writeAccuracyGraphs(SyncState* const syncState, const unsigned int
                                "linecolor rgb \"black\" fill solid 0.25 noborder, \\\n", i,
                                j);
        }
-}
 #endif
+}
 
 
 /*
  * Write the analysis-specific graph lines in the gnuplot script.
  *
+ * When the solver library, glpk, is not available at build time nothing is
+ * actually produced.
+ *
  * Args:
  *   syncState:    container for synchronization data
  *   i:            first trace number
  *   j:            second trace number, garanteed to be larger than i
  */
-static void writeAnalysisTraceTimePlotsEval(SyncState* const syncState, const
-       unsigned int i, const unsigned int j)
+static void writeAnalysisTraceTimeForePlotsEval(SyncState* const syncState,
+       const unsigned int i, const unsigned int j)
 {
-       AnalysisDataEval* analysisData= syncState->analysisData;
-       AnalysisGraphsEval* graphs= analysisData->graphs;
-       GQueue*** hullArray= ((AnalysisDataCHull*)
-               analysisData->chullSS->analysisData)->hullArray;
-
-       printf("Between %u and %u:\n", i, j);
-       printf("\tbounds min %llu max %llu\n", graphs->bounds[j][i].min,
-               graphs->bounds[j][i].max);
-       printf("\tnumber of points in lower half-hull %u upper half-hull %u\n",
-               g_queue_get_length(hullArray[j][i]),
-               g_queue_get_length(hullArray[i][j]));
-
-       writeAccuracyGraphs(syncState, i, j);
+#ifdef HAVE_LIBGLPK
+       if (((AnalysisDataEval*)
+                       syncState->analysisData)->graphs->lpFactorsArray[j][i].type ==
+               MIDDLE)
+       {
+               fprintf(syncState->graphsStream,
+                       "\t\"analysis_eval_accuracy-%1$03u_and_%2$03u.data\" "
+                               "using 1:(($3 - $2) / clock_freq_%2$u) notitle "
+                               "with lines linewidth 2 linetype 1 "
+                               "linecolor rgb \"gray60\", \\\n"
+                       "\t\"analysis_eval_accuracy-%1$03u_and_%2$03u.data\" "
+                               "using 1:(($4 - $2) / clock_freq_%2$u) notitle "
+                               "with lines linewidth 2 linetype 1 "
+                               "linecolor rgb \"gray60\", \\\n", i, j);
+       }
+#endif
 }
 
 

diff --git a/lttv/lttv/sync/event_matching_broadcast.c b/lttv/lttv/sync/event_matching_broadcast.c
index ca5375b794bb618e0c4ce90d3d98d20d8012f0d8..442588341237124371195e5b376cbad6a4533e6d 100644 (file)
--- a/lttv/lttv/sync/event_matching_broadcast.c
+++ b/lttv/lttv/sync/event_matching_broadcast.c
@@ -494,7 +494,7 @@ static void writeMatchingGraphsPlotsBroadcast(SyncState* const syncState, const
        {
                fprintf(syncState->graphsStream,
                        "\t\"matching_broadcast-%03d_and_%03d.data\" "
-                               "title \"Broadcast delays\" with points "
+                               "title \"Broadcast differential delays\" with points "
                                "linecolor rgb \"black\" pointtype 6 pointsize 2, \\\n", i,
                                j);
        }