summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/statistics.cc14
-rw-r--r--base/statistics.hh15
2 files changed, 16 insertions, 13 deletions
diff --git a/base/statistics.cc b/base/statistics.cc
index 49294ad27..dce545f18 100644
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -57,7 +57,7 @@ __nan()
}
#endif
-#ifdef STAT_DEBUG
+#ifdef DEBUG
static int total_stats = 0;
#endif
@@ -409,6 +409,14 @@ DataAccess::setPrint()
Database::StatDB().regPrint(this);
}
+StatData::StatData()
+ : flags(none), precision(-1), prereq(0)
+{
+#ifdef DEBUG
+ number = total_stats++;
+#endif
+}
+
StatData::~StatData()
{
}
@@ -443,8 +451,8 @@ bool
StatData::baseCheck() const
{
if (!(flags & init)) {
-#ifdef STAT_DEBUG
- cprintf("this is stat number %d\n",(*i)->number);
+#ifdef DEBUG
+ cprintf("this is stat number %d\n", number);
#endif
panic("Not all stats have been initialized");
return false;
diff --git a/base/statistics.hh b/base/statistics.hh
index d8b78fbff..71d2aa8c8 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -60,12 +60,6 @@
#include "base/str.hh"
#include "sim/host.hh"
-//
-// Un-comment this to enable weirdo-stat debugging
-//
-// #define STAT_DEBUG
-
-
#ifndef NAN
float __nan();
/** Define Not a number. */
@@ -146,10 +140,7 @@ struct StatData
/** A pointer to a prerequisite Stat. */
const StatData *prereq;
- StatData()
- : flags(none), precision(-1), prereq(0)
- {}
-
+ StatData();
virtual ~StatData();
/**
@@ -193,6 +184,10 @@ struct StatData
* @return stat1's name is alphabetically before stat2's
*/
static bool less(StatData *stat1, StatData *stat2);
+
+#ifdef DEBUG
+ int number;
+#endif
};
struct ScalarDataBase : public StatData