Enhance clang_getCXTUResourceUsage() to report the amount of memory used by ASTContex...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130383 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index 6b6e7bf242104208b5f3e3b23547780991e44617..14f4cc4819da072d290be1a9ac102461fd70804b 100644 (file)
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -1022,13 +1022,14 @@ enum CXTUResourceUsageKind {
   CXTUResourceUsage_Selectors = 3,
   CXTUResourceUsage_GlobalCompletionResults = 4,
   CXTUResourceUsage_SourceManagerContentCache = 5,
+  CXTUResourceUsage_AST_SideTables = 6,
 
   CXTUResourceUsage_MEMORY_IN_BYTES_BEGIN = CXTUResourceUsage_AST,
   CXTUResourceUsage_MEMORY_IN_BYTES_END =
-    CXTUResourceUsage_SourceManagerContentCache,
+    CXTUResourceUsage_AST_SideTables,
 
   CXTUResourceUsage_First = CXTUResourceUsage_AST,
-  CXTUResourceUsage_Last = CXTUResourceUsage_SourceManagerContentCache
+  CXTUResourceUsage_Last = CXTUResourceUsage_AST_SideTables
 };
 
 /**

diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h
index 9c3cfe73b2fd34748c0e4c921ebbf6256ddbc849..ad02aac360e65cd1f6eb4057a7e0ee030d88e0fb 100644 (file)
--- a/include/clang/AST/ASTContext.h
+++ b/include/clang/AST/ASTContext.h
@@ -344,9 +344,11 @@ public:
   
   /// Return the total amount of physical memory allocated for representing
   /// AST nodes and type information.
-  size_t getTotalAllocatedMemory() const {
+  size_t getASTAllocatedMemory() const {
     return BumpAlloc.getTotalMemory();
   }
+  /// Return the total memory used for various side tables.
+  size_t getSideTableAllocatedMemory() const;
   
   PartialDiagnostic::StorageAllocator &getDiagAllocator() {
     return DiagAllocator;

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index c571c559bc66e7032dd3ad74dae04cee0d5c8bbf..13c40f7ca1dc01678d24e08946ff51bce810b2f9 100644 (file)
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -6139,3 +6139,19 @@ MangleContext *ASTContext::createMangleContext() {
 }
 
 CXXABI::~CXXABI() {}
+
+size_t ASTContext::getSideTableAllocatedMemory() const {
+  size_t bytes = 0;
+  bytes += ASTRecordLayouts.getMemorySize();
+  bytes += ObjCLayouts.getMemorySize();
+  bytes += KeyFunctions.getMemorySize();
+  bytes += ObjCImpls.getMemorySize();
+  bytes += BlockVarCopyInits.getMemorySize();
+  bytes += DeclAttrs.getMemorySize();
+  bytes += InstantiatedFromStaticDataMember.getMemorySize();
+  bytes += InstantiatedFromUsingDecl.getMemorySize();
+  bytes += InstantiatedFromUsingShadowDecl.getMemorySize();
+  bytes += InstantiatedFromUnnamedFieldDecl.getMemorySize();
+  return bytes;
+}
+

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index c72d49634bd13a0f5db70926749cd36235a53e40..26e4af4049148f0aeaf80f8a8ce74b5eaf6805dc 100644 (file)
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -5198,7 +5198,7 @@ typedef std::vector<CXTUResourceUsageEntry> MemUsageEntries;
 
 static inline void createCXTUResourceUsageEntry(MemUsageEntries &entries,
                                               enum CXTUResourceUsageKind k,
-                                              double amount) {
+                                              unsigned long amount) {
   CXTUResourceUsageEntry entry = { k, amount };
   entries.push_back(entry);
 }
@@ -5223,6 +5223,9 @@ const char *clang_getTUResourceUsageName(CXTUResourceUsageKind kind) {
     case CXTUResourceUsage_SourceManagerContentCache:
       str = "SourceManager: content cache allocator";
       break;
+    case CXTUResourceUsage_AST_SideTables:
+      str = "ASTContext: side tables";
+      break;
   }
   return str;
 }
@@ -5239,7 +5242,7 @@ CXTUResourceUsage clang_getCXTUResourceUsage(CXTranslationUnit TU) {
   
   // How much memory is used by AST nodes and types?
   createCXTUResourceUsageEntry(*entries, CXTUResourceUsage_AST,
-    (unsigned long) astContext.getTotalAllocatedMemory());
+    (unsigned long) astContext.getASTAllocatedMemory());
 
   // How much memory is used by identifiers?
   createCXTUResourceUsageEntry(*entries, CXTUResourceUsage_Identifiers,
@@ -5249,6 +5252,10 @@ CXTUResourceUsage clang_getCXTUResourceUsage(CXTranslationUnit TU) {
   createCXTUResourceUsageEntry(*entries, CXTUResourceUsage_Selectors,
     (unsigned long) astContext.Selectors.getTotalMemory());
   
+  // How much memory is used by ASTContext's side tables?
+  createCXTUResourceUsageEntry(*entries, CXTUResourceUsage_AST_SideTables,
+    (unsigned long) astContext.getSideTableAllocatedMemory());
+  
   // How much memory is used for caching global code completion results?
   unsigned long completionBytes = 0;
   if (GlobalCodeCompletionAllocator *completionAllocator =