changeset 64c3b989238c in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=64c3b989238c
description:
stats: fancy is a bad name
diffstat:
4 files changed, 26 insertions(+), 24 deletions(-)
src/base/statistics.hh | 32 ++++++++++++++++----------------
src/base/stats/info.hh | 6 ++++--
src/base/stats/mysql.cc | 6 +++---
src/base/stats/text.cc | 6 +++---
diffs (204 lines):
diff -r 40e5a315bded -r 64c3b989238c src/base/statistics.hh
--- a/src/base/statistics.hh Wed May 13 07:18:01 2009 -0700
+++ b/src/base/statistics.hh Wed May 13 07:18:02 2009 -0700
@@ -1271,7 +1271,7 @@
/** The parameters for a distribution stat. */
struct Params : public DistParams
{
- Params() : DistParams(false) {}
+ Params() : DistParams(Dist) {}
};
private:
@@ -1405,12 +1405,12 @@
* Templatized storage and interface for a distribution that calculates mean
* and variance.
*/
-class FancyStor
+class SampleStor
{
public:
struct Params : public DistParams
{
- Params() : DistParams(true) {}
+ Params() : DistParams(Deviation) {}
};
private:
@@ -1425,7 +1425,7 @@
/**
* Create and initialize this storage.
*/
- FancyStor(Info *info)
+ SampleStor(Info *info)
: sum(Counter()), squares(Counter()), samples(Counter())
{ }
@@ -1481,12 +1481,12 @@
* Templatized storage for distribution that calculates per tick mean and
* variance.
*/
-class AvgFancy
+class AvgSampleStor
{
public:
struct Params : public DistParams
{
- Params() : DistParams(true) {}
+ Params() : DistParams(Deviation) {}
};
private:
@@ -1499,7 +1499,7 @@
/**
* Create and initialize this storage.
*/
- AvgFancy(Info *info)
+ AvgSampleStor(Info *info)
: sum(Counter()), squares(Counter())
{}
@@ -2273,9 +2273,9 @@
/**
* Calculates the mean and variance of all the samples.
- * @sa Stat, DistBase, FancyStor
+ * @sa DistBase, SampleStor
*/
-class StandardDeviation : public DistBase<StandardDeviation, FancyStor>
+class StandardDeviation : public DistBase<StandardDeviation, SampleStor>
{
public:
/**
@@ -2289,9 +2289,9 @@
/**
* Calculates the per tick mean and variance of the samples.
- * @sa Stat, DistBase, AvgFancy
+ * @sa DistBase, AvgSampleStor
*/
-class AverageDeviation : public DistBase<AverageDeviation, AvgFancy>
+class AverageDeviation : public DistBase<AverageDeviation, AvgSampleStor>
{
public:
/**
@@ -2305,7 +2305,7 @@
/**
* A vector of distributions.
- * @sa Stat, VectorDistBase, DistStor
+ * @sa VectorDistBase, DistStor
*/
class VectorDistribution : public VectorDistBase<VectorDistribution, DistStor>
{
@@ -2334,10 +2334,10 @@
/**
* This is a vector of StandardDeviation stats.
- * @sa Stat, VectorDistBase, FancyStor
+ * @sa VectorDistBase, SampleStor
*/
class VectorStandardDeviation
- : public VectorDistBase<VectorStandardDeviation, FancyStor>
+ : public VectorDistBase<VectorStandardDeviation, SampleStor>
{
public:
/**
@@ -2355,10 +2355,10 @@
/**
* This is a vector of AverageDeviation stats.
- * @sa Stat, VectorDistBase, AvgFancy
+ * @sa VectorDistBase, AvgSampleStor
*/
class VectorAverageDeviation
- : public VectorDistBase<VectorAverageDeviation, AvgFancy>
+ : public VectorDistBase<VectorAverageDeviation, AvgSampleStor>
{
public:
/**
diff -r 40e5a315bded -r 64c3b989238c src/base/stats/info.hh
--- a/src/base/stats/info.hh Wed May 13 07:18:01 2009 -0700
+++ b/src/base/stats/info.hh Wed May 13 07:18:02 2009 -0700
@@ -180,9 +180,11 @@
Counter samples;
};
+enum DistType { Deviation, Dist };
+
struct DistParams : public StorageParams
{
- const bool fancy;
+ const DistType type;
/** The minimum value to track. */
Counter min;
@@ -193,7 +195,7 @@
/** The number of buckets. Equal to (max-min)/bucket_size. */
size_type buckets;
- explicit DistParams(bool f) : fancy(f) {}
+ explicit DistParams(DistType t) : type(t) {}
};
class DistInfo : public Info
diff -r 40e5a315bded -r 64c3b989238c src/base/stats/mysql.cc
--- a/src/base/stats/mysql.cc Wed May 13 07:18:01 2009 -0700
+++ b/src/base/stats/mysql.cc Wed May 13 07:18:02 2009 -0700
@@ -585,7 +585,7 @@
const DistParams *params =
safe_cast<const DistParams *>(info.storageParams);
- if (!params->fancy) {
+ if (params->type == Dist) {
stat.size = params->buckets;
stat.min = params->min;
stat.max = params->max;
@@ -602,7 +602,7 @@
const DistParams *params =
safe_cast<const DistParams *>(info.storageParams);
- if (!params->fancy) {
+ if (params->type == Dist) {
stat.size = params->buckets;
stat.min = params->min;
stat.max = params->max;
@@ -789,7 +789,7 @@
newdata.data = data.samples;
newdata.insert();
- if (data.samples && !params->fancy) {
+ if (data.samples && params->type == Dist) {
newdata.x = db_min_val;
newdata.data = data.min_val;
newdata.insert();
diff -r 40e5a315bded -r 64c3b989238c src/base/stats/text.cc
--- a/src/base/stats/text.cc Wed May 13 07:18:01 2009 -0700
+++ b/src/base/stats/text.cc Wed May 13 07:18:02 2009 -0700
@@ -310,7 +310,7 @@
Counter max;
Counter bucket_size;
size_type size;
- bool fancy;
+ DistType type;
const DistData &data;
@@ -347,7 +347,7 @@
precision = info.precision;
descriptions = text->descriptions;
- fancy = params->fancy;
+ type = params->type;
min = params->min;
max = params->max;
bucket_size = params->bucket_size;
@@ -383,7 +383,7 @@
print.value = stdev;
print(stream);
- if (fancy)
+ if (type == Deviation)
return;
assert(size == data.cvec.size());
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
