[Lldb-commits] [lldb] r137078 - in /lldb/trunk: include/lldb/Core/Module.h source/Commands/CommandObjectTarget.cpp source/Core/Module.cpp
Greg Clayton
gclayton at apple.com
Mon Aug 8 17:01:09 PDT 2011
Author: gclayton
Date: Mon Aug 8 19:01:09 2011
New Revision: 137078
URL: http://llvm.org/viewvc/llvm-project?rev=137078&view=rev
Log:
Added a "--global" option to the "target modules list"
command that allows us to see all modules that exist and
their corresponding global shared pointer count. This will
help us track down memory issues when modules aren't being
removed and cleaned up from the module list.
Modified:
lldb/trunk/include/lldb/Core/Module.h
lldb/trunk/source/Commands/CommandObjectTarget.cpp
lldb/trunk/source/Core/Module.cpp
Modified: lldb/trunk/include/lldb/Core/Module.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=137078&r1=137077&r2=137078&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Module.h (original)
+++ lldb/trunk/include/lldb/Core/Module.h Mon Aug 8 19:01:09 2011
@@ -50,6 +50,22 @@
friend class ModuleList;
friend bool ObjectFile::SetModulesArchitecture (const ArchSpec &new_arch);
+ // Static functions that can track the lifetime of moodule objects.
+ // This is handy because we might have Module objects that are in
+ // shared pointers that aren't in the global module list (from
+ // ModuleList). If this is the case we need to know about it.
+ // The modules in the global list maintained by these functions
+ // can be viewed using the "target modules list" command using the
+ // "--global" (-g for short).
+ static size_t
+ GetNumberAllocatedModules ();
+
+ static Module *
+ GetAllocatedModuleAtIndex (size_t idx);
+
+ static Mutex &
+ GetAllocationModuleCollectionMutex();
+
//------------------------------------------------------------------
/// Construct with file specification and architecture.
///
Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=137078&r1=137077&r2=137078&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Mon Aug 8 19:01:09 2011
@@ -2467,8 +2467,8 @@
public:
CommandOptions (CommandInterpreter &interpreter) :
- Options(interpreter),
- m_format_array()
+ Options(interpreter),
+ m_format_array()
{
}
@@ -2481,10 +2481,17 @@
SetOptionValue (uint32_t option_idx, const char *option_arg)
{
char short_option = (char) m_getopt_table[option_idx].val;
- uint32_t width = 0;
- if (option_arg)
- width = strtoul (option_arg, NULL, 0);
- m_format_array.push_back(std::make_pair(short_option, width));
+ if (short_option == 'g')
+ {
+ m_use_global_module_list = true;
+ }
+ else
+ {
+ uint32_t width = 0;
+ if (option_arg)
+ width = strtoul (option_arg, NULL, 0);
+ m_format_array.push_back(std::make_pair(short_option, width));
+ }
Error error;
return error;
}
@@ -2493,6 +2500,7 @@
OptionParsingStarting ()
{
m_format_array.clear();
+ m_use_global_module_list = false;
}
const OptionDefinition*
@@ -2508,6 +2516,7 @@
// Instance variables to hold the values for command options.
typedef std::vector< std::pair<char, uint32_t> > FormatWidthCollection;
FormatWidthCollection m_format_array;
+ bool m_use_global_module_list;
};
CommandObjectTargetModulesList (CommandInterpreter &interpreter) :
@@ -2548,15 +2557,35 @@
result.GetOutputStream().SetAddressByteSize(addr_byte_size);
result.GetErrorStream().SetAddressByteSize(addr_byte_size);
// Dump all sections for all modules images
- const uint32_t num_modules = target->GetImages().GetSize();
+ uint32_t num_modules = 0;
+ Mutex::Locker locker;
+ if (m_options.m_use_global_module_list)
+ {
+ locker.Reset (Module::GetAllocationModuleCollectionMutex().GetMutex());
+ num_modules = Module::GetNumberAllocatedModules();
+ }
+ else
+ num_modules = target->GetImages().GetSize();
+
if (num_modules > 0)
{
Stream &strm = result.GetOutputStream();
for (uint32_t image_idx = 0; image_idx<num_modules; ++image_idx)
{
- Module *module = target->GetImages().GetModulePointerAtIndex(image_idx);
- strm.Printf("[%3u] ", image_idx);
+ Module *module;
+ if (m_options.m_use_global_module_list)
+ {
+ module = Module::GetAllocatedModuleAtIndex(image_idx);
+ ModuleSP module_sp(module->GetSP());
+ // Show the module reference count when showing the global module index
+ strm.Printf("[%3u] ref_count = %lu ", image_idx, module_sp ? module_sp.use_count() - 1 : 0);
+ }
+ else
+ {
+ module = target->GetImages().GetModulePointerAtIndex(image_idx);
+ strm.Printf("[%3u] ", image_idx);
+ }
bool dump_object_name = false;
if (m_options.m_format_array.empty())
@@ -2663,6 +2692,7 @@
{ LLDB_OPT_SET_1, false, "basename", 'b', optional_argument, NULL, 0, eArgTypeWidth, "Display the basename with optional width for the image object file."},
{ LLDB_OPT_SET_1, false, "symfile", 's', optional_argument, NULL, 0, eArgTypeWidth, "Display the fullpath to the image symbol file with optional width."},
{ LLDB_OPT_SET_1, false, "symfile-basename", 'S', optional_argument, NULL, 0, eArgTypeWidth, "Display the basename to the image symbol file with optional width."},
+ { LLDB_OPT_SET_1, false, "global", 'g', no_argument, NULL, 0, eArgTypeNone, "Display the modules from the global module list, not just the current target."},
{ 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
};
Modified: lldb/trunk/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=137078&r1=137077&r2=137078&view=diff
==============================================================================
--- lldb/trunk/source/Core/Module.cpp (original)
+++ lldb/trunk/source/Core/Module.cpp Mon Aug 8 19:01:09 2011
@@ -20,6 +20,45 @@
using namespace lldb;
using namespace lldb_private;
+// Shared pointers to modules track module lifetimes in
+// targets and in the global module, but this collection
+// will track all module objects that are still alive
+typedef std::vector<Module *> ModuleCollection;
+
+static ModuleCollection &
+GetModuleCollection()
+{
+ static ModuleCollection g_module_collection;
+ return g_module_collection;
+}
+
+Mutex &
+Module::GetAllocationModuleCollectionMutex()
+{
+ static Mutex g_module_collection_mutex(Mutex::eMutexTypeRecursive);
+ return g_module_collection_mutex;
+}
+
+size_t
+Module::GetNumberAllocatedModules ()
+{
+ Mutex::Locker locker (GetAllocationModuleCollectionMutex());
+ return GetModuleCollection().size();
+}
+
+Module *
+Module::GetAllocatedModuleAtIndex (size_t idx)
+{
+ Mutex::Locker locker (GetAllocationModuleCollectionMutex());
+ ModuleCollection &modules = GetModuleCollection();
+ if (idx < modules.size())
+ return modules[idx];
+ return NULL;
+}
+
+
+
+
Module::Module(const FileSpec& file_spec, const ArchSpec& arch, const ConstString *object_name, off_t object_offset) :
m_mutex (Mutex::eMutexTypeRecursive),
m_mod_time (file_spec.GetModificationTime()),
@@ -38,6 +77,12 @@
m_did_init_ast (false),
m_is_dynamic_loader_module (false)
{
+ // Scope for locker below...
+ {
+ Mutex::Locker locker (GetAllocationModuleCollectionMutex());
+ GetModuleCollection().push_back(this);
+ }
+
if (object_name)
m_object_name = *object_name;
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
@@ -54,6 +99,15 @@
Module::~Module()
{
+ // Scope for locker below...
+ {
+ Mutex::Locker locker (GetAllocationModuleCollectionMutex());
+ ModuleCollection &modules = GetModuleCollection();
+ ModuleCollection::iterator end = modules.end();
+ ModuleCollection::iterator pos = std::find(modules.begin(), end, this);
+ if (pos != end)
+ modules.erase(pos);
+ }
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
if (log)
log->Printf ("%p Module::~Module((%s) '%s/%s%s%s%s')",
More information about the lldb-commits
mailing list