[PATCH] gdb/dwarf: add some QUIT macros

[PATCH] gdb/dwarf: add some QUIT macros

[Simon Marchi]

While testing the fix for PR 29105, I noticed I couldn't ctrl-C my way
out of GDB expanding many symtabs.  GDB was busy in a loop in
cooked_index_functions::expand_symtabs_matching.  Add a QUIT there.  I
also happened to see a spot in
cooked_index_functions::expand_matching_symbols where a QUIT would be
useful too, since we iterate over a potentially big number of index
entries and expand CUs in the loop.  Add one there too.

Change-Id: Ie1d650381df7f944c16d841b3e592d2dce7306c3
---
 gdb/dwarf2/read.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 87c0914d8395..dd7fea400275 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -18653,6 +18653,8 @@ cooked_index_functions::expand_matching_symbols
        (per_objfile->per_bfd->index_table.get ()));
   for (const cooked_index_entry *entry : table->all_entries ())
     {
+      QUIT;
+
       if (entry->parent_entry != nullptr)
 	continue;
 
@@ -18728,6 +18730,8 @@ cooked_index_functions::expand_symtabs_matching
       for (const cooked_index_entry *entry : table->find (name_vec.back (),
 							  completing))
 	{
+	  QUIT;
+
 	  /* No need to consider symbols from expanded CUs.  */
 	  if (per_objfile->symtab_set_p (entry->per_cu))
 	    continue;
-- 
2.38.1

Re: [PATCH] gdb/dwarf: add some QUIT macros

[Kevin Buettner]

On Thu,  1 Dec 2022 11:01:44 -0500
Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:

> While testing the fix for PR 29105, I noticed I couldn't ctrl-C my way
> out of GDB expanding many symtabs.  GDB was busy in a loop in
> cooked_index_functions::expand_symtabs_matching.  Add a QUIT there.  I
> also happened to see a spot in
> cooked_index_functions::expand_matching_symbols where a QUIT would be
> useful too, since we iterate over a potentially big number of index
> entries and expand CUs in the loop.  Add one there too.

LGTM.

Kevin

Re: [PATCH] gdb/dwarf: add some QUIT macros

[Simon Marchi]

On 12/1/22 11:27, Kevin Buettner via Gdb-patches wrote:
> On Thu,  1 Dec 2022 11:01:44 -0500
> Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:
> 
>> While testing the fix for PR 29105, I noticed I couldn't ctrl-C my way
>> out of GDB expanding many symtabs.  GDB was busy in a loop in
>> cooked_index_functions::expand_symtabs_matching.  Add a QUIT there.  I
>> also happened to see a spot in
>> cooked_index_functions::expand_matching_symbols where a QUIT would be
>> useful too, since we iterate over a potentially big number of index
>> entries and expand CUs in the loop.  Add one there too.
> 
> LGTM.
> 
> Kevin
> 

Thanks, pushed!

Simon