X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FStatistic.h;h=537f86637953bf76251761912b6cd66b83273e97;hb=6de603071879bdc5d7d663826354c24a9d176469;hp=dd44f2709bedfea154575c5e74d0cf3bd0f6c50f;hpb=cf84504d7a86808117f67264ad5cfab8f5a139bc;p=oota-llvm.git

diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h
index dd44f2709be..537f8663795 100644
--- a/include/llvm/ADT/Statistic.h
+++ b/include/llvm/ADT/Statistic.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -29,33 +29,47 @@
 namespace llvm {
 
 class Statistic {
+public:
   const char *Name;
   const char *Desc;
-  unsigned Value;
-  static unsigned NumStats;
-public:
-  // Normal constructor, default initialize data item...
-  Statistic(const char *name, const char *desc)
-    : Name(name), Desc(desc), Value(0) {
-    ++NumStats;  // Keep track of how many stats are created...
-  }
+  unsigned Value : 31;
+  bool Initialized : 1;
+
+  unsigned getValue() const { return Value; }
+  const char *getName() const { return Name; }
+  const char *getDesc() const { return Desc; }
 
-  // Print information when destroyed, iff command line option is specified
-  ~Statistic();
+  /// 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...
+  // Allow use of this class as the value itself.
   operator unsigned() const { return Value; }
-  const Statistic &operator=(unsigned Val) { Value = Val; return *this; }
-  const Statistic &operator++() { ++Value; return *this; }
-  unsigned operator++(int) { return Value++; }
-  const Statistic &operator--() { --Value; return *this; }
-  unsigned operator--(int) { return Value--; }
-  const Statistic &operator+=(const unsigned &V) { Value += V; return *this; }
-  const Statistic &operator-=(const unsigned &V) { Value -= V; return *this; }
-  const Statistic &operator*=(const unsigned &V) { Value *= V; return *this; }
-  const Statistic &operator/=(const unsigned &V) { Value /= V; return *this; }
+  const Statistic &operator=(unsigned Val) { Value = Val; return init(); }
+  const Statistic &operator++() { ++Value; return init(); }
+  unsigned operator++(int) { init(); return Value++; }
+  const Statistic &operator--() { --Value; return init(); }
+  unsigned operator--(int) { init(); return Value--; }
+  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:
+  Statistic &init() {
+    if (!Initialized) RegisterStatistic();
+    return *this;
+  }
+  void RegisterStatistic();
 };
 
+// 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 llvm::Statistic VARNAME = { DEBUG_TYPE, DESC, 0, 0 }
+
 } // End llvm namespace
 
 #endif