[PR,gdb/27026] CTRL-C is ignored when debug info is downloaded

Message ID 20211124014314.217675-1-amerey@redhat.com
State New
Headers show
Series
  • [PR,gdb/27026] CTRL-C is ignored when debug info is downloaded
Related show

Commit Message

Mike Frysinger via Gdb-patches Nov. 24, 2021, 1:43 a.m.
During debuginfod downloads, ctrl-c should result in the download
being cancelled and skipped.  However in some cases, ctrl-c fails to
get delivered to gdb during downloading.  This can result in downloads
being unskippable.

Fix this by ensuring that target_terminal::ours is in effect for the
duration of each download.

Co-authored-by: Tom de Vries <vries@gcc.gnu.org>
https://sourceware.org/bugzilla/show_bug.cgi?id=27026#c3
---
 gdb/debuginfod-support.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

-- 
2.33.1

Comments

Mike Frysinger via Gdb-patches Nov. 24, 2021, 7:34 a.m. | #1
On 11/24/21 2:43 AM, Aaron Merey wrote:
> During debuginfod downloads, ctrl-c should result in the download

> being cancelled and skipped.  However in some cases, ctrl-c fails to

> get delivered to gdb during downloading.  This can result in downloads

> being unskippable.

> 

> Fix this by ensuring that target_terminal::ours is in effect for the

> duration of each download.

> 

> Co-authored-by: Tom de Vries <vries@gcc.gnu.org>


Hi Aaron,

thanks for picking this up.

Please use "Tom de Vries <tdevries@suse.de>" (as listed in gdb/MAINTAINERS).

Thanks,
- Tom

> https://sourceware.org/bugzilla/show_bug.cgi?id=27026#c3

> ---

>  gdb/debuginfod-support.c | 15 +++++++++++++++

>  1 file changed, 15 insertions(+)

> 

> diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c

> index 2e1837da949..1f160e29714 100644

> --- a/gdb/debuginfod-support.c

> +++ b/gdb/debuginfod-support.c

> @@ -23,6 +23,7 @@

>  #include "gdbsupport/gdb_optional.h"

>  #include "cli/cli-cmds.h"

>  #include "cli/cli-style.h"

> +#include "target.h"

>  

>  /* Set/show debuginfod commands.  */

>  static cmd_list_element *set_debuginfod_prefix_list;

> @@ -204,6 +205,13 @@ debuginfod_source_query (const unsigned char *build_id,

>    user_data data ("source file", srcpath);

>  

>    debuginfod_set_user_data (c, &data);

> +  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;

> +  if (target_supports_terminal_ours ())

> +    {

> +      term_state.emplace ();

> +      target_terminal::ours ();

> +    }

> +

>    scoped_fd fd (debuginfod_find_source (c,

>  					build_id,

>  					build_id_len,

> @@ -242,6 +250,13 @@ debuginfod_debuginfo_query (const unsigned char *build_id,

>    user_data data ("separate debug info for", filename);

>  

>    debuginfod_set_user_data (c, &data);

> +  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;

> +  if (target_supports_terminal_ours ())

> +    {

> +      term_state.emplace ();

> +      target_terminal::ours ();

> +    }

> +

>    scoped_fd fd (debuginfod_find_debuginfo (c, build_id, build_id_len,

>  					   &dname));

>    debuginfod_set_user_data (c, nullptr);

>
Mike Frysinger via Gdb-patches Nov. 24, 2021, 8:55 p.m. | #2
On Wed, Nov 24, 2021 at 2:34 AM Tom de Vries <tdevries@suse.de> wrote:
> On 11/24/21 2:43 AM, Aaron Merey wrote:

> > During debuginfod downloads, ctrl-c should result in the download

> > being cancelled and skipped.  However in some cases, ctrl-c fails to

> > get delivered to gdb during downloading.  This can result in downloads

> > being unskippable.

> >

> > Fix this by ensuring that target_terminal::ours is in effect for the

> > duration of each download.

> >

> > Co-authored-by: Tom de Vries <vries@gcc.gnu.org>

>

> Hi Aaron,

>

> thanks for picking this up.

>

> Please use "Tom de Vries <tdevries@suse.de>" (as listed in gdb/MAINTAINERS).


Thanks Tom. Fixed.

Aaron

Patch

diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
index 2e1837da949..1f160e29714 100644
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -23,6 +23,7 @@ 
 #include "gdbsupport/gdb_optional.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-style.h"
+#include "target.h"
 
 /* Set/show debuginfod commands.  */
 static cmd_list_element *set_debuginfod_prefix_list;
@@ -204,6 +205,13 @@  debuginfod_source_query (const unsigned char *build_id,
   user_data data ("source file", srcpath);
 
   debuginfod_set_user_data (c, &data);
+  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
+  if (target_supports_terminal_ours ())
+    {
+      term_state.emplace ();
+      target_terminal::ours ();
+    }
+
   scoped_fd fd (debuginfod_find_source (c,
 					build_id,
 					build_id_len,
@@ -242,6 +250,13 @@  debuginfod_debuginfo_query (const unsigned char *build_id,
   user_data data ("separate debug info for", filename);
 
   debuginfod_set_user_data (c, &data);
+  gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
+  if (target_supports_terminal_ours ())
+    {
+      term_state.emplace ();
+      target_terminal::ours ();
+    }
+
   scoped_fd fd (debuginfod_find_debuginfo (c, build_id, build_id_len,
 					   &dname));
   debuginfod_set_user_data (c, nullptr);