[Lldb-commits] [lldb] r167592 - in /lldb/trunk: include/lldb/Core/ModuleList.h include/lldb/Target/Target.h source/Core/ModuleList.cpp source/Target/Target.cpp
Enrico Granata
egranata at apple.com
Thu Nov 8 11:16:04 PST 2012
Author: enrico
Date: Thu Nov 8 13:16:03 2012
New Revision: 167592
URL: http://llvm.org/viewvc/llvm-project?rev=167592&view=rev
Log:
Minor cleanups to the new ModuleList notification APIs: passing in the ModuleList as part of the callbacks, and not copying the notifier as part of copy constructing and assigning
Modified:
lldb/trunk/include/lldb/Core/ModuleList.h
lldb/trunk/include/lldb/Target/Target.h
lldb/trunk/source/Core/ModuleList.cpp
lldb/trunk/source/Target/Target.cpp
Modified: lldb/trunk/include/lldb/Core/ModuleList.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=167592&r1=167591&r2=167592&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ModuleList.h (original)
+++ lldb/trunk/include/lldb/Core/ModuleList.h Thu Nov 8 13:16:03 2012
@@ -32,14 +32,14 @@
{
public:
virtual void
- ModuleAdded (const lldb::ModuleSP& module_sp) = 0;
+ ModuleAdded (const ModuleList& module_list, const lldb::ModuleSP& module_sp) = 0;
virtual void
- ModuleRemoved (const lldb::ModuleSP& module_sp) = 0;
+ ModuleRemoved (const ModuleList& module_list, const lldb::ModuleSP& module_sp) = 0;
virtual void
- ModuleUpdated (const lldb::ModuleSP& old_module_sp,
+ ModuleUpdated (const ModuleList& module_list, const lldb::ModuleSP& old_module_sp,
const lldb::ModuleSP& new_module_sp) = 0;
virtual void
- WillClearList () = 0;
+ WillClearList (const ModuleList& module_list) = 0;
virtual
~Notifier ()
Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=167592&r1=167591&r2=167592&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Thu Nov 8 13:16:03 2012
@@ -621,16 +621,17 @@
//------------------------------------------------------------------
virtual void
- ModuleAdded (const lldb::ModuleSP& module_sp);
+ ModuleAdded (const ModuleList& module_list, const lldb::ModuleSP& module_sp);
virtual void
- ModuleRemoved (const lldb::ModuleSP& module_sp);
+ ModuleRemoved (const ModuleList& module_list, const lldb::ModuleSP& module_sp);
virtual void
- ModuleUpdated (const lldb::ModuleSP& old_module_sp,
+ ModuleUpdated (const ModuleList& module_list,
+ const lldb::ModuleSP& old_module_sp,
const lldb::ModuleSP& new_module_sp);
virtual void
- WillClearList ();
+ WillClearList (const ModuleList& module_list);
public:
Modified: lldb/trunk/source/Core/ModuleList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ModuleList.cpp?rev=167592&r1=167591&r2=167592&view=diff
==============================================================================
--- lldb/trunk/source/Core/ModuleList.cpp (original)
+++ lldb/trunk/source/Core/ModuleList.cpp Thu Nov 8 13:16:03 2012
@@ -45,7 +45,6 @@
Mutex::Locker lhs_locker(m_modules_mutex);
Mutex::Locker rhs_locker(rhs.m_modules_mutex);
m_modules = rhs.m_modules;
- m_notifier = rhs.m_notifier;
}
ModuleList::ModuleList (ModuleList::Notifier* notifier) :
@@ -66,7 +65,6 @@
Mutex::Locker lhs_locker(m_modules_mutex);
Mutex::Locker rhs_locker(rhs.m_modules_mutex);
m_modules = rhs.m_modules;
- m_notifier = rhs.m_notifier;
}
return *this;
}
@@ -86,7 +84,7 @@
Mutex::Locker locker(m_modules_mutex);
m_modules.push_back(module_sp);
if (use_notifier && m_notifier)
- m_notifier->ModuleAdded(module_sp);
+ m_notifier->ModuleAdded(*this, module_sp);
}
}
@@ -170,7 +168,7 @@
{
m_modules.erase (pos);
if (use_notifier && m_notifier)
- m_notifier->ModuleRemoved(module_sp);
+ m_notifier->ModuleRemoved(*this, module_sp);
return true;
}
}
@@ -184,7 +182,7 @@
ModuleSP module_sp(*pos);
collection::iterator retval = m_modules.erase(pos);
if (use_notifier && m_notifier)
- m_notifier->ModuleRemoved(module_sp);
+ m_notifier->ModuleRemoved(*this, module_sp);
return retval;
}
@@ -201,7 +199,7 @@
return false;
AppendImpl (new_module_sp, false);
if (m_notifier)
- m_notifier->ModuleUpdated(old_module_sp,new_module_sp);
+ m_notifier->ModuleUpdated(*this, old_module_sp,new_module_sp);
return true;
}
@@ -293,7 +291,7 @@
{
Mutex::Locker locker(m_modules_mutex);
if (use_notifier && m_notifier)
- m_notifier->WillClearList();
+ m_notifier->WillClearList(*this);
m_modules.clear();
}
Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=167592&r1=167591&r2=167592&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Thu Nov 8 13:16:03 2012
@@ -1059,31 +1059,31 @@
}
void
-Target::WillClearList ()
+Target::WillClearList (const ModuleList& module_list)
{
}
void
-Target::ModuleAdded (const ModuleSP &module_sp)
+Target::ModuleAdded (const ModuleList& module_list, const ModuleSP &module_sp)
{
// A module is being added to this target for the first time
- ModuleList module_list;
- module_list.Append(module_sp);
+ ModuleList my_module_list;
+ my_module_list.Append(module_sp);
LoadScriptingResourceForModule(module_sp, this);
- ModulesDidLoad (module_list);
+ ModulesDidLoad (my_module_list);
}
void
-Target::ModuleRemoved (const ModuleSP &module_sp)
+Target::ModuleRemoved (const ModuleList& module_list, const ModuleSP &module_sp)
{
// A module is being added to this target for the first time
- ModuleList module_list;
- module_list.Append(module_sp);
- ModulesDidUnload (module_list);
+ ModuleList my_module_list;
+ my_module_list.Append(module_sp);
+ ModulesDidUnload (my_module_list);
}
void
-Target::ModuleUpdated (const ModuleSP &old_module_sp, const ModuleSP &new_module_sp)
+Target::ModuleUpdated (const ModuleList& module_list, const ModuleSP &old_module_sp, const ModuleSP &new_module_sp)
{
// A module is replacing an already added module
m_breakpoint_list.UpdateBreakpointsWhenModuleIsReplaced(old_module_sp, new_module_sp);
More information about the lldb-commits
mailing list