Public API changes:
- Completely new implementation of SBType
- Various enhancements in several other classes
Python synthetic children providers for std::vector<T>, std::list<T> and std::map<K,V>:
- these return the actual elements into the container as the children of the container
- basic template name parsing that works (hopefully) on both Clang and GCC
- find them in examples/synthetic and in the test suite in functionalities/data-formatter/data-formatter-python-synth
New summary string token ${svar :
- the syntax is just the same as in ${var but this new token lets you read the values
coming from the synthetic children provider instead of the actual children
- Python providers above provide a synthetic child len that returns the number of elements
into the container
Full bug fix for the issue in which getting byte size for a non-complete type would crash LLDB
Several other fixes, including:
- inverted the order of arguments in the ClangASTType constructor
- EvaluationPoint now only returns SharedPointer's to Target and Process
- the help text for several type subcommands now correctly indicates argument-less options as such
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@136504 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Interpreter/ScriptInterpreter.cpp b/source/Interpreter/ScriptInterpreter.cpp
index 27c7bad..94b04e7 100644
--- a/source/Interpreter/ScriptInterpreter.cpp
+++ b/source/Interpreter/ScriptInterpreter.cpp
@@ -98,7 +98,8 @@
SWIGPythonCalculateNumChildren python_swig_calc_children,
SWIGPythonGetChildAtIndex python_swig_get_child_index,
SWIGPythonGetIndexOfChildWithName python_swig_get_index_child,
- SWIGPythonCastPyObjectToSBValue python_swig_cast_to_sbvalue)
+ SWIGPythonCastPyObjectToSBValue python_swig_cast_to_sbvalue,
+ SWIGPythonUpdateSynthProviderInstance python_swig_update_provider)
{
ScriptInterpreterPython::InitializeInterpreter (python_swig_init_callback,
python_swig_breakpoint_callback,
@@ -107,7 +108,8 @@
python_swig_calc_children,
python_swig_get_child_index,
python_swig_get_index_child,
- python_swig_cast_to_sbvalue);
+ python_swig_cast_to_sbvalue,
+ python_swig_update_provider);
}
void
diff --git a/source/Interpreter/ScriptInterpreterPython.cpp b/source/Interpreter/ScriptInterpreterPython.cpp
index 82cad85..e7c68e7 100644
--- a/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/source/Interpreter/ScriptInterpreterPython.cpp
@@ -40,6 +40,7 @@
static ScriptInterpreter::SWIGPythonGetChildAtIndex g_swig_get_child_index = NULL;
static ScriptInterpreter::SWIGPythonGetIndexOfChildWithName g_swig_get_index_child = NULL;
static ScriptInterpreter::SWIGPythonCastPyObjectToSBValue g_swig_cast_to_sbvalue = NULL;
+static ScriptInterpreter::SWIGPythonUpdateSynthProviderInstance g_swig_update_provider = NULL;
static int
_check_and_flush (FILE *stream)
@@ -1307,7 +1308,7 @@
if (!valobj.get())
return NULL;
- Target *target = valobj->GetUpdatePoint().GetTarget();
+ Target *target = valobj->GetUpdatePoint().GetTargetSP().get();
if (!target)
return NULL;
@@ -1430,7 +1431,7 @@
if (!valobj.get())
return "<no object>";
- Target *target = valobj->GetUpdatePoint().GetTarget();
+ Target *target = valobj->GetUpdatePoint().GetTargetSP().get();
if (!target)
return "<no target>";
@@ -1768,6 +1769,38 @@
return ret_val;
}
+void
+ScriptInterpreterPython::UpdateSynthProviderInstance (void* implementor)
+{
+ if (!implementor)
+ return;
+
+ if (!g_swig_update_provider)
+ return;
+
+ ScriptInterpreterPython *python_interpreter = this;
+
+ FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
+ if (CurrentThreadHasPythonLock())
+ {
+ python_interpreter->EnterSession ();
+ g_swig_update_provider (implementor);
+ python_interpreter->LeaveSession ();
+ }
+ else
+ {
+ while (!GetPythonLock (1))
+ fprintf (tmp_fh,
+ "Python interpreter locked on another thread; waiting to acquire lock...\n");
+ python_interpreter->EnterSession ();
+ g_swig_update_provider (implementor);
+ python_interpreter->LeaveSession ();
+ ReleasePythonLock ();
+ }
+
+ return;
+}
+
lldb::SBValue*
ScriptInterpreterPython::CastPyObjectToSBValue (void* data)
{
@@ -1811,7 +1844,8 @@
SWIGPythonCalculateNumChildren python_swig_calc_children,
SWIGPythonGetChildAtIndex python_swig_get_child_index,
SWIGPythonGetIndexOfChildWithName python_swig_get_index_child,
- SWIGPythonCastPyObjectToSBValue python_swig_cast_to_sbvalue)
+ SWIGPythonCastPyObjectToSBValue python_swig_cast_to_sbvalue,
+ SWIGPythonUpdateSynthProviderInstance python_swig_update_provider)
{
g_swig_init_callback = python_swig_init_callback;
g_swig_breakpoint_callback = python_swig_breakpoint_callback;
@@ -1821,6 +1855,7 @@
g_swig_get_child_index = python_swig_get_child_index;
g_swig_get_index_child = python_swig_get_index_child;
g_swig_cast_to_sbvalue = python_swig_cast_to_sbvalue;
+ g_swig_update_provider = python_swig_update_provider;
}
void