From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id CD58638582BC for ; Fri, 20 Jan 2023 09:46:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD58638582BC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674208005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VPYKM/inPaEgz0ub78Z3IPCd+GHCrzFHZ0dYuU4qUXM=; b=YBBu9ijLJueBmSF26OjHmt0BxnzA8/QICdwJqDNinRmcrEiNXKogPicuiq0PT0lixsjJDH P6HjDGPhbCapki0nYT0yBeosv5smF0C0LU23SGfZ5o0H95t920/kJ1/5p733mf3dynrfGP iF/jJQK0L1rurl883wOH8Ijo23fULb4= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-332-0ZGLFB9ANDOLVRmKq4DF2w-1; Fri, 20 Jan 2023 04:46:44 -0500 X-MC-Unique: 0ZGLFB9ANDOLVRmKq4DF2w-1 Received: by mail-qt1-f200.google.com with SMTP id a13-20020ac84d8d000000b003b63a85ae73so2183356qtw.21 for ; Fri, 20 Jan 2023 01:46:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VPYKM/inPaEgz0ub78Z3IPCd+GHCrzFHZ0dYuU4qUXM=; b=QgDVUZCyxXSVFiGYUB05WWKhfFAGKQEnec3qCUaMqseyYnc92gFcU0wSSYfV1VjHWX 9Y+VHzJ9R7xs7yKzOoLtGqTpcztULnVDlXj3lbJd7adjXFsa6GZicvLmHdInd8yS4Lxg kbDrzTm7B61yS8ug1AvjDcNbMytTFRsJOXfo4yAhufENn1uGGsf13UlPxJMbSgshIR5V GRk+sahBQDVAivg8E8saywklZ4VlaGntWPbaPO14hWP2VYW0thvUKFI2V9qivXf+0XdC 7lnyBJIbpO6w3As2K+SXrFyPWbIx0V61mTbTqx3jSsEj3WPxgKzyfrRG5fJY+7mt1uAp JvUw== X-Gm-Message-State: AFqh2kq+UDR2hoeAx9AuSNpoajD/43FIty4OPv1LLxXh2v3+EBNFIdhf OnS1fOKcWDlpkRKMRb1IANanFhIL4vzSxIvN6zihEh+JpH6YY1gnxLJEWOsp4Y3cW1l1p/entTD gAiFIfqVJnEGR5sWCyUtxo2Yl9ysVMqUES8e02w2lLYeahD6pc0AFMREOMIpeGomOpv8eg8qmFg == X-Received: by 2002:a05:622a:5d86:b0:3b6:301f:7b3d with SMTP id fu6-20020a05622a5d8600b003b6301f7b3dmr19212306qtb.65.1674208003530; Fri, 20 Jan 2023 01:46:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvQLTCofZv0xoWcEPEuVhWzdUe8r6cuzabLO3GFNdKmDWxkMHYy4w9D3qg8eMDYbzwSeUt/Qw== X-Received: by 2002:a05:622a:5d86:b0:3b6:301f:7b3d with SMTP id fu6-20020a05622a5d8600b003b6301f7b3dmr19212281qtb.65.1674208003069; Fri, 20 Jan 2023 01:46:43 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id cb15-20020a05622a1f8f00b003ab43dabfb1sm7429015qtb.55.2023.01.20.01.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 01:46:42 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 4/6] gdb: error if 'thread' or 'task' keywords are overused Date: Fri, 20 Jan 2023 09:46:27 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When creating a breakpoint or watchpoint, the 'thread' and 'task' keywords can be used to create a thread or task specific breakpoint or watchpoint. Currently, a thread or task specific breakpoint can only apply for a single thread or task, if multiple threads or tasks are specified when creating the breakpoint (or watchpoint), then the last specified id will be used. The exception to the above is that when the 'thread' keyword is used during the creation of a watchpoint, GDB will give an error if 'thread' is given more than once. In this commit I propose making this behaviour consistent, if the 'thread' or 'task' keywords are used more than once when creating either a breakpoint or watchpoint, then GDB will give an error. I haven't updated the manual, we don't explicitly say that these keywords can be repeated, and (to me), given the keyword takes a single id, I don't think it makes much sense to repeat the keyword. As such, I see this more as adding a missing error to GDB, rather than making some big change. However, I have added an entry to the NEWS file as I guess it is possible that some people might hit this new error with an existing (I claim, badly written) GDB script. I've added some new tests to check for the new error. Just one test needed updating, gdb.linespec/keywords.exp, this test did use the 'thread' keyword twice, and expected the breakpoint to be created. Looking at what this test was for though, it was checking the use of '-force-condition', and I don't think that being able to repeat 'thread' was actually a critical part of this test. As such, I've updated this test to expect the error when 'thread' is repeated. --- gdb/NEWS | 9 +++++++++ gdb/breakpoint.c | 9 +++++++++ gdb/testsuite/gdb.ada/tasks.exp | 4 ++++ gdb/testsuite/gdb.linespec/keywords.exp | 10 ++++++++-- gdb/testsuite/gdb.threads/thread-specific-bp.exp | 4 ++++ gdb/testsuite/gdb.threads/watchthreads2.exp | 3 +++ 6 files changed, 37 insertions(+), 2 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index c0aac212e30..fb49f62f7e6 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -9,6 +9,15 @@ This support requires that GDB be built with Python scripting enabled. +* For the break command, multiple uses of the 'thread' or 'task' + keywords will now give an error instead of just using the thread or + task id from the last instance of the keyword. + +* For the watch command, multiple uses of the 'task' keyword will now + give an error instead of just using the task id from the last + instance of the keyword. The 'thread' keyword already gave an error + when used multiple times with the watch command, this remains unchanged. + * New commands maintenance print record-instruction [ N ] diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index b2cd89511fb..1400fd49642 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8801,6 +8801,9 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc, const char *tmptok; struct thread_info *thr; + if (*thread != -1) + error(_("You can specify only one thread.")); + tok = end_tok + 1; thr = parse_thread_id (tok, &tmptok); if (tok == tmptok) @@ -8812,6 +8815,9 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc, { char *tmptok; + if (*task != 0) + error(_("You can specify only one task.")); + tok = end_tok + 1; *task = strtol (tok, &tmptok, 0); if (tok == tmptok) @@ -10094,6 +10100,9 @@ watch_command_1 (const char *arg, int accessflag, int from_tty, { char *tmp; + if (task != 0) + error(_("You can specify only one task.")); + task = strtol (value_start, &tmp, 0); if (tmp == value_start) error (_("Junk after task keyword.")); diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index 23bf3937a20..4441d92719c 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -39,6 +39,10 @@ gdb_test "info tasks" \ "\r\n"] \ "info tasks before inserting breakpoint" +# Check that multiple uses of the 'task' keyword will give an error. +gdb_test "break break_me task 1 task 3" "You can specify only one task\\." +gdb_test "watch j task 1 task 3" "You can specify only one task\\." + # Insert a breakpoint that should stop only if task 1 stops. Since # task 1 never calls break_me, this shouldn't actually ever trigger. # The fact that this breakpoint is created _before_ the next one diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp index bff64249542..dc66e32237c 100644 --- a/gdb/testsuite/gdb.linespec/keywords.exp +++ b/gdb/testsuite/gdb.linespec/keywords.exp @@ -80,8 +80,14 @@ foreach prefix {"" "thread 1 "} { foreach suffix {"" " " " thread 1"} { foreach cond {"" " if 1"} { with_test_prefix "prefix: '$prefix', suffix: '$suffix', cond: '$cond'" { - gdb_breakpoint "main ${prefix}-force-condition${suffix}${cond}"\ - "message" + + if { [regexp thread $prefix] && [regexp thread $suffix] } { + gdb_test "break main ${prefix}-force-condition${suffix}${cond}" \ + "You can specify only one thread\\." + } else { + gdb_breakpoint "main ${prefix}-force-condition${suffix}${cond}"\ + "message" + } } } } diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp index d33b4f47258..008ae5ed05e 100644 --- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp +++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp @@ -63,6 +63,10 @@ proc check_thread_specific_breakpoint {non_stop} { return -1 } + # Check that multiple uses of 'thread' keyword give an error. + gdb_test "break main thread $start_thre thread $main_thre" \ + "You can specify only one thread\\." + # Set a thread-specific breakpoint at "main". This can't ever # be hit, but that's OK. gdb_breakpoint "main thread $start_thre" diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp index 09858aee486..a1398d668a4 100644 --- a/gdb/testsuite/gdb.threads/watchthreads2.exp +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp @@ -71,6 +71,9 @@ if { $nr_started == $NR_THREADS } { return -1 } +# Check that multiple uses of the 'thread' keyword will give an error. +gdb_test "watch x thread 1 thread 2" "You can specify only one thread\\." + # Watch X, it will be modified by all threads. # We want this watchpoint to be set *after* all threads are running. gdb_test "watch x" "Hardware watchpoint 3: x" -- 2.25.4