From patchwork Wed Jan 13 16:34:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 10361 Received: (qmail 107249 invoked by alias); 13 Jan 2016 16:34:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 107000 invoked by uid 89); 13 Jan 2016 16:34:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.0 required=5.0 tests=BAYES_20, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=one, 2816, 3412, 2746 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 13 Jan 2016 16:34:50 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 2F79B7AEBD for ; Wed, 13 Jan 2016 16:34:49 +0000 (UTC) Received: from brno.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0DGYknG024732 for ; Wed, 13 Jan 2016 11:34:48 -0500 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/2] Star wildcard ranges (e.g., "info thread 2.*") Date: Wed, 13 Jan 2016 16:34:45 +0000 Message-Id: <1452702886-17749-3-git-send-email-palves@redhat.com> In-Reply-To: <1452702886-17749-1-git-send-email-palves@redhat.com> References: <1452702886-17749-1-git-send-email-palves@redhat.com> Add support for specifying "all threads of inferior N", by writing "*" as thread number/range in thread ID lists. E.g., "info threads 2.*" or "thread apply 2.* bt". gdb/ChangeLog: 2016-01-13 Pedro Alves * NEWS: Mention star wildcard ranges. * cli/cli-utils.c (number_range_setup_range): New function. * cli/cli-utils.h (number_range_setup_range): New declaration. * thread.c (thread_apply_command): Support star TID ranges. * tid-parse.c (tid_range_parser_finished) (tid_range_parser_string, tid_range_parser_skip) (get_tid_or_range, get_tid_or_range): Handle TID_RANGE_STATE_STAR_RANGE. (tid_range_parser_star_range): New function. * tid-parse.h (enum tid_range_state) : New value. (tid_range_parser_star_range): New declaration. gdb/doc/ChangeLog: 2016-01-13 Pedro Alves * gdb.texinfo (Threads) : Document star ranges. gdb/doc/ChangeLog: 2016-01-13 Pedro Alves * gdb.multi/tids.exp: Test star ranges. --- gdb/NEWS | 6 ++++++ gdb/cli/cli-utils.c | 15 +++++++++++++++ gdb/cli/cli-utils.h | 8 ++++++++ gdb/doc/gdb.texinfo | 39 +++++++++++++++++++++++++++++---------- gdb/testsuite/gdb.multi/tids.exp | 36 ++++++++++++++++++++++++++++++++++++ gdb/thread.c | 20 ++++++++++++++++++++ gdb/tid-parse.c | 28 +++++++++++++++++++++++++--- gdb/tid-parse.h | 7 +++++++ 8 files changed, 146 insertions(+), 13 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index d9cbb80..c00dac9 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -34,6 +34,12 @@ [Switching to thread 2.1 (Thread 0x7ffff7fc2740 (LWP 8157))] (running) (gdb) +* In commands that accept thread IDs lists, you can now refer to all + threads of an inferior using a star wildcard. GDB accepts + "INF_NUM.*", to refer to all threads of inferior INF_NUM, and "*" to + refer to all threads of the current inferior. For example, "info + threads 2.*". + * You can use "info threads -gid" to display the global thread ID of all threads. diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c index a68b67d..bf6ecae 100644 --- a/gdb/cli/cli-utils.c +++ b/gdb/cli/cli-utils.c @@ -217,6 +217,21 @@ number_is_in_list (const char *list, int number) /* See documentation in cli-utils.h. */ +void +number_range_setup_range (struct get_number_or_range_state *state, + int start_value, int end_value, const char *end_ptr) +{ + gdb_assert (start_value > 0); + + state->in_range = 1; + state->string = "-"; + state->end_ptr = end_ptr; + state->last_retval = start_value - 1; + state->end_value = end_value; +} + +/* See documentation in cli-utils.h. */ + char * remove_trailing_whitespace (const char *start, char *s) { diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h index ebf11f2..a31fff5 100644 --- a/gdb/cli/cli-utils.h +++ b/gdb/cli/cli-utils.h @@ -90,6 +90,14 @@ extern void init_number_or_range (struct get_number_or_range_state *state, extern int get_number_or_range (struct get_number_or_range_state *state); +/* Setups STATE such that get_number_or_range returns numbers in range + START_VALUE to END_VALUE. When get_number_or_range returns + END_VALUE, the STATE string is advanced to END_PTR. */ + +extern void number_range_setup_range (struct get_number_or_range_state *state, + int start_value, int end_value, + const char *end_ptr); + /* Accept a number and a string-form list of numbers such as is accepted by get_number_or_range. Return TRUE if the number is in the list. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 7da31c8..fbc76fa 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -2912,16 +2912,35 @@ of inferior 1, the initial inferior. @anchor{thread ID lists} @cindex thread ID lists Some commands accept a space-separated @dfn{thread ID list} as -argument. A list element can be a thread ID as shown in the first -field of the @samp{info threads} display, with or without an inferior -qualifier (e.g., @samp{2.1} or @samp{1}); or can be a range of thread -numbers, again with or without an inferior qualifier, as in -@var{inf1}.@var{thr1}-@var{thr2} or @var{thr1}-@var{thr2} (e.g., -@samp{1.2-4} or @samp{2-4}). For example, if the current inferior is -1, the thread list @samp{1 2-3 4.5 6.7-9} includes threads 1 to 3 of -inferior 1, thread 5 of inferior 4 and threads 7 to 9 of inferior 6. -That is, in expanded qualified form, the same as @samp{1.1 1.2 1.3 4.5 -6.7 6.8 6.9}. +argument. A list element can be: + +@enumerate +@item +a thread ID as shown in the first field of the @samp{info threads} +display, with or without an inferior qualifier. E.g., @samp{2.1} or +@samp{1}. + +@item +a range of thread numbers, again with or without an inferior +qualifier, as in @var{inf}.@var{thr1}-@var{thr2} or +@var{thr1}-@var{thr2}. E.g., @samp{1.2-4} or @samp{2-4}. + +@item +all threads of an inferior, specified with a star wildcard, with or +without an inferior qualifier, as in @var{inf}.@code{*} (e.g., +@samp{1.*}) or @code{*}. The former refers to all threads of the +given inferior, and the latter form without an inferior qualifier +refers to all threads of the current inferior. + +@end enumerate + +For example, if the current inferior is 1, and inferior 7 has one +thread with ID 7.1, the thread list @samp{1 2-3 4.5 6.7-9 7.*} +includes threads 1 to 3 of inferior 1, thread 5 of inferior 4, threads +7 to 9 of inferior 6 and all threads of inferior 7. That is, in +expanded qualified form, the same as @samp{1.1 1.2 1.3 4.5 6.7 6.8 6.9 +7.1}. + @anchor{global thread numbers} @cindex global thread number diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp index 28b15a3..0109c10 100644 --- a/gdb/testsuite/gdb.multi/tids.exp +++ b/gdb/testsuite/gdb.multi/tids.exp @@ -274,6 +274,36 @@ with_test_prefix "two inferiors" { gdb_test "thread apply \$inf.1 p 1234" \ "warning: Unknown thread 30.1" + # Star ranges. + + thr_apply_info_thr "1.*" \ + "1.1 1.2 1.3" + + thr_apply_info_thr "*" \ + "1.1 1.2 1.3" + + thr_apply_info_thr "1.* 2.1" \ + "1.1 1.2 1.3 2.1" + + thr_apply_info_thr "2.1 1.*" \ + "1.1 1.2 1.3 2.1" \ + "2.1 1.1 1.2 1.3" + + thr_apply_info_thr "1.* 2.*" \ + "1.1 1.2 1.3 2.1 2.2 2.3" + + thr_apply_info_thr "2.* 1.*" \ + "1.1 1.2 1.3 2.1 2.2 2.3" \ + "2.1 2.2 2.3 1.1 1.2 1.3" + + # There's no inferior 3, but "info threads" treats the thread list + # as a filter, so it's OK. "thread apply" complains about the + # unknown inferior through. + info_threads "1.1 3.*" \ + "1.1" + gdb_test "thread apply 1.1 3.* p 1" \ + "Thread 1.1.*warning: Unknown inferior 3" + # Now test a set of invalid thread IDs/ranges. thr_apply_info_thr_invalid "1." \ @@ -315,6 +345,11 @@ with_test_prefix "two inferiors" { thr_apply_info_thr_error "${prefix}-\$one" "negative value" thr_apply_info_thr_error "${prefix}\$minus_one" \ "negative value: ${prefix_re}\\\$minus_one" + + thr_apply_info_thr_error "${prefix}1-*" "inverted range" + thr_apply_info_thr_invalid "${prefix}*1" + thr_apply_info_thr_invalid "${prefix}*foo" + thr_apply_info_thr_invalid "${prefix}foo*" } # Check that a valid thread ID list with a missing command errors @@ -327,6 +362,7 @@ with_test_prefix "two inferiors" { gdb_test "thread apply 1-2" $output gdb_test "thread apply 1.1-2" $output gdb_test "thread apply $thr" $output + gdb_test "thread apply 1.*" $output } # Check that we do parse the inferior number and don't confuse it. diff --git a/gdb/thread.c b/gdb/thread.c index 01ce88c..c8f33f0 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1860,6 +1860,26 @@ thread_apply_command (char *tidlist, int from_tty) inf = find_inferior_id (inf_num); if (inf != NULL) tp = find_thread_id (inf, thr_num); + + if (tid_range_parser_star_range (&parser)) + { + if (inf == NULL) + { + warning (_("Unknown inferior %d"), inf_num); + tid_range_parser_skip (&parser); + continue; + } + + /* No use looking for threads past the highest thread number + the inferior ever had. */ + if (thr_num >= inf->highest_thread_num) + tid_range_parser_skip (&parser); + + /* Be quiet about unknown threads numbers. */ + if (tp == NULL) + continue; + } + if (tp == NULL) { if (show_inferior_qualified_tids () diff --git a/gdb/tid-parse.c b/gdb/tid-parse.c index 45b7ff5..809c5fe 100644 --- a/gdb/tid-parse.c +++ b/gdb/tid-parse.c @@ -134,6 +134,7 @@ tid_range_parser_finished (struct tid_range_parser *parser) case TID_RANGE_STATE_INFERIOR: return *parser->string == '\0'; case TID_RANGE_STATE_THREAD_RANGE: + case TID_RANGE_STATE_STAR_RANGE: return parser->range_parser.finished; } @@ -150,6 +151,7 @@ tid_range_parser_string (struct tid_range_parser *parser) case TID_RANGE_STATE_INFERIOR: return parser->string; case TID_RANGE_STATE_THREAD_RANGE: + case TID_RANGE_STATE_STAR_RANGE: return parser->range_parser.string; } @@ -161,7 +163,8 @@ tid_range_parser_string (struct tid_range_parser *parser) void tid_range_parser_skip (struct tid_range_parser *parser) { - gdb_assert ((parser->state == TID_RANGE_STATE_THREAD_RANGE) + gdb_assert ((parser->state == TID_RANGE_STATE_THREAD_RANGE + || parser->state == TID_RANGE_STATE_STAR_RANGE) && parser->range_parser.in_range); tid_range_parser_init (parser, parser->range_parser.end_ptr, @@ -219,7 +222,16 @@ get_tid_or_range (struct tid_range_parser *parser, int *inf_num, } init_number_or_range (&parser->range_parser, p); - parser->state = TID_RANGE_STATE_THREAD_RANGE; + if (p[0] == '*' && (p[1] == '\0' || isspace (p[1]))) + { + /* Setup the number range parser to return numbers in the + whole [1,INT_MAX] range. */ + number_range_setup_range (&parser->range_parser, 1, INT_MAX, + skip_spaces_const (p + 1)); + parser->state = TID_RANGE_STATE_STAR_RANGE; + } + else + parser->state = TID_RANGE_STATE_THREAD_RANGE; } *inf_num = parser->inf_num; @@ -247,7 +259,9 @@ get_tid_or_range (struct tid_range_parser *parser, int *inf_num, /* If we're midway through a range, and the caller wants the end value, return it and skip to the end of the range. */ - if (thr_end != NULL && parser->state == TID_RANGE_STATE_THREAD_RANGE) + if (thr_end != NULL && + (parser->state == TID_RANGE_STATE_THREAD_RANGE + || parser->state == TID_RANGE_STATE_STAR_RANGE)) { *thr_end = parser->range_parser.end_value; tid_range_parser_skip (parser); @@ -281,6 +295,14 @@ tid_range_parser_get_tid (struct tid_range_parser *parser, /* See tid-parse.h. */ int +tid_range_parser_star_range (struct tid_range_parser *parser) +{ + return parser->state == TID_RANGE_STATE_STAR_RANGE; +} + +/* See gdbthread.h. */ + +int tid_is_in_list (const char *list, int default_inferior, int inf_num, int thr_num) { diff --git a/gdb/tid-parse.h b/gdb/tid-parse.h index a690edf..830cf36 100644 --- a/gdb/tid-parse.h +++ b/gdb/tid-parse.h @@ -44,6 +44,9 @@ enum tid_range_state /* Parsing the thread number or thread number range. */ TID_RANGE_STATE_THREAD_RANGE, + + /* Parsing a star wildcard thread range. E.g., "1.*". */ + TID_RANGE_STATE_STAR_RANGE, }; /* An object of this type is passed to tid_range_parser_get_tid. It @@ -142,6 +145,10 @@ extern int tid_range_parser_get_tid_range (struct tid_range_parser *parser, int *inf_num, int *thr_start, int *thr_end); +/* Returns non-zero if processing a star wildcard (e.g., "1.*") + range. */ +extern int tid_range_parser_star_range (struct tid_range_parser *parser); + /* Returns non-zero if parsing has completed. */ extern int tid_range_parser_finished (struct tid_range_parser *parser);