X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttv%2Flttv%2Fsync%2Fevent_analysis_eval.h;h=736dc8b03d089a99df9242460ed91a284995daa0;hb=1111bb0f69e3c01c9264b19cbc7d2a8a02eeb569;hp=c0b02d0daa53d5277b8050000e0d1a1f4d71c127;hpb=66eaf2eba602c331d08677dbb59ec3f9e40f0ccc;p=lttv.git

diff --git a/lttv/lttv/sync/event_analysis_eval.h b/lttv/lttv/sync/event_analysis_eval.h
index c0b02d0d..736dc8b0 100644
--- a/lttv/lttv/sync/event_analysis_eval.h
+++ b/lttv/lttv/sync/event_analysis_eval.h
@@ -1,19 +1,18 @@
 /* This file is part of the Linux Trace Toolkit viewer
- * Copyright (C) 2009 Benjamin Poirier <benjamin.poirier@polymtl.ca>
+ * Copyright (C) 2009, 2010 Benjamin Poirier <benjamin.poirier@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License Version 2 as
- * published by the Free Software Foundation;
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or (at
+ * your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EVENT_ANALYSIS_EVAL_H
@@ -24,9 +23,6 @@
 #endif
 
 #include <glib.h>
-#ifdef HAVE_LIBGLPK
-#include <glpk.h>
-#endif
 
 #include "data_structures.h"
 
@@ -46,8 +42,14 @@ typedef struct
 
 typedef struct
 {
-	double broadcastDiffSum;
 	unsigned int broadcastNb;
+	double broadcastStdevSum;
+
+	unsigned int broadcastPairNb;
+	double broadcastRangeMin;
+	double broadcastRangeMax;
+	double broadcastSum;
+	double broadcastSumSquares;
 
 	// MessageStats messageStats[traceNb][traceNb]
 	MessageStats** messageStats;
@@ -56,16 +58,6 @@ typedef struct
 	 * For this table, saddr and daddr are swapped as necessary such that
 	 * saddr < daddr */
 	GHashTable* exchangeRtt;
-
-#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
@@ -124,19 +116,8 @@ typedef struct
 	 * 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
+	// Extra SyncState used to overlay the chull-calculated accuracy region
+	SyncState* chullSS;
 } AnalysisGraphsEval;
 
 typedef struct
@@ -144,13 +125,10 @@ 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;
 } AnalysisDataEval;
 
+void registerAnalysisEval();
+
 #endif