changeset 471090ec173e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=471090ec173e
description:
stats: stick the distribution's fancy parameter into the parameters
structure.
diffstat:
3 files changed, 22 insertions(+), 26 deletions(-)
src/base/statistics.hh | 23 ++++++++++-------------
src/base/stats/mysql.cc | 8 ++++----
src/base/stats/text.cc | 17 ++++++++---------
diffs (130 lines):
diff -r 7674070ccc92 -r 471090ec173e src/base/statistics.hh
--- a/src/base/statistics.hh Thu Mar 05 19:09:53 2009 -0800
+++ b/src/base/statistics.hh Thu Mar 05 19:09:53 2009 -0800
@@ -257,8 +257,6 @@
Counter sum;
Counter squares;
Counter samples;
-
- bool fancy;
};
class DistInfoBase : public Info
@@ -1419,8 +1417,9 @@
Counter bucket_size;
/** The number of buckets. Equal to (max-min)/bucket_size. */
size_type buckets;
+
+ enum { fancy = false };
};
- enum { fancy = false };
private:
/** The minimum value to track. */
@@ -1556,10 +1555,10 @@
class FancyStor
{
public:
- struct Params : public StorageParams {};
-
- public:
- enum { fancy = true };
+ struct Params : public StorageParams
+ {
+ enum { fancy = true };
+ };
private:
/** The current sum. */
@@ -1632,10 +1631,10 @@
class AvgFancy
{
public:
- struct Params : public StorageParams {};
-
- public:
- enum { fancy = true };
+ struct Params : public StorageParams
+ {
+ enum { fancy = true };
+ };
private:
/** Current total. */
@@ -1765,7 +1764,6 @@
void
update(DistInfoBase *base)
{
- base->data.fancy = Storage::fancy;
data()->update(info(), base->data);
}
@@ -1881,7 +1879,6 @@
size_type size = this->size();
base->data.resize(size);
for (off_type i = 0; i < size; ++i) {
- base->data[i].fancy = Storage::fancy;
data(i)->update(info(), base->data[i]);
}
}
diff -r 7674070ccc92 -r 471090ec173e src/base/stats/mysql.cc
--- a/src/base/stats/mysql.cc Thu Mar 05 19:09:53 2009 -0800
+++ b/src/base/stats/mysql.cc Thu Mar 05 19:09:53 2009 -0800
@@ -583,8 +583,8 @@
if (!configure(info, "DIST"))
return;
- if (!info.data.fancy) {
- const Params *params = safe_cast<const Params *>(info.storageParams);
+ const Params *params = safe_cast<const Params *>(info.storageParams);
+ if (!params->fancy) {
stat.size = params->buckets;
stat.min = params->min;
stat.max = params->max;
@@ -599,8 +599,8 @@
if (!configure(info, "VECTORDIST"))
return;
- if (!info.data[0].fancy) {
- const Params *params = safe_cast<const Params *>(info.storageParams);
+ const Params *params = safe_cast<const Params *>(info.storageParams);
+ if (!params->fancy) {
stat.size = params->buckets;
stat.min = params->min;
stat.max = params->max;
diff -r 7674070ccc92 -r 471090ec173e src/base/stats/text.cc
--- a/src/base/stats/text.cc Thu Mar 05 19:09:53 2009 -0800
+++ b/src/base/stats/text.cc Thu Mar 05 19:09:53 2009 -0800
@@ -673,12 +673,11 @@
print.squares = data.squares;
print.samples = data.samples;
- print.fancy = data.fancy;
+ const DistStor::Params *params =
+ safe_cast<const DistStor::Params *>(info.storageParams);
- if (!data.fancy) {
- const DistStor::Params *params =
- safe_cast<const DistStor::Params *>(info.storageParams);
-
+ print.fancy = params->fancy;
+ if (!params->fancy) {
print.min = params->min;
print.max = params->max;
print.bucket_size = params->bucket_size;
@@ -716,11 +715,11 @@
print.squares = info.data[i].squares;
print.samples = info.data[i].samples;
- print.fancy = info.data[i].fancy;
- if (!print.fancy) {
- const DistStor::Params *params =
- safe_cast<const DistStor::Params *>(info.storageParams);
+ const DistStor::Params *params =
+ safe_cast<const DistStor::Params *>(info.storageParams);
+ print.fancy = params->fancy;
+ if (!params->fancy) {
print.min = params->min;
print.max = params->max;
print.bucket_size = params->bucket_size;
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
