X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FStatistic.h;h=1a4833cc4a07b538fa5072ce6e284583b75c89a4;hb=aafa94260d5b1b6422258ed3db7244fe4449f217;hp=82d27acb360ef2927831c9bdd3144dd44ecddb79;hpb=3d3a429acb1de79eb15575ed4d90a0a951fda576;p=oota-llvm.git

diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h
index 82d27acb360..1a4833cc4a0 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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -26,62 +26,92 @@
 #ifndef LLVM_ADT_STATISTIC_H
 #define LLVM_ADT_STATISTIC_H
 
+#include "llvm/System/Atomic.h"
+
 namespace llvm {
 
-class StatisticBase {
+class Statistic {
 public:
   const char *Name;
   const char *Desc;
-  unsigned Value : 31;
-  bool Initialized : 1;
+  volatile llvm::sys::cas_flag Value;
+  bool Initialized;
 
-  unsigned getValue() const { return Value; }
+  llvm::sys::cas_flag 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(); }
-  unsigned operator++(int) { init(); return Value++; }
-  const StatisticBase &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=(unsigned Val) {
+    Value = Val;
+    return init();
+  }
   
-protected:
-  StatisticBase &init() {
-    if (!Initialized) RegisterStatistic();
-    return *this;
+  const Statistic &operator++() {
+    sys::AtomicIncrement(&Value);
+    return init();
+  }
+  
+  unsigned operator++(int) {
+    init();
+    unsigned OldValue = Value;
+    sys::AtomicIncrement(&Value);
+    return OldValue;
   }
-  void RegisterStatistic();
-};
   
-struct Statistic : public StatisticBase {
-  Statistic(const char *name, const char *desc) {
-    Name = name; Desc = desc; Value = 0; Initialized = 0;
+  const Statistic &operator--() {
+    sys::AtomicDecrement(&Value);
+    return init();
+  }
+  
+  unsigned operator--(int) {
+    init();
+    unsigned OldValue = Value;
+    sys::AtomicDecrement(&Value);
+    return OldValue;
+  }
+  
+  const Statistic &operator+=(const unsigned &V) {
+    sys::AtomicAdd(&Value, V);
+    return init();
+  }
+  
+  const Statistic &operator-=(const unsigned &V) {
+    sys::AtomicAdd(&Value, -V);
+    return init();
+  }
+  
+  const Statistic &operator*=(const unsigned &V) {
+    sys::AtomicMul(&Value, V);
+    return init();
+  }
+  
+  const Statistic &operator/=(const unsigned &V) {
+    sys::AtomicDiv(&Value, V);
+    return init();
   }
 
-  // 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;}
+protected:
+  Statistic &init() {
+    bool tmp = Initialized;
+    sys::MemoryFence();
+    if (!tmp) 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 StatisticBase VARNAME = { DEBUG_TYPE, DESC, 0, 0 }
+  static llvm::Statistic VARNAME = { DEBUG_TYPE, DESC, 0, 0 }
 
 } // End llvm namespace