[llvm-commits] [llvm] r79429 - in /llvm/trunk: include/llvm/Support/LeakDetector.h lib/VMCore/LLVMContextImpl.h lib/VMCore/LeakDetector.cpp lib/VMCore/LeaksContext.h
Owen Anderson
resistor at mac.com
Wed Aug 19 10:07:46 PDT 2009
Author: resistor
Date: Wed Aug 19 12:07:46 2009
New Revision: 79429
URL: http://llvm.org/viewvc/llvm-project?rev=79429&view=rev
Log:
Reapply my less-lock-contention-in-leak-detector patch, now with new files
actually added.
Added:
llvm/trunk/lib/VMCore/LeaksContext.h
Modified:
llvm/trunk/include/llvm/Support/LeakDetector.h
llvm/trunk/lib/VMCore/LLVMContextImpl.h
llvm/trunk/lib/VMCore/LeakDetector.cpp
Modified: llvm/trunk/include/llvm/Support/LeakDetector.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/LeakDetector.h?rev=79429&r1=79428&r2=79429&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/LeakDetector.h (original)
+++ llvm/trunk/include/llvm/Support/LeakDetector.h Wed Aug 19 12:07:46 2009
@@ -56,9 +56,9 @@
/// The specified message will be printed indicating when the check was
/// performed.
///
- static void checkForGarbage(const std::string &Message) {
+ static void checkForGarbage(LLVMContext &C, const std::string &Message) {
#ifndef NDEBUG
- checkForGarbageImpl(Message);
+ checkForGarbageImpl(C, Message);
#endif
}
@@ -83,7 +83,7 @@
static void removeGarbageObjectImpl(const Value *Object);
static void addGarbageObjectImpl(void *Object);
static void removeGarbageObjectImpl(void *Object);
- static void checkForGarbageImpl(const std::string &Message);
+ static void checkForGarbageImpl(LLVMContext &C, const std::string &Message);
};
} // End llvm namespace
Modified: llvm/trunk/lib/VMCore/LLVMContextImpl.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/LLVMContextImpl.h?rev=79429&r1=79428&r2=79429&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/LLVMContextImpl.h (original)
+++ llvm/trunk/lib/VMCore/LLVMContextImpl.h Wed Aug 19 12:07:46 2009
@@ -16,6 +16,7 @@
#define LLVM_LLVMCONTEXT_IMPL_H
#include "ConstantsContext.h"
+#include "LeaksContext.h"
#include "TypesContext.h"
#include "llvm/LLVMContext.h"
#include "llvm/Constants.h"
@@ -134,6 +135,10 @@
ConstantInt *TheTrueVal;
ConstantInt *TheFalseVal;
+ // Lock used for guarding access to the leak detector
+ sys::SmartMutex<true> LLVMObjectsLock;
+ LeakDetectorImpl<Value> LLVMObjects;
+
// Lock used for guarding access to the type maps.
sys::SmartMutex<true> TypeMapLock;
Modified: llvm/trunk/lib/VMCore/LeakDetector.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/LeakDetector.cpp?rev=79429&r1=79428&r2=79429&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/LeakDetector.cpp (original)
+++ llvm/trunk/lib/VMCore/LeakDetector.cpp Wed Aug 19 12:07:46 2009
@@ -11,129 +11,63 @@
//
//===----------------------------------------------------------------------===//
+#include "LLVMContextImpl.h"
#include "llvm/Support/LeakDetector.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Streams.h"
-#include "llvm/System/RWMutex.h"
+#include "llvm/System/Mutex.h"
#include "llvm/System/Threading.h"
#include "llvm/Value.h"
using namespace llvm;
-namespace {
- template <class T>
- struct VISIBILITY_HIDDEN PrinterTrait {
- static void print(const T* P) { cerr << P; }
- };
-
- template<>
- struct VISIBILITY_HIDDEN PrinterTrait<Value> {
- static void print(const Value* P) { cerr << *P; }
- };
-
- ManagedStatic<sys::SmartRWMutex<true> > LeakDetectorLock;
-
- template <typename T>
- struct VISIBILITY_HIDDEN LeakDetectorImpl {
- explicit LeakDetectorImpl(const char* const name = "") :
- Cache(0), Name(name) { }
-
- void clear() {
- Cache = 0;
- Ts.clear();
- }
-
- void setName(const char* n) {
- Name = n;
- }
-
- // Because the most common usage pattern, by far, is to add a
- // garbage object, then remove it immediately, we optimize this
- // case. When an object is added, it is not added to the set
- // immediately, it is added to the CachedValue Value. If it is
- // immediately removed, no set search need be performed.
- void addGarbage(const T* o) {
- sys::SmartScopedWriter<true> Writer(*LeakDetectorLock);
- if (Cache) {
- assert(Ts.count(Cache) == 0 && "Object already in set!");
- Ts.insert(Cache);
- }
- Cache = o;
- }
-
- void removeGarbage(const T* o) {
- sys::SmartScopedWriter<true> Writer(*LeakDetectorLock);
- if (o == Cache)
- Cache = 0; // Cache hit
- else
- Ts.erase(o);
- }
-
- bool hasGarbage(const std::string& Message) {
- addGarbage(0); // Flush the Cache
-
- sys::SmartScopedReader<true> Reader(*LeakDetectorLock);
- assert(Cache == 0 && "No value should be cached anymore!");
-
- if (!Ts.empty()) {
- cerr << "Leaked " << Name << " objects found: " << Message << ":\n";
- for (typename SmallPtrSet<const T*, 8>::iterator I = Ts.begin(),
- E = Ts.end(); I != E; ++I) {
- cerr << "\t";
- PrinterTrait<T>::print(*I);
- cerr << "\n";
- }
- cerr << '\n';
-
- return true;
- }
-
- return false;
- }
-
- private:
- SmallPtrSet<const T*, 8> Ts;
- const T* Cache;
- const char* Name;
- };
-
- static ManagedStatic<LeakDetectorImpl<void> > Objects;
- static ManagedStatic<LeakDetectorImpl<Value> > LLVMObjects;
-
- static void clearGarbage() {
- Objects->clear();
- LLVMObjects->clear();
- }
+static ManagedStatic<sys::SmartMutex<true> > ObjectsLock;
+static ManagedStatic<LeakDetectorImpl<void> > Objects;
+
+static void clearGarbage(LLVMContext &Context) {
+ Objects->clear();
+ Context.pImpl->LLVMObjects.clear();
}
void LeakDetector::addGarbageObjectImpl(void *Object) {
+ sys::SmartScopedLock<true> Lock(*ObjectsLock);
Objects->addGarbage(Object);
}
void LeakDetector::addGarbageObjectImpl(const Value *Object) {
- LLVMObjects->addGarbage(Object);
+ LLVMContextImpl *pImpl = Object->getContext().pImpl;
+ sys::SmartScopedLock<true> Lock(pImpl->LLVMObjectsLock);
+ pImpl->LLVMObjects.addGarbage(Object);
}
void LeakDetector::removeGarbageObjectImpl(void *Object) {
+ sys::SmartScopedLock<true> Lock(*ObjectsLock);
Objects->removeGarbage(Object);
}
void LeakDetector::removeGarbageObjectImpl(const Value *Object) {
- LLVMObjects->removeGarbage(Object);
+ LLVMContextImpl *pImpl = Object->getContext().pImpl;
+ sys::SmartScopedLock<true> Lock(pImpl->LLVMObjectsLock);
+ pImpl->LLVMObjects.removeGarbage(Object);
}
-void LeakDetector::checkForGarbageImpl(const std::string &Message) {
+void LeakDetector::checkForGarbageImpl(LLVMContext &Context,
+ const std::string &Message) {
+ LLVMContextImpl *pImpl = Context.pImpl;
+ sys::SmartScopedLock<true> Lock(*ObjectsLock);
+ sys::SmartScopedLock<true> CLock(pImpl->LLVMObjectsLock);
+
Objects->setName("GENERIC");
- LLVMObjects->setName("LLVM");
+ pImpl->LLVMObjects.setName("LLVM");
// use non-short-circuit version so that both checks are performed
if (Objects->hasGarbage(Message) |
- LLVMObjects->hasGarbage(Message))
+ pImpl->LLVMObjects.hasGarbage(Message))
cerr << "\nThis is probably because you removed an object, but didn't "
<< "delete it. Please check your code for memory leaks.\n";
// Clear out results so we don't get duplicate warnings on
// next call...
- clearGarbage();
+ clearGarbage(Context);
}
Added: llvm/trunk/lib/VMCore/LeaksContext.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/LeaksContext.h?rev=79429&view=auto
==============================================================================
--- llvm/trunk/lib/VMCore/LeaksContext.h (added)
+++ llvm/trunk/lib/VMCore/LeaksContext.h Wed Aug 19 12:07:46 2009
@@ -0,0 +1,90 @@
+//===---------------- ----LeaksContext.h - Implementation ------*- C++ -*--===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines various helper methods and classes used by
+// LLVMContextImpl for leaks detectors.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Value.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/ADT/SmallPtrSet.h"
+
+using namespace llvm;
+
+template <class T>
+struct PrinterTrait {
+ static void print(const T* P) { cerr << P; }
+};
+
+template<>
+struct PrinterTrait<Value> {
+ static void print(const Value* P) { cerr << *P; }
+};
+
+template <typename T>
+struct LeakDetectorImpl {
+ explicit LeakDetectorImpl(const char* const name = "") :
+ Cache(0), Name(name) { }
+
+ void clear() {
+ Cache = 0;
+ Ts.clear();
+ }
+
+ void setName(const char* n) {
+ Name = n;
+ }
+
+ // Because the most common usage pattern, by far, is to add a
+ // garbage object, then remove it immediately, we optimize this
+ // case. When an object is added, it is not added to the set
+ // immediately, it is added to the CachedValue Value. If it is
+ // immediately removed, no set search need be performed.
+ void addGarbage(const T* o) {
+ if (Cache) {
+ assert(Ts.count(Cache) == 0 && "Object already in set!");
+ Ts.insert(Cache);
+ }
+ Cache = o;
+ }
+
+ void removeGarbage(const T* o) {
+ if (o == Cache)
+ Cache = 0; // Cache hit
+ else
+ Ts.erase(o);
+ }
+
+ bool hasGarbage(const std::string& Message) {
+ addGarbage(0); // Flush the Cache
+
+ assert(Cache == 0 && "No value should be cached anymore!");
+
+ if (!Ts.empty()) {
+ cerr << "Leaked " << Name << " objects found: " << Message << ":\n";
+ for (typename SmallPtrSet<const T*, 8>::iterator I = Ts.begin(),
+ E = Ts.end(); I != E; ++I) {
+ cerr << "\t";
+ PrinterTrait<T>::print(*I);
+ cerr << "\n";
+ }
+ cerr << '\n';
+
+ return true;
+ }
+
+ return false;
+ }
+
+private:
+ SmallPtrSet<const T*, 8> Ts;
+ const T* Cache;
+ const char* Name;
+};
More information about the llvm-commits
mailing list