From: Pedro Alves <palves@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 22/25] Make main_ui be heap allocated
Date: Mon, 21 Mar 2016 15:21:00 -0000 [thread overview]
Message-ID: <1458573675-15478-23-git-send-email-palves@redhat.com> (raw)
In-Reply-To: <1458573675-15478-1-git-send-email-palves@redhat.com>
This is preparation for being able to create more than one UI object.
The change to gdb_main to stop using catch_errors is necessary because
catch_errors references current_uiout, which expands to
current_ui->m_current_ui, which would crash because current_ui is not
initialized yet at that point. It didn't trigger earlier in the
series because before this patch, main_ui/current_ui always start out
non-NULL.
---
gdb/event-top.c | 7 +++----
gdb/main.c | 27 ++++++++++++---------------
gdb/top.c | 37 +++++++++++++++++++++++++++++++++++++
gdb/top.h | 5 +++++
4 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 436edf7..69f6be7 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -362,11 +362,10 @@ top_level_prompt (void)
return xstrdup (prompt);
}
-static struct ui main_ui_;
-struct ui *main_ui = &main_ui_;
-struct ui *current_ui = &main_ui_;
-struct ui *ui_list = &main_ui_;
+struct ui *main_ui;
+struct ui *current_ui;
+struct ui *ui_list;
void
restore_ui_cleanup (void *data)
diff --git a/gdb/main.c b/gdb/main.c
index e107f60..95578e4 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -441,7 +441,6 @@ DEF_VEC_O (cmdarg_s);
static int
captured_main (void *data)
{
- struct ui *ui = current_ui;
struct captured_main_args *context = (struct captured_main_args *) data;
int argc = context->argc;
char **argv = context->argv;
@@ -513,26 +512,15 @@ captured_main (void *data)
clear_quit_flag ();
saved_command_line = (char *) xstrdup ("");
- ui->instream = stdin;
- ui->outstream = stdout;
- ui->errstream = stderr;
-
- ui->input_fd = fileno (stdin);
-
- ui->prompt_state = PROMPT_NEEDED;
-
#ifdef __MINGW32__
/* Ensure stderr is unbuffered. A Cygwin pty or pipe is implemented
as a Windows pipe, and Windows buffers on pipes. */
setvbuf (stderr, NULL, _IONBF, BUFSIZ);
#endif
- gdb_stdout = stdio_fileopen (stdout);
- gdb_stderr = stderr_fileopen (stderr);
+ main_ui = new_ui (stdin, stdout, stderr);
+ current_ui = main_ui;
- gdb_stdlog = gdb_stderr; /* for moment */
- gdb_stdtarg = gdb_stderr; /* for moment */
- gdb_stdin = stdio_fileopen (stdin);
gdb_stdtargerr = gdb_stderr; /* for moment */
gdb_stdtargin = gdb_stdin; /* for moment */
@@ -1173,7 +1161,16 @@ captured_main (void *data)
int
gdb_main (struct captured_main_args *args)
{
- catch_errors (captured_main, args, "", RETURN_MASK_ALL);
+ TRY
+ {
+ captured_main (args);
+ }
+ CATCH (ex, RETURN_MASK_ALL)
+ {
+ exception_print (gdb_stderr, ex);
+ }
+ END_CATCH
+
/* The only way to end up here is by an error (normal exit is
handled by quit_force()), hence always return an error status. */
return 1;
diff --git a/gdb/top.c b/gdb/top.c
index 2941dbd..12064bc 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -245,6 +245,43 @@ void (*deprecated_call_command_hook) (struct cmd_list_element * c,
void (*deprecated_context_hook) (int id);
+static int highest_ui_num;
+
+struct ui *
+new_ui (FILE *instream, FILE *outstream, FILE *errstream)
+{
+ struct ui *ui;
+
+ ui = XCNEW (struct ui);
+
+ ui->num = ++highest_ui_num;
+ ui->instream = instream;
+ ui->outstream = outstream;
+ ui->errstream = errstream;
+
+ ui->input_fd = fileno (ui->instream);
+
+ ui->m_gdb_stdin = stdio_fileopen (ui->instream);
+ ui->m_gdb_stdout = stdio_fileopen (ui->outstream);
+ ui->m_gdb_stderr = stderr_fileopen (ui->errstream);
+ ui->m_gdb_stdlog = ui->m_gdb_stderr;
+
+ ui->prompt_state = PROMPT_NEEDED;
+
+ if (ui_list == NULL)
+ ui_list = ui;
+ else
+ {
+ struct ui *last;
+
+ for (last = ui_list; last->next != NULL; last = last->next)
+ ;
+ last->next = ui;
+ }
+
+ return ui;
+}
+
/* Handler for SIGHUP. */
#ifdef SIGHUP
diff --git a/gdb/top.h b/gdb/top.h
index 29deb3f..df76204 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -56,6 +56,9 @@ struct ui
{
struct ui *next;
+ /* Convenient handle (UI number). Unique across all UIs. */
+ int num;
+
/* The UI's command line buffer. This is to used to accumulate
input until we have a whole command line. */
struct buffer line_buffer;
@@ -157,6 +160,8 @@ extern void switch_thru_all_uis_next (struct switch_thru_all_uis *state);
#define ALL_UIS(UI) \
for (UI = ui_list; UI; UI = UI->next) \
+extern struct ui *new_ui (FILE *instream, FILE *outstream, FILE *errstream);
+
extern void restore_ui_cleanup (void *data);
/* From top.c. */
--
2.5.0
next prev parent reply other threads:[~2016-03-21 15:21 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 15:21 [PATCH v2 00/25] Towards great frontend GDB consoles Pedro Alves
2016-03-21 15:21 ` [PATCH v2 01/25] Introduce "struct ui" Pedro Alves
2016-03-21 15:21 ` [PATCH v2 12/25] Make command line editing (use of readline) be per UI Pedro Alves
2016-03-21 15:21 ` Pedro Alves [this message]
2016-03-22 10:14 ` [PATCH v2 22/25] Make main_ui be heap allocated Yao Qi
2016-05-06 11:50 ` Pedro Alves
2016-03-21 15:21 ` [PATCH v2 02/25] Make gdb_stdout&co be per UI Pedro Alves
2016-03-21 15:21 ` [PATCH v2 03/25] Make the interpreters " Pedro Alves
2016-03-21 15:22 ` [PATCH v2 24/25] Add new command to create extra console/mi UI channels Pedro Alves
2016-03-21 16:31 ` Eli Zaretskii
2016-03-21 16:51 ` Pedro Alves
2016-03-21 17:12 ` Eli Zaretskii
2016-03-21 17:57 ` Pedro Alves
2016-05-26 11:43 ` Pedro Alves
2016-05-26 15:46 ` Eli Zaretskii
2016-05-26 16:03 ` Pedro Alves
2016-05-26 16:36 ` Eli Zaretskii
2016-05-26 16:41 ` Pedro Alves
2016-03-21 15:22 ` [PATCH v2 13/25] Always process target events in the main UI Pedro Alves
2016-03-22 10:26 ` Yao Qi
2016-05-06 11:53 ` Pedro Alves
2016-03-21 15:22 ` [PATCH v2 18/25] Replace the sync_execution global with a new enum prompt_state tristate Pedro Alves
2016-03-21 15:26 ` [PATCH v2 10/25] Delete def_uiout Pedro Alves
2016-03-21 15:26 ` [PATCH v2 08/25] Make input_fd be per UI Pedro Alves
2016-03-22 9:46 ` Yao Qi
2016-05-06 11:53 ` Pedro Alves
2016-03-21 15:27 ` [PATCH v2 23/25] Handle UI terminal closed Pedro Alves
2016-03-21 15:27 ` [PATCH v2 09/25] Make outstream be per UI Pedro Alves
2016-03-21 15:27 ` [PATCH v2 15/25] Introduce display_mi_prompt Pedro Alves
2016-03-21 15:27 ` [PATCH v2 21/25] Only send sync execution command output to the UI that ran the command Pedro Alves
2016-03-21 15:29 ` [PATCH v2 05/25] Make the intepreters output to all UIs Pedro Alves
2016-03-22 9:33 ` Yao Qi
2016-05-06 12:19 ` Pedro Alves
2016-03-21 15:29 ` [PATCH v2 16/25] Simplify starting the command event loop Pedro Alves
2016-03-21 15:29 ` [PATCH v2 11/25] Make current_ui_out be per UI Pedro Alves
2016-03-21 15:29 ` [PATCH v2 04/25] Introduce interpreter factories Pedro Alves
2016-03-22 8:55 ` Yao Qi
2016-05-06 11:49 ` Pedro Alves
2016-03-21 15:29 ` [PATCH v2 17/25] Make gdb_in_secondary_prompt_p() be per UI Pedro Alves
2016-03-21 15:30 ` [PATCH v2 20/25] Push thread->control.command_interp to the struct thread_fsm Pedro Alves
2016-03-21 15:30 ` [PATCH v2 25/25] Add command to list UIs Pedro Alves
2016-03-22 10:36 ` Yao Qi
2016-05-06 11:49 ` Pedro Alves
2016-03-21 15:30 ` [PATCH v2 19/25] New function should_print_stop_to_console Pedro Alves
2016-03-21 15:30 ` [PATCH v2 07/25] Make instream and serial_stdin be per UI Pedro Alves
2016-03-21 15:30 ` [PATCH v2 06/25] Always run async signal handlers in the main UI Pedro Alves
2016-03-21 15:39 ` [PATCH v2 14/25] Make target_terminal_inferior/ours almost nops on non-main UIs Pedro Alves
2016-03-21 16:34 ` [PATCH v2 00/25] Towards great frontend GDB consoles Eli Zaretskii
2016-03-21 17:02 ` Pedro Alves
2016-03-21 17:17 ` Eli Zaretskii
2016-03-21 17:43 ` Marc Khouzam
2016-03-21 18:35 ` Marc Khouzam
2016-03-21 18:51 ` Pedro Alves
2016-03-21 19:06 ` Marc Khouzam
2016-03-21 19:12 ` Pedro Alves
2016-05-06 12:58 ` Pedro Alves
2016-03-22 10:41 ` Yao Qi
2016-05-06 11:58 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458573675-15478-23-git-send-email-palves@redhat.com \
--to=palves@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).