From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31616 invoked by alias); 8 Mar 2008 15:55:34 -0000 Received: (qmail 31605 invoked by uid 22791); 8 Mar 2008 15:55:31 -0000 X-Spam-Check-By: sourceware.org Received: from main.gmane.org (HELO ciao.gmane.org) (80.91.229.2) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 08 Mar 2008 15:55:09 +0000 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1JY1O2-0008P8-9d for gdb-patches@sources.redhat.com; Sat, 08 Mar 2008 15:55:02 +0000 Received: from 78.158.192.230 ([78.158.192.230]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 08 Mar 2008 15:55:02 +0000 Received: from ghost by 78.158.192.230 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 08 Mar 2008 15:55:02 +0000 To: gdb-patches@sources.redhat.com From: Vladimir Prus Subject: Re: [RFA] Implement -thread-info. Date: Sat, 08 Mar 2008 15:55:00 -0000 Message-ID: References: <200802171833.26673.vladimir@codesourcery.com> <200802181038.04497.vladimir@codesourcery.com> <18361.64577.771676.184618@kahikatea.snap.net.nz> <200802201427.36288.vladimir@codesourcery.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit User-Agent: KNode/0.10.5 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-03/txt/msg00065.txt.bz2 Vladimir Prus wrote: > I attach the revised version of the patch, including docs. Eli, is the > doc part OK? I intend to commit the code part in a week unless there are > objections. I have realized that while the patch is mostly about MI, it also touches generic code -- thread.c. Is that part of patch (attached again for convenience) OK? - Volodya * gdb.h (mi_info_threads): Declare. * thread.c (mi_info_threads): New, extracted from info_threads_command and adjusted to work for CLI and MI. (info_threads_command): Use mi_info_threads. * mi/mi-cmds.c (mi_cmds): Specify a handler for -thread-info. * mi/mi-cmds.h (mi_cmd_thread_info): Declare. * mi/mi-main.c (mi_cmd_thread_info): New. (mi_cmd_list_features): Include 'thread-info'. doc/ * gdb.texinfo (Thread Commands): Document -thread-info. Remove -thread-list-all-threads. --- gdb/doc/gdb.texinfo | 35 ++++++++++++------------- gdb/gdb.h | 2 + gdb/mi/mi-cmds.c | 3 +- gdb/mi/mi-cmds.h | 1 + gdb/mi/mi-main.c | 19 +++++++++++++ gdb/thread.c | 71 ++++++++++++++++++++++++++++++++++++++++----------- 6 files changed, 96 insertions(+), 35 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 722db28..f25363a 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -18851,34 +18851,33 @@ The corresponding @value{GDBN} command is @samp{pwd}. @subsubheading Synopsis @smallexample - -thread-info + -thread-info [ @var{thread-id} ] @end smallexample +Reports the information about either a specific thread, if +the @var{thread-id} parameter is present, or about all +threads. When printing information about all threads, +also reports the current thread. + @subsubheading @value{GDBN} Command -No equivalent. +The @samp{info thread} command prints the same information +about all threads. @subsubheading Example -N.A. - - -@subheading The @code{-thread-list-all-threads} Command -@findex -thread-list-all-threads - -@subsubheading Synopsis @smallexample - -thread-list-all-threads +-thread-info +^done,threads=[ +@{id="2",target-id="Thread 0xb7e14b90 (LWP 21257)", + frame=@{addr="0xffffe410",func="__kernel_vsyscall",args=[]@}, +@{id="1",target-id="Thread 0xb7e156b0 (LWP 21254)", + frame=@{addr="0x0804891f",func="foo",args=[@{name="i",value="10"@}], + file="/tmp/a.c",fullname="/tmp/a.c",line="158"@}@}], +current-thread-id="1" +(gdb) @end smallexample -@subsubheading @value{GDBN} Command - -The equivalent @value{GDBN} command is @samp{info threads}. - -@subsubheading Example -N.A. - - @subheading The @code{-thread-list-ids} Command @findex -thread-list-ids diff --git a/gdb/gdb.h b/gdb/gdb.h index fcd3e3b..13523fb 100644 --- a/gdb/gdb.h +++ b/gdb/gdb.h @@ -55,4 +55,6 @@ enum gdb_rc gdb_thread_select (struct ui_out *uiout, char *tidstr, enum gdb_rc gdb_list_thread_ids (struct ui_out *uiout, char **error_message); +extern void mi_info_threads (struct ui_out *uiout, int thread); + #endif diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c index c651694..89c6376 100644 --- a/gdb/mi/mi-cmds.c +++ b/gdb/mi/mi-cmds.c @@ -130,8 +130,7 @@ struct mi_cmd mi_cmds[] = { "target-list-current-targets", { NULL, 0 }, NULL, NULL }, { "target-list-parameters", { NULL, 0 }, NULL, NULL }, { "target-select", { NULL, 0 }, mi_cmd_target_select}, - { "thread-info", { NULL, 0 }, NULL, NULL }, - { "thread-list-all-threads", { NULL, 0 }, NULL, NULL }, + { "thread-info", { NULL, 0 }, NULL, mi_cmd_thread_info }, { "thread-list-ids", { NULL, 0 }, 0, mi_cmd_thread_list_ids}, { "thread-select", { NULL, 0 }, 0, mi_cmd_thread_select}, { "trace-actions", { NULL, 0 }, NULL, NULL }, diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index 2d0393b..6a033e5 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -105,6 +105,7 @@ extern mi_cmd_argv_ftype mi_cmd_target_file_get; extern mi_cmd_argv_ftype mi_cmd_target_file_put; extern mi_cmd_argv_ftype mi_cmd_target_file_delete; extern mi_cmd_args_ftype mi_cmd_target_select; +extern mi_cmd_argv_ftype mi_cmd_thread_info; extern mi_cmd_argv_ftype mi_cmd_thread_list_ids; extern mi_cmd_argv_ftype mi_cmd_thread_select; extern mi_cmd_argv_ftype mi_cmd_var_assign; diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 41e12d2..5d89847 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -277,6 +277,24 @@ mi_cmd_thread_list_ids (char *command, char **argv, int argc) } enum mi_cmd_result +mi_cmd_thread_info (char *command, char **argv, int argc) +{ + int thread = -1; + + if (argc != 0 && argc != 1) + { + mi_error_message = xstrprintf ("Invalid MI command"); + return MI_CMD_ERROR; + } + + if (argc == 1) + thread = atoi (argv[0]); + + mi_info_threads (uiout, thread); + return MI_CMD_DONE; +} + +enum mi_cmd_result mi_cmd_data_list_register_names (char *command, char **argv, int argc) { int regnum, numregs; @@ -1055,6 +1073,7 @@ mi_cmd_list_features (char *command, char **argv, int argc) ui_out_field_string (uiout, NULL, "frozen-varobjs"); ui_out_field_string (uiout, NULL, "pending-breakpoints"); + ui_out_field_string (uiout, NULL, "thread-info"); do_cleanups (cleanup); diff --git a/gdb/thread.c b/gdb/thread.c index 3a39703..1f4b099 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -416,15 +416,14 @@ prune_threads (void) } } -/* Print information about currently known threads - - * Note: this has the drawback that it _really_ switches - * threads, which frees the frame cache. A no-side - * effects info-threads command would be nicer. - */ - -static void -info_threads_command (char *arg, int from_tty) +/* Prints the list of threads and their details on UIOUT. + This is a version of 'info_thread_command' suitable for + use from MI. + If REQESTED_THREAD is not -1, it's the GDB id of the thread + that should be printed. Otherwise, all threads are + printed. */ +void +mi_info_threads (struct ui_out *uiout, int requested_thread) { struct thread_info *tp; ptid_t current_ptid; @@ -432,45 +431,87 @@ info_threads_command (char *arg, int from_tty) struct cleanup *old_chain; struct frame_id saved_frame_id; char *extra_info; + int current_thread = -1; /* Backup current thread and selected frame. */ saved_frame_id = get_frame_id (get_selected_frame (NULL)); old_chain = make_cleanup_restore_current_thread (inferior_ptid, saved_frame_id); + old_chain = make_cleanup_ui_out_list_begin_end (uiout, "threads"); + prune_threads (); target_find_new_threads (); current_ptid = inferior_ptid; for (tp = thread_list; tp; tp = tp->next) { + struct cleanup *chain2; + + if (requested_thread != -1 && tp->num != requested_thread) + continue; + + chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + if (ptid_equal (tp->ptid, current_ptid)) - printf_filtered ("* "); + { + current_thread = tp->num; + ui_out_text (uiout, "* "); + } else - printf_filtered (" "); + ui_out_text (uiout, " "); - printf_filtered ("%d %s", tp->num, target_tid_to_str (tp->ptid)); + ui_out_field_int (uiout, "id", tp->num); + ui_out_text (uiout, " "); + ui_out_field_string (uiout, "target-id", target_tid_to_str (tp->ptid)); extra_info = target_extra_thread_info (tp); if (extra_info) - printf_filtered (" (%s)", extra_info); - puts_filtered (" "); + ui_out_field_fmt (uiout, "details", " (%s)", extra_info); + ui_out_text (uiout, " "); /* That switch put us at the top of the stack (leaf frame). */ switch_to_thread (tp->ptid); print_stack_frame (get_selected_frame (NULL), 0, LOCATION); + + do_cleanups (chain2); } /* Restores the current thread and the frame selected before the "info threads" command. */ do_cleanups (old_chain); + if (requested_thread == -1) + { + gdb_assert (current_thread != -1); + if (ui_out_is_mi_like_p (uiout)) + ui_out_field_int (uiout, "current-thread-id", current_thread); + } + /* If case we were not able to find the original frame, print the new selected frame. */ if (frame_find_by_id (saved_frame_id) == NULL) { warning (_("Couldn't restore frame in current thread, at frame 0")); - print_stack_frame (get_selected_frame (NULL), 0, LOCATION); + /* For MI, we should probably have a notification about + current frame change. But this error is not very likely, so + don't bother for now. */ + if (!ui_out_is_mi_like_p (uiout)) + print_stack_frame (get_selected_frame (NULL), 0, LOCATION); } } + +/* Print information about currently known threads + + * Note: this has the drawback that it _really_ switches + * threads, which frees the frame cache. A no-side + * effects info-threads command would be nicer. + */ + +static void +info_threads_command (char *arg, int from_tty) +{ + mi_info_threads (uiout, -1); +} + /* Switch from one thread to another. */ void -- 1.5.3.5