X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_eval.h;h=05d86601506f24d32539ff2d70851f0158b84e01;hb=2f961b65e3422f23019286e9531b0a40070278ea;hp=b02c77212e42b0436d0f49b1beae6ab9c8c8776c;hpb=e96ed88f09628976d17fa4820b1d6deaf6cedf4a;p=lttv.git

diff --git a/lttv/lttv/sync/event_analysis_eval.h b/lttv/lttv/sync/event_analysis_eval.h
index b02c7721..05d86601 100644
--- a/lttv/lttv/sync/event_analysis_eval.h
+++ b/lttv/lttv/sync/event_analysis_eval.h
@@ -19,7 +19,14 @@
 #ifndef EVENT_ANALYSIS_EVAL_H
 #define EVENT_ANALYSIS_EVAL_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
+#ifdef HAVE_LIBGLPK
+#include <glpk.h>
+#endif
 
 #include "data_structures.h"
 
@@ -49,8 +56,17 @@ typedef struct
 	 * For this table, saddr and daddr are swapped as necessary such that
 	 * saddr < daddr */
 	GHashTable* exchangeRtt;
-} AnalysisStatsEval;
 
+#ifdef HAVE_LIBGLPK
+	/* FactorsCHull** chFactorsArray[traceNum][traceNum]
+	 * FactorsCHull** lpFactorsArray[traceNum][traceNum]
+	 *
+	 * As usual, only the lower triangular part of theses matrixes is
+	 * allocated */
+	FactorsCHull** chFactorsArray;
+	FactorsCHull** lpFactorsArray;
+#endif
+} AnalysisStatsEval;
 
 #define BIN_NB 1001
 struct Bins
@@ -66,7 +82,6 @@ struct Bins
 	uint32_t bin[BIN_NB];
 };
 
-
 typedef struct
 {
 	 /* File pointers to files where "trip times" (message latency) histogram
@@ -86,18 +101,58 @@ typedef struct
 	FILE* hrttPoints;
 
 	struct Bins hrttBins;
-} AnalysisGraphEval;
+} AnalysisHistogramEval;
+
+typedef struct
+{
+	// These are the cpu times of the first and last interactions (message or
+	// broadcast) between two traces. The times are from the trace with the
+	// lowest traceNum.
+	uint64_t min, max;
+} Bounds;
+
+typedef struct
+{
+	/* AnalysisHistogramEval* graphs[RttKey];
+	 * For this table, saddr and daddr are swapped as necessary such that
+	 * saddr < daddr */
+	GHashTable* histograms;
+
+	/* Bounds bounds[traceNum][traceNum]
+	 *
+	 * Only the lower triangular part of the matrix is allocated, that is
+	 * bounds[i][j] where i > j */
+	Bounds** bounds;
+
+#ifdef HAVE_LIBGLPK
+	/* glp_prob* lps[traceNum][traceNum]
+	 *
+	 * Only the lower triangular part of the matrix is allocated, that is
+	 * lps[i][j] where i > j */
+	glp_prob*** lps;
+
+	/* Factors lpFactors[traceNum][traceNum]
+	 *
+	 * Only the lower triangular part of the matrix is allocated, that is
+	 * lpFactorsArray[i][j] where i > j */
+	FactorsCHull** lpFactorsArray;
+#endif
+} AnalysisGraphsEval;
 
 typedef struct
 {
 	// double* rttInfo[RttKey]
 	GHashTable* rttInfo;
 
+	/* The convex hull analysis is encapsulated and messages are passed to it
+	 * so that it builds the convex hulls. These are reused in the linear
+	 * program. */
+	struct _SyncState* chullSS;
+
 	AnalysisStatsEval* stats;
-	/* AnalysisGraphsEval* graphs[RttKey];
-	 * For this table, saddr and daddr are swapped as necessary such that
-	 * saddr < daddr */
-	GHashTable* graphs;
+	AnalysisGraphsEval* graphs;
 } AnalysisDataEval;
 
+void registerAnalysisEval();
+
 #endif