eliminate constructor from Statistic class. It is now impossible to get a

static constructor for them :).   Transition complete.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32710 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-12-19 23:17:40 +00:00
parent 1c560adfd1
commit 0a3615246f
2 changed files with 21 additions and 34 deletions

View File

@ -28,7 +28,7 @@
namespace llvm {
class StatisticBase {
class Statistic {
public:
const char *Name;
const char *Desc;
@ -38,50 +38,37 @@ public:
unsigned getValue() const { return Value; }
const char *getName() const { return Name; }
const char *getDesc() const { return Desc; }
/// construct - This should only be called for non-global statistics.
void construct(const char *name, const char *desc) {
Name = name; Desc = desc;
Value = 0; Initialized = 0;
}
// Allow use of this class as the value itself.
operator unsigned() const { return Value; }
const StatisticBase &operator=(unsigned Val) { Value = Val; return init(); }
const StatisticBase &operator++() { ++Value; return init(); }
const Statistic &operator=(unsigned Val) { Value = Val; return init(); }
const Statistic &operator++() { ++Value; return init(); }
unsigned operator++(int) { init(); return Value++; }
const StatisticBase &operator--() { --Value; return init(); }
const Statistic &operator--() { --Value; return init(); }
unsigned operator--(int) { init(); return Value--; }
const StatisticBase &operator+=(const unsigned &V) {Value += V;return init();}
const StatisticBase &operator-=(const unsigned &V) {Value -= V;return init();}
const StatisticBase &operator*=(const unsigned &V) {Value *= V;return init();}
const StatisticBase &operator/=(const unsigned &V) {Value /= V;return init();}
const Statistic &operator+=(const unsigned &V) { Value += V; return init(); }
const Statistic &operator-=(const unsigned &V) { Value -= V; return init(); }
const Statistic &operator*=(const unsigned &V) { Value *= V; return init(); }
const Statistic &operator/=(const unsigned &V) { Value /= V; return init(); }
protected:
StatisticBase &init() {
Statistic &init() {
if (!Initialized) RegisterStatistic();
return *this;
}
void RegisterStatistic();
};
struct Statistic : public StatisticBase {
Statistic(const char *name, const char *desc) {
Name = name; Desc = desc; Value = 0; Initialized = 0;
}
// Allow use of this class as the value itself.
operator unsigned() const { return Value; }
const Statistic &operator=(unsigned Val) { Value = Val; init(); return *this;}
const Statistic &operator++() { ++Value; init(); return *this;}
unsigned operator++(int) { init(); return Value++; }
const Statistic &operator--() { --Value; init(); return *this;}
unsigned operator--(int) { init(); return Value--; }
const Statistic &operator+=(const unsigned &V) {Value += V;init();return *this;}
const Statistic &operator-=(const unsigned &V) {Value -= V;init();return *this;}
const Statistic &operator*=(const unsigned &V) {Value *= V;init();return *this;}
const Statistic &operator/=(const unsigned &V) {Value /= V;init();return *this;}
};
// STATISTIC - A macro to make definition of statistics really simple. This
// automatically passes the DEBUG_TYPE of the file into the statistic.
#define STATISTIC(VARNAME, DESC) \
static StatisticBase VARNAME = { DEBUG_TYPE, DESC, 0, 0 }
static Statistic VARNAME = { DEBUG_TYPE, DESC, 0, 0 }
} // End llvm namespace

View File

@ -45,11 +45,11 @@ namespace {
/// on demand (when the first statistic is bumped) and destroyed only when
/// llvm_shutdown is called. We print statistics from the destructor.
class StatisticInfo {
std::vector<const StatisticBase*> Stats;
std::vector<const Statistic*> Stats;
public:
~StatisticInfo();
void addStatistic(const StatisticBase *S) {
void addStatistic(const Statistic *S) {
Stats.push_back(S);
}
};
@ -60,7 +60,7 @@ static ManagedStatic<StatisticInfo> StatInfo;
/// RegisterStatistic - The first time a statistic is bumped, this method is
/// called.
void StatisticBase::RegisterStatistic() {
void Statistic::RegisterStatistic() {
// If stats are enabled, inform StatInfo that this statistic should be
// printed.
if (Enabled)
@ -70,7 +70,7 @@ void StatisticBase::RegisterStatistic() {
}
struct NameCompare {
bool operator()(const StatisticBase *LHS, const StatisticBase *RHS) const {
bool operator()(const Statistic *LHS, const Statistic *RHS) const {
int Cmp = std::strcmp(LHS->getName(), RHS->getName());
if (Cmp != 0) return Cmp < 0;