From patchwork Tue Apr 23 13:22:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88912 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E694C384AB47 for ; Tue, 23 Apr 2024 13:26:10 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 78A0C3858404 for ; Tue, 23 Apr 2024 13:25:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78A0C3858404 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 78A0C3858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713878727; cv=none; b=QZ+tBfStGGIko1YvLwes0DZkvmrLZsIX4TbFrHKoKvhLpgqN+4AG5ieDvSshZ8pvtluQsORDkcp/v5PupWq25qop+czsLMRhd6xf+HfihVIkRS9Z1KgBbOsOvhtsqRwRNvVF10qaWsDXtzdyn1zFh1yzk/OpPwEY9LllLjzXZmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713878727; c=relaxed/simple; bh=nQOnjN0PWGysKCF5vGFrQzfhDs0lYxFZVN117e+JZCs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sF11fa+eJV7sehSQKsEgqHCswbWDcPISo3m1g225qvKJVRR9utOSdi/KXtLEhZ2/UCJMQfhy2Fst8HQaXu1tCj3yHebo3683f9w6SoIttSwxLa5T6sCXMVwz6IdIDG9+EBkAC0Xp0wQ+2x2kPTZoBjOxDZmzVzkvwRhZlqlCpqc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 43NDPJWN056476 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Apr 2024 09:25:24 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 43NDPJWN056476 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1713878725; bh=/zXwp5aiiHD9vWFyWj7Lwl1tz94hymPUaPuiLMEEGRI=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=slRBGJ/IRTw8E8qGat56M4JZPKG1wK3luhewEw7mPLyfUWAawqEji3FOzX0Kmmv0f aipOFMHuyphSlOxZGHqnoh9Wkj2yNjvC5ZB6EbiMO/PCdCOGepNA+H/zvxJW0FKntI Y7fqEKaNrbvQCdyy5iCtfLgdsRI4d6ArKwgleIwA= Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id ABCC11E0C1; Tue, 23 Apr 2024 09:25:19 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/7] gdb: change type of quit_flag to bool Date: Tue, 23 Apr 2024 09:22:58 -0400 Message-ID: <20240423132517.2625632-4-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423132517.2625632-1-simon.marchi@polymtl.ca> References: <20240423132517.2625632-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 23 Apr 2024 13:25:19 +0000 X-Spam-Status: No, score=-3188.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Change-Id: I7dc5189ee172e82ef5b2c4a739c011f43a84258b --- gdb/event-top.c | 4 ++-- gdb/extension.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index 6a2a75fe3dc8..8411ec5028a5 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -1113,7 +1113,7 @@ handle_sigint (int sig) /* We could be running in a loop reading in symfiles or something so it may be quite a while before we get back to the event loop. So - set quit_flag to 1 here. Then if QUIT is called before we get to + set quit_flag to true here. Then if QUIT is called before we get to the event loop, we will unwind as expected. */ set_quit_flag (); @@ -1193,7 +1193,7 @@ handle_sigterm (int sig) void async_request_quit (gdb_client_data arg) { - /* If the quit_flag has gotten reset back to 0 by the time we get + /* If the quit_flag has gotten reset back to false by the time we get back here, that means that an exception was thrown to unwind the current command before we got back to the event loop. So there is no reason to call quit again here. */ diff --git a/gdb/extension.c b/gdb/extension.c index 82d37fb09aea..99e7190d80b6 100644 --- a/gdb/extension.c +++ b/gdb/extension.c @@ -663,7 +663,7 @@ static std::recursive_mutex ext_lang_mutex; /* This flag tracks quit requests when we haven't called out to an extension language. it also holds quit requests when we transition to an extension language that doesn't have cooperative SIGINT handling. */ -static int quit_flag; +static bool quit_flag; /* The current extension language we've called out to, or extension_language_gdb if there isn't one. @@ -877,7 +877,7 @@ set_quit_flag () active_ext_lang->ops->set_quit_flag (active_ext_lang); else { - quit_flag = 1; + quit_flag = true; /* Now wake up the event loop, or any interruptible_select. Do this after setting the flag, because signals on Windows @@ -914,7 +914,7 @@ check_quit_flag () interruptible_select. The caller handles the quit request. */ quit_serial_event_clear (); - quit_flag = 0; + quit_flag = false; result = true; }