X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_eval.h;h=c0b02d0daa53d5277b8050000e0d1a1f4d71c127;hb=66eaf2eba602c331d08677dbb59ec3f9e40f0ccc;hp=d30fb1ef59883bad4d5b8789844909b1bba316dc;hpb=e072e1abc02d780d84664fcb2c971eb5a317f664;p=lttv.git

diff --git a/lttv/lttv/sync/event_analysis_eval.h b/lttv/lttv/sync/event_analysis_eval.h
index d30fb1ef..c0b02d0d 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,13 +82,12 @@ struct Bins
 	uint32_t bin[BIN_NB];
 };
 
-
 typedef struct
 {
 	 /* File pointers to files where "trip times" (message latency) histogram
-	  * values are outputted. Each host-pair has two files, one for each
-	  * message direction. As for traces, the host with the smallest address
-	  * is considered to be the reference for the direction of messages (ie.
+	  * values are output. Each host-pair has two files, one for each message
+	  * direction. As for traces, the host with the smallest address is
+	  * considered to be the reference for the direction of messages (ie.
 	  * messages from the host with the lowest address to the host with the
 	  * largest address are "sent"). */
 	FILE* ttSendPoints;
@@ -82,22 +97,60 @@ typedef struct
 	struct Bins ttRecvBins;
 
 	/* File pointers to files where half round trip times (evaluated from
-	 * exchanges) histogram values are outputted. */
+	 * exchanges) histogram values are output. */
 	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;
 
 #endif