[Lldb-commits] [lldb] r132813 - in /lldb/trunk: include/lldb/Core/ConstString.h include/lldb/Core/History.h lldb.xcodeproj/project.pbxproj source/Core/ConstString.cpp source/Core/History.cpp source/Core/Mangled.cpp
Greg Clayton
gclayton at apple.com
Thu Jun 9 15:34:34 PDT 2011
Author: gclayton
Date: Thu Jun 9 17:34:34 2011
New Revision: 132813
URL: http://llvm.org/viewvc/llvm-project?rev=132813&view=rev
Log:
I modified the StringMap that was being used to unique our debugger C strings
to have the value for the map be a "const char *" instead of an unused uint32_t.
This allows us to store the uniqued mangled/demangled counterpart in this map
for mangled names. This also speeds up the mangled/demangled counterpart lookup
that used to be maintained in a STL map by having direct access to the data.
If we eventually need to associate other strings to strings to more data, we
can make the value of the StringMap have a more complex value.
Added the start of a history source and history event class. It isn't being
used by anything yet, but might be shortly.
Added:
lldb/trunk/include/lldb/Core/History.h
lldb/trunk/source/Core/History.cpp
Modified:
lldb/trunk/include/lldb/Core/ConstString.h
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/Core/ConstString.cpp
lldb/trunk/source/Core/Mangled.cpp
Modified: lldb/trunk/include/lldb/Core/ConstString.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ConstString.h?rev=132813&r1=132812&r2=132813&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ConstString.h (original)
+++ lldb/trunk/include/lldb/Core/ConstString.h Thu Jun 9 17:34:34 2011
@@ -338,6 +338,12 @@
void
SetCString (const char *cstr);
+ void
+ SetCStringWithMangledCounterpart (const char *demangled, const ConstString &mangled);
+
+ bool
+ GetMangledCounterpart (ConstString &counterpart) const;
+
//------------------------------------------------------------------
/// Set the C string value with length.
///
Added: lldb/trunk/include/lldb/Core/History.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/History.h?rev=132813&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Core/History.h (added)
+++ lldb/trunk/include/lldb/Core/History.h Thu Jun 9 17:34:34 2011
@@ -0,0 +1,177 @@
+//===-- History.h -----------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef lldb_History_h_
+#define lldb_History_h_
+
+// C Includes
+#include <stdint.h>
+
+// C++ Includes
+#include <stack>
+#include <string>
+
+// Other libraries and framework includes
+// Project includes
+#include "lldb/lldb-public.h"
+#include "lldb/Host/Mutex.h"
+
+namespace lldb_private {
+
+//----------------------------------------------------------------------
+/// @class HistorySource History.h "lldb/Core/History.h"
+/// @brief A class that defines history events.
+//----------------------------------------------------------------------
+
+class HistorySource
+{
+public:
+ typedef const void * HistoryEvent;
+
+ HistorySource () :
+ m_mutex (Mutex::eMutexTypeRecursive),
+ m_events ()
+ {
+ }
+
+ virtual
+ ~HistorySource()
+ {
+ }
+
+ // Create a new history event. Subclasses should use any data or members
+ // in the subclass of this class to produce a history event and push it
+ // onto the end of the history stack.
+
+ virtual HistoryEvent
+ CreateHistoryEvent () = 0;
+
+ virtual void
+ DeleteHistoryEvent (HistoryEvent event) = 0;
+
+ virtual void
+ DumpHistoryEvent (Stream &strm, HistoryEvent event) = 0;
+
+ virtual size_t
+ GetHistoryEventCount() = 0;
+
+ virtual HistoryEvent
+ GetHistoryEventAtIndex (uint32_t idx) = 0;
+
+ virtual HistoryEvent
+ GetCurrentHistoryEvent () = 0;
+
+ // Return 0 when lhs == rhs, 1 if lhs > rhs, or -1 if lhs < rhs.
+ virtual int
+ CompareHistoryEvents (const HistoryEvent lhs,
+ const HistoryEvent rhs);
+
+ virtual bool
+ IsCurrentHistoryEvent (const HistoryEvent event);
+
+private:
+ typedef std::stack<HistoryEvent> collection;
+
+ Mutex m_mutex;
+ collection m_events;
+
+ DISALLOW_COPY_AND_ASSIGN (HistorySource);
+
+};
+
+//----------------------------------------------------------------------
+/// @class HistorySourceUInt History.h "lldb/Core/History.h"
+/// @brief A class that defines history events that are represented by
+/// unsigned integers.
+///
+/// Any history event that is defined by a unique monotonically
+/// increasing unsigned integer
+//----------------------------------------------------------------------
+
+class HistorySourceUInt : public HistorySource
+{
+ HistorySourceUInt (const char *id_name, uintptr_t start_value = 0u) :
+ HistorySource(),
+ m_name (id_name),
+ m_curr_id (start_value)
+ {
+ }
+
+ virtual
+ ~HistorySourceUInt()
+ {
+ }
+
+ // Create a new history event. Subclasses should use any data or members
+ // in the subclass of this class to produce a history event and push it
+ // onto the end of the history stack.
+
+ virtual HistoryEvent
+ CreateHistoryEvent ()
+ {
+ ++m_curr_id;
+ return (HistoryEvent)m_curr_id;
+ }
+
+ virtual void
+ DeleteHistoryEvent (HistoryEvent event)
+ {
+ // Nothing to delete, the event contains the integer
+ }
+
+ virtual void
+ DumpHistoryEvent (Stream &strm, HistoryEvent event);
+
+ virtual size_t
+ GetHistoryEventCount()
+ {
+ return m_curr_id;
+ }
+
+ virtual HistoryEvent
+ GetHistoryEventAtIndex (uint32_t idx)
+ {
+ return (HistoryEvent)((uintptr_t)idx);
+ }
+
+ virtual HistoryEvent
+ GetCurrentHistoryEvent ()
+ {
+ return (HistoryEvent)m_curr_id;
+ }
+
+ // Return 0 when lhs == rhs, 1 if lhs > rhs, or -1 if lhs < rhs.
+ virtual int
+ CompareHistoryEvents (const HistoryEvent lhs,
+ const HistoryEvent rhs)
+ {
+ uintptr_t lhs_uint = (uintptr_t)lhs;
+ uintptr_t rhs_uint = (uintptr_t)rhs;
+ if (lhs_uint < rhs_uint)
+ return -1;
+ if (lhs_uint > rhs_uint)
+ return +1;
+ return 0;
+ }
+
+ virtual bool
+ IsCurrentHistoryEvent (const HistoryEvent event)
+ {
+ return (uintptr_t)event == m_curr_id;
+ }
+
+protected:
+ std::string m_name; // The name of the history unsigned integer
+ uintptr_t m_curr_id; // The current value of the history unsigned unteger
+};
+
+
+} // namespace lldb_private
+
+#endif // lldb_History_h_
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=132813&r1=132812&r2=132813&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Thu Jun 9 17:34:34 2011
@@ -393,6 +393,7 @@
26F5C32D10F3DFDD009D5894 /* libtermcap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32B10F3DFDD009D5894 /* libtermcap.dylib */; };
26F5C37510F3F61B009D5894 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C37410F3F61B009D5894 /* libobjc.dylib */; };
26F5C39110F3FA26009D5894 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; };
+ 26F73062139D8FDB00FD51C7 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F73061139D8FDB00FD51C7 /* History.cpp */; };
49C850771384A02F007DB519 /* ProcessDataAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 49C850761384A02F007DB519 /* ProcessDataAllocator.h */; };
49C8507C1384A786007DB519 /* ProcessDataAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49C850781384A0CA007DB519 /* ProcessDataAllocator.cpp */; };
4C74CB6312288704006A8171 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C74CB6212288704006A8171 /* Carbon.framework */; };
@@ -1054,6 +1055,8 @@
26F5C32B10F3DFDD009D5894 /* libtermcap.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtermcap.dylib; path = /usr/lib/libtermcap.dylib; sourceTree = "<absolute>"; };
26F5C37410F3F61B009D5894 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
26F5C39010F3FA26009D5894 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+ 26F7305F139D8FC900FD51C7 /* History.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = History.h; path = include/lldb/Core/History.h; sourceTree = "<group>"; };
+ 26F73061139D8FDB00FD51C7 /* History.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = History.cpp; path = source/Core/History.cpp; sourceTree = "<group>"; };
26F996A7119B79C300412154 /* ARM_DWARF_Registers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARM_DWARF_Registers.h; path = source/Utility/ARM_DWARF_Registers.h; sourceTree = "<group>"; };
26F996A8119B79C300412154 /* ARM_GCC_Registers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARM_GCC_Registers.h; path = source/Utility/ARM_GCC_Registers.h; sourceTree = "<group>"; };
26FA4315130103F400E71120 /* FileSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSpec.h; path = include/lldb/Host/FileSpec.h; sourceTree = "<group>"; };
@@ -1896,6 +1899,8 @@
26BC7D6310F1B77400F91463 /* FileSpecList.h */,
26BC7E7B10F1B85900F91463 /* FileSpecList.cpp */,
26BC7D6410F1B77400F91463 /* Flags.h */,
+ 26F7305F139D8FC900FD51C7 /* History.h */,
+ 26F73061139D8FDB00FD51C7 /* History.cpp */,
9AA69DBB118A029E00D753A0 /* InputReader.h */,
9AA69DB5118A027A00D753A0 /* InputReader.cpp */,
9A9E1F0013980943005AC039 /* InputReaderStack.h */,
@@ -3215,6 +3220,7 @@
2690B3711381D5C300ECFBAE /* Memory.cpp in Sources */,
9A9E1EFF1398086D005AC039 /* InputReaderStack.cpp in Sources */,
B28058A1139988B0002D96D0 /* InferiorCallPOSIX.cpp in Sources */,
+ 26F73062139D8FDB00FD51C7 /* History.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: lldb/trunk/source/Core/ConstString.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ConstString.cpp?rev=132813&r1=132812&r2=132813&view=diff
==============================================================================
--- lldb/trunk/source/Core/ConstString.cpp (original)
+++ lldb/trunk/source/Core/ConstString.cpp Thu Jun 9 17:34:34 2011
@@ -32,6 +32,10 @@
class Pool
{
public:
+ typedef const char * StringPoolValueType;
+ typedef llvm::StringMap<StringPoolValueType, llvm::BumpPtrAllocator> StringPool;
+ typedef llvm::StringMapEntry<StringPoolValueType> StringPoolEntryType;
+
//------------------------------------------------------------------
// Default constructor
//
@@ -51,24 +55,44 @@
}
- static llvm::StringMapEntry<uint32_t> &
+ static StringPoolEntryType &
GetStringMapEntryFromKeyData (const char *keyData)
{
- char *ptr = const_cast<char*>(keyData) - sizeof (llvm::StringMapEntry<uint32_t>);
- return *reinterpret_cast<llvm::StringMapEntry<uint32_t>*>(ptr);
+ char *ptr = const_cast<char*>(keyData) - sizeof (StringPoolEntryType);
+ return *reinterpret_cast<StringPoolEntryType*>(ptr);
}
size_t
- GetConstCStringLength (const char *ccstr)
+ GetConstCStringLength (const char *ccstr) const
{
if (ccstr)
{
- llvm::StringMapEntry<uint32_t>&entry = GetStringMapEntryFromKeyData (ccstr);
+ const StringPoolEntryType&entry = GetStringMapEntryFromKeyData (ccstr);
return entry.getKey().size();
}
return 0;
}
+ StringPoolValueType
+ GetMangledCounterpart (const char *ccstr) const
+ {
+ if (ccstr)
+ return GetStringMapEntryFromKeyData (ccstr).getValue();
+ return 0;
+ }
+
+ bool
+ SetMangledCounterparts (const char *key_ccstr, const char *value_ccstr)
+ {
+ if (key_ccstr && value_ccstr)
+ {
+ GetStringMapEntryFromKeyData (key_ccstr).setValue(value_ccstr);
+ GetStringMapEntryFromKeyData (value_ccstr).setValue(key_ccstr);
+ return true;
+ }
+ return false;
+ }
+
const char *
GetConstCString (const char *cstr)
{
@@ -84,13 +108,33 @@
{
Mutex::Locker locker (m_mutex);
llvm::StringRef string_ref (cstr, cstr_len);
- llvm::StringMapEntry<uint32_t>& entry = m_string_map.GetOrCreateValue (string_ref);
+ StringPoolEntryType& entry = m_string_map.GetOrCreateValue (string_ref);
return entry.getKeyData();
}
return NULL;
}
const char *
+ GetConstCStringAndSetMangledCounterPart (const char *demangled_cstr, const char *mangled_ccstr)
+ {
+ if (demangled_cstr)
+ {
+ Mutex::Locker locker (m_mutex);
+ // Make string pool entry with the mangled counterpart already set
+ StringPoolEntryType& entry = m_string_map.GetOrCreateValue (llvm::StringRef (demangled_cstr), mangled_ccstr);
+
+ // Extract the const version of the demangled_cstr
+ const char *demangled_ccstr = entry.getKeyData();
+ // Now assign the demangled const string as the counterpart of the
+ // mangled const string...
+ GetStringMapEntryFromKeyData (mangled_ccstr).setValue(demangled_ccstr);
+ // Return the constant demangled C string
+ return demangled_ccstr;
+ }
+ return NULL;
+ }
+
+ const char *
GetConstTrimmedCStringWithLength (const char *cstr, int cstr_len)
{
if (cstr)
@@ -114,7 +158,7 @@
const_iterator end = m_string_map.end();
for (const_iterator pos = m_string_map.begin(); pos != end; ++pos)
{
- mem_size += sizeof(llvm::StringMapEntry<uint32_t>) + pos->getKey().size();
+ mem_size += sizeof(StringPoolEntryType) + pos->getKey().size();
}
return mem_size;
}
@@ -123,7 +167,6 @@
//------------------------------------------------------------------
// Typedefs
//------------------------------------------------------------------
- typedef llvm::StringMap<uint32_t, llvm::BumpPtrAllocator> StringPool;
typedef StringPool::iterator iterator;
typedef StringPool::const_iterator const_iterator;
@@ -320,6 +363,19 @@
m_string = StringPool().GetConstCString (cstr);
}
+void
+ConstString::SetCStringWithMangledCounterpart (const char *demangled, const ConstString &mangled)
+{
+ m_string = StringPool().GetConstCStringAndSetMangledCounterPart (demangled, mangled.m_string);
+}
+
+bool
+ConstString::GetMangledCounterpart (ConstString &counterpart) const
+{
+ counterpart.m_string = StringPool().GetMangledCounterpart(m_string);
+ return counterpart;
+}
+
//----------------------------------------------------------------------
// Set the string value in the object by uniquing "cstr_len" bytes
// starting at the "cstr" string value in our global string pool.
Added: lldb/trunk/source/Core/History.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/History.cpp?rev=132813&view=auto
==============================================================================
--- lldb/trunk/source/Core/History.cpp (added)
+++ lldb/trunk/source/Core/History.cpp Thu Jun 9 17:34:34 2011
@@ -0,0 +1,25 @@
+//===-- History.cpp ---------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Core/History.h"
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+#include "lldb/Core/Stream.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+void
+HistorySourceUInt::DumpHistoryEvent (Stream &strm, HistoryEvent event)
+{
+ strm.Printf ("%s %llu", m_name.c_str(), (uint64_t)((uintptr_t)event));
+}
Modified: lldb/trunk/source/Core/Mangled.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Mangled.cpp?rev=132813&r1=132812&r2=132813&view=diff
==============================================================================
--- lldb/trunk/source/Core/Mangled.cpp (original)
+++ lldb/trunk/source/Core/Mangled.cpp Thu Jun 9 17:34:34 2011
@@ -152,29 +152,9 @@
// lets just make sure it isn't empty...
const char * mangled = m_mangled.AsCString();
// Don't bother running anything that doesn't start with _Z through the demangler
- if (mangled[0] != '\0' && mangled[0] == '_' && mangled[1] == 'Z')
+ if (mangled[0] == '_' && mangled[1] == 'Z')
{
- // Since demangling can be a costly, and since all names that go
- // into a ConstString (like our m_mangled and m_demangled members)
- // end up being unique "const char *" values, we can use a DenseMap
- // to speed up our lookup. We do this because often our symbol table
- // and our debug information both have the mangled names which they
- // would each need to demangle. Also, with GCC we end up with the one
- // definition rule where a lot of STL code produces symbols that are
- // in multiple compile units and the mangled names end up being in
- // the same binary multiple times. The performance win isn't huge,
- // but we showed a 20% improvement on darwin.
- typedef llvm::DenseMap<const char *, const char *> MangledToDemangledMap;
- static MangledToDemangledMap g_mangled_to_demangled;
-
- // Check our mangled string pointer to demangled string pointer map first
- MangledToDemangledMap::const_iterator pos = g_mangled_to_demangled.find (mangled);
- if (pos != g_mangled_to_demangled.end())
- {
- // We have already demangled this string, we can just use our saved result!
- m_demangled.SetCString(pos->second);
- }
- else
+ if (!m_mangled.GetMangledCounterpart(m_demangled))
{
// We didn't already mangle this name, demangle it and if all goes well
// add it to our map.
@@ -182,11 +162,7 @@
if (demangled_name)
{
- m_demangled.SetCString (demangled_name);
- // Now that the name has been uniqued, add the uniqued C string
- // pointer from m_mangled as the key to the uniqued C string
- // pointer in m_demangled.
- g_mangled_to_demangled.insert (std::make_pair (mangled, m_demangled.GetCString()));
+ m_demangled.SetCStringWithMangledCounterpart(demangled_name, m_mangled);
free (demangled_name);
}
}
More information about the lldb-commits
mailing list