summaryrefslogtreecommitdiffstats
path: root/lldb/source/Expression/ClangExpressionDeclMap.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2010-08-21 02:22:51 +0000
committerGreg Clayton <gclayton@apple.com>2010-08-21 02:22:51 +0000
commit0b76a2c21f18e78c47f2eef92256debc3a035e54 (patch)
tree0e1b907bd3d0106c726c510bd75e759a7a8789b0 /lldb/source/Expression/ClangExpressionDeclMap.cpp
parenta94e3d1124666470d6bdde8d66ab88fe5264afc5 (diff)
downloadbcm5719-llvm-0b76a2c21f18e78c47f2eef92256debc3a035e54.tar.gz
bcm5719-llvm-0b76a2c21f18e78c47f2eef92256debc3a035e54.zip
Modified the host process monitor callback function Host::StartMonitoringChildProcess
to spawn a thread for each process that is being monitored. Previously LLDB would spawn a single thread that would wait for any child process which isn't ok to do as a shared library (LLDB.framework on Mac OSX, or lldb.so on linux). The old single thread used to call wait4() with a pid of -1 which could cause it to reap child processes that it shouldn't have. Re-wrote the way Function blocks are handles. Previously I attempted to keep all blocks in a single memory allocation (in a std::vector). This made the code somewhat efficient, but hard to work with. I got rid of the old BlockList class, and went to a straight parent with children relationship. This new approach will allow for partial parsing of the blocks within a function. llvm-svn: 111706
Diffstat (limited to 'lldb/source/Expression/ClangExpressionDeclMap.cpp')
-rw-r--r--lldb/source/Expression/ClangExpressionDeclMap.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 8cacc1fae90..446490836f8 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -626,28 +626,21 @@ ClangExpressionDeclMap::FindVariableInScope(const SymbolContext &sym_ctx,
{
Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS);
- Function *function(m_sym_ctx->function);
- Block *block(m_sym_ctx->block);
-
- if (!function || !block)
+ if (m_sym_ctx->function == NULL || m_sym_ctx->block == NULL)
{
if (log)
- log->Printf("function = %p, block = %p", function, block);
+ log->Printf("function = %p, block = %p", m_sym_ctx->function, m_sym_ctx->block);
return NULL;
}
- BlockList& blocks(function->GetBlocks(true));
-
ConstString name_cs(name);
- lldb::user_id_t current_block_id;
+ Block *current_block;
- for (current_block_id = block->GetID();
- current_block_id != Block::InvalidID;
- current_block_id = blocks.GetParent(current_block_id))
- {
- Block *current_block(blocks.GetBlockByID(current_block_id));
-
+ for (current_block = m_sym_ctx->block;
+ current_block != NULL;
+ current_block = current_block->GetParent())
+ {
lldb::VariableListSP var_list = current_block->GetVariableList(false, true);
if (!var_list)
OpenPOWER on IntegriCloud