[llvm-commits] [llvm] r74005 - in /llvm/trunk: include/llvm/ADT/Statistic.h lib/Support/Statistic.cpp
Owen Anderson
resistor at mac.com
Tue Jun 23 14:19:38 PDT 2009
Author: resistor
Date: Tue Jun 23 16:19:38 2009
New Revision: 74005
URL: http://llvm.org/viewvc/llvm-project?rev=74005&view=rev
Log:
Use atomic operations when accessing statistics, and make the lazy initialization of statistics actually threadsafe.
Modified:
llvm/trunk/include/llvm/ADT/Statistic.h
llvm/trunk/lib/Support/Statistic.cpp
Modified: llvm/trunk/include/llvm/ADT/Statistic.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Statistic.h?rev=74005&r1=74004&r2=74005&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/Statistic.h (original)
+++ llvm/trunk/include/llvm/ADT/Statistic.h Tue Jun 23 16:19:38 2009
@@ -26,14 +26,16 @@
#ifndef LLVM_ADT_STATISTIC_H
#define LLVM_ADT_STATISTIC_H
+#include "llvm/System/Atomic.h"
+
namespace llvm {
class Statistic {
public:
const char *Name;
const char *Desc;
- unsigned Value : 31;
- bool Initialized : 1;
+ unsigned Value;
+ bool Initialized;
unsigned getValue() const { return Value; }
const char *getName() const { return Name; }
@@ -47,19 +49,60 @@
// Allow use of this class as the value itself.
operator unsigned() const { return Value; }
- 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(); }
+ const Statistic &operator=(unsigned Val) {
+ Value = Val;
+ return init();
+ }
+
+ const Statistic &operator++() {
+ sys::AtomicIncrement(&Value);
+ return init();
+ }
+
+ unsigned operator++(int) {
+ init();
+ unsigned OldValue = Value;
+ sys::AtomicIncrement(&Value);
+ return OldValue;
+ }
+
+ 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();
+ }
protected:
Statistic &init() {
- if (!Initialized) RegisterStatistic();
+ bool tmp = Initialized;
+ sys::MemoryFence();
+ if (!tmp) RegisterStatistic();
return *this;
}
void RegisterStatistic();
Modified: llvm/trunk/lib/Support/Statistic.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Statistic.cpp?rev=74005&r1=74004&r2=74005&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Statistic.cpp (original)
+++ llvm/trunk/lib/Support/Statistic.cpp Tue Jun 23 16:19:38 2009
@@ -66,10 +66,14 @@
// If stats are enabled, inform StatInfo that this statistic should be
// printed.
sys::ScopedLock Writer(&*StatLock);
- if (Enabled)
- StatInfo->addStatistic(this);
- // Remember we have been registered.
- Initialized = true;
+ if (!Initialized) {
+ if (Enabled)
+ StatInfo->addStatistic(this);
+
+ sys::MemoryFence();
+ // Remember we have been registered.
+ Initialized = true;
+ }
}
namespace {
More information about the llvm-commits
mailing list