From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mTeuLM1IqGoruQwAWB0awg (envelope-from ) for ; Mon, 14 Sep 2026 15:19:41 -0400 Received: by simark.ca (Postfix, from userid 112) id B434F1E051; Mon, 14 Sep 2026 15:19:41 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (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 ESMTPS id 39DE31E066 for ; Mon, 14 Sep 2026 15:19:39 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4EC4B4BB24C9 for ; Mon, 14 Sep 2026 19:19:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4EC4B4BB24C9 Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id EC8944B9DB5F for ; Mon, 14 Sep 2026 19:19:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC8944B9DB5F Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EC8944B9DB5F Authentication-Results: sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789413553; cv=none; b=lqG1S85qcpF3qFk30vCBuEFks1tlv4LIfRI0BagrgT625DTsJZ7ebQg9pFa6b/IhfHzM2rJ7IIhUGnxVRmIl7CLLQJA5DwLEqBdreRJzkhfWoEPmP+hLNKbO8ryDN0uySfWA46Xov1Ui77EoJsssX9Jv6ft8No+wkke8FRSgRug= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789413553; c=relaxed/simple; bh=T8Snn0X7SwfCgGglUvTpQLLZL7I6ebjpY3mY4gLh7PM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=D2B7bYrY7brW/Sgt3G5paoZeTdaR6kk1ue2LUM0g4hsKATM+2dUlm9un6RtoGlrH7ewoTIheIZhCq+Fyg5cUTDn7xTi0WYaSMrA773ase8ymwDtMQdc9DxXo/0WiU1KyGop8LYGvwCRYgVY0NtNzVlclnWDtnSdJNzF4QvysV2c= ARC-Authentication-Results: i=1; sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC8944B9DB5F Received: by simark.ca (Postfix) id B557A1E066; Mon, 14 Sep 2026 15:19:10 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/4] gdb/python: rename evregpy_no_listeners_p to evregpy_has_listeners_p Date: Mon, 14 Sep 2026 15:19:03 -0400 Message-ID: <20260914191908.557014-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260914191908.557014-1-simon.marchi@efficios.com> References: <20260914191908.557014-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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~public-inbox=simark.ca@sourceware.org Most call sites of evregpy_no_listeners_p do: !evregpy_no_listeners_p (...) Rename the function to evregpy_has_listeners_p, to avoid the double negative. Of course, other spots have to change from evregpy_no_listeners_p (...) to !evregpy_has_listeners_p (...) ... but I think it's clearer than the other way around. While at it, fix the function comment, which described the function as returning a number of listeners, and move it to the header file. Change-Id: I07c8c3fc8b5d246559d4fafdcd2ad94957475b34 --- gdb/python/py-breakpoint.c | 6 +++--- gdb/python/py-connection.c | 2 +- gdb/python/py-continueevent.c | 2 +- gdb/python/py-corefile.c | 2 +- gdb/python/py-events.h | 5 ++++- gdb/python/py-evtregistry.c | 7 +++---- gdb/python/py-exitedevent.c | 2 +- gdb/python/py-inferior.c | 8 ++++---- gdb/python/py-infevents.c | 6 +++--- gdb/python/py-newobjfileevent.c | 6 +++--- gdb/python/py-progspace.c | 4 ++-- gdb/python/py-stopevent.c | 2 +- gdb/python/py-threadevent.c | 2 +- gdb/python/py-tui.c | 2 +- gdb/python/python.c | 4 ++-- 15 files changed, 31 insertions(+), 29 deletions(-) diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 2db756111d68..02fd00b1008a 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -1263,7 +1263,7 @@ gdbpy_breakpoint_created (struct breakpoint *bp) gdbpy_print_stack (); } - if (!evregpy_no_listeners_p (gdb_py_events.breakpoint_created) + if (evregpy_has_listeners_p (gdb_py_events.breakpoint_created) && evpy_emit_event (newbp, gdb_py_events.breakpoint_created) < 0) gdbpy_print_stack (); } @@ -1289,7 +1289,7 @@ gdbpy_breakpoint_deleted (struct breakpoint *b) if (bp_obj->is_finish_bp) bpfinishpy_pre_delete_hook (bp_obj.get ()); - if (!evregpy_no_listeners_p (gdb_py_events.breakpoint_deleted) + if (evregpy_has_listeners_p (gdb_py_events.breakpoint_deleted) && evpy_emit_event (bp_obj, gdb_py_events.breakpoint_deleted) < 0) gdbpy_print_stack (); @@ -1317,7 +1317,7 @@ gdbpy_breakpoint_modified (struct breakpoint *b) PyObject *bp_obj = bp->py_bp_object; if (bp_obj != nullptr - && !evregpy_no_listeners_p (gdb_py_events.breakpoint_modified) + && evregpy_has_listeners_p (gdb_py_events.breakpoint_modified) && evpy_emit_event (bp_obj, gdb_py_events.breakpoint_modified) < 0) gdbpy_print_stack (); } diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c index 8f476d4461d9..c382e2ee2bcb 100644 --- a/gdb/python/py-connection.c +++ b/gdb/python/py-connection.c @@ -160,7 +160,7 @@ connpy_connection_removed (process_stratum_target *target) gdbpy_enter enter_py; - if (!evregpy_no_listeners_p (gdb_py_events.connection_removed) + if (evregpy_has_listeners_p (gdb_py_events.connection_removed) && emit_connection_event (target, gdb_py_events.connection_removed) < 0) gdbpy_print_stack (); diff --git a/gdb/python/py-continueevent.c b/gdb/python/py-continueevent.c index 48c24cc710d5..408e48eef595 100644 --- a/gdb/python/py-continueevent.c +++ b/gdb/python/py-continueevent.c @@ -46,7 +46,7 @@ create_continue_event_object (ptid_t ptid) int emit_continue_event (ptid_t ptid) { - if (evregpy_no_listeners_p (gdb_py_events.cont)) + if (!evregpy_has_listeners_p (gdb_py_events.cont)) return 0; gdbpy_ref<> event = create_continue_event_object (ptid); diff --git a/gdb/python/py-corefile.c b/gdb/python/py-corefile.c index 58eac984feb8..e19ad80fabd8 100644 --- a/gdb/python/py-corefile.c +++ b/gdb/python/py-corefile.c @@ -332,7 +332,7 @@ static int emit_corefile_changed_event (inferior *inf) { /* If there are no listeners then we are done. */ - if (evregpy_no_listeners_p (gdb_py_events.corefile_changed)) + if (!evregpy_has_listeners_p (gdb_py_events.corefile_changed)) return 0; gdbpy_ref<> event_obj diff --git a/gdb/python/py-events.h b/gdb/python/py-events.h index 169a5f4a4dbe..066ba63c3933 100644 --- a/gdb/python/py-events.h +++ b/gdb/python/py-events.h @@ -52,6 +52,9 @@ struct events_object extern events_object gdb_py_events; extern eventregistry_object *create_eventregistry_object (void); -extern bool evregpy_no_listeners_p (eventregistry_object *registry); + +/* Return true if at least one listener is connected to REGISTRY. */ + +extern bool evregpy_has_listeners_p (eventregistry_object *registry); #endif /* GDB_PYTHON_PY_EVENTS_H */ diff --git a/gdb/python/py-evtregistry.c b/gdb/python/py-evtregistry.c index 8d2a68da2a4c..018f4aa04d61 100644 --- a/gdb/python/py-evtregistry.c +++ b/gdb/python/py-evtregistry.c @@ -106,15 +106,14 @@ gdbpy_initialize_eventregistry () return gdbpy_type_ready (&eventregistry_object_type); } -/* Return the number of listeners currently connected to this - registry. */ +/* See py-events.h. */ bool -evregpy_no_listeners_p (eventregistry_object *registry) +evregpy_has_listeners_p (eventregistry_object *registry) { /* REGISTRY can be nullptr if gdb failed to find the data directory at startup. */ - return registry == nullptr || PyList_Size (registry->callbacks) == 0; + return registry != nullptr && PyList_Size (registry->callbacks) > 0; } GDBPY_INITIALIZE_FILE (gdbpy_initialize_eventregistry); diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c index 83ccebb91275..b9ede1e701d1 100644 --- a/gdb/python/py-exitedevent.c +++ b/gdb/python/py-exitedevent.c @@ -51,7 +51,7 @@ create_exited_event_object (const LONGEST *exit_code, struct inferior *inf) int emit_exited_event (const LONGEST *exit_code, struct inferior *inf) { - if (evregpy_no_listeners_p (gdb_py_events.exited)) + if (!evregpy_has_listeners_p (gdb_py_events.exited)) return 0; gdbpy_ref<> event = create_exited_event_object (exit_code, inf); diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 4386489a8e7f..4c32a99e3ce7 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -243,7 +243,7 @@ python_new_inferior (struct inferior *inf) gdbpy_enter enter_py; - if (evregpy_no_listeners_p (gdb_py_events.new_inferior)) + if (!evregpy_has_listeners_p (gdb_py_events.new_inferior)) return; gdbpy_ref inf_obj = inferior_to_inferior_object (inf); @@ -270,7 +270,7 @@ python_inferior_deleted (struct inferior *inf) gdbpy_enter enter_py; - if (evregpy_no_listeners_p (gdb_py_events.inferior_deleted)) + if (!evregpy_has_listeners_p (gdb_py_events.inferior_deleted)) return; gdbpy_ref inf_obj = inferior_to_inferior_object (inf); @@ -328,7 +328,7 @@ add_thread_object (struct thread_info *tp) if (!ins_result.second) return; - if (evregpy_no_listeners_p (gdb_py_events.new_thread)) + if (!evregpy_has_listeners_p (gdb_py_events.new_thread)) return; gdbpy_ref<> event = create_thread_event_object @@ -1000,7 +1000,7 @@ python_context_changed (user_selected_what selection) gdbpy_enter enter_py (current_inferior ()->arch ()); - if (evregpy_no_listeners_p (gdb_py_events.selected_context)) + if (!evregpy_has_listeners_p (gdb_py_events.selected_context)) return; gdbpy_ref<> inf_obj (gdbpy_selected_inferior (nullptr, nullptr)); diff --git a/gdb/python/py-infevents.c b/gdb/python/py-infevents.c index b472c809197c..efdf3b284e68 100644 --- a/gdb/python/py-infevents.c +++ b/gdb/python/py-infevents.c @@ -122,7 +122,7 @@ int emit_inferior_call_event (inferior_call_kind flag, ptid_t thread, CORE_ADDR addr) { - if (evregpy_no_listeners_p (gdb_py_events.inferior_call)) + if (!evregpy_has_listeners_p (gdb_py_events.inferior_call)) return 0; gdbpy_ref<> event = create_inferior_call_event_object (flag, thread, addr); @@ -137,7 +137,7 @@ emit_inferior_call_event (inferior_call_kind flag, ptid_t thread, int emit_memory_changed_event (CORE_ADDR addr, ssize_t len) { - if (evregpy_no_listeners_p (gdb_py_events.memory_changed)) + if (!evregpy_has_listeners_p (gdb_py_events.memory_changed)) return 0; gdbpy_ref<> event = create_memory_changed_event_object (addr, len); @@ -152,7 +152,7 @@ emit_memory_changed_event (CORE_ADDR addr, ssize_t len) int emit_register_changed_event (const frame_info_ptr &frame, int regnum) { - if (evregpy_no_listeners_p (gdb_py_events.register_changed)) + if (!evregpy_has_listeners_p (gdb_py_events.register_changed)) return 0; gdbpy_ref<> event = create_register_changed_event_object (frame, regnum); diff --git a/gdb/python/py-newobjfileevent.c b/gdb/python/py-newobjfileevent.c index cac49b2a39c4..d108cc347f12 100644 --- a/gdb/python/py-newobjfileevent.c +++ b/gdb/python/py-newobjfileevent.c @@ -42,7 +42,7 @@ create_new_objfile_event_object (struct objfile *objfile) int emit_new_objfile_event (struct objfile *objfile) { - if (evregpy_no_listeners_p (gdb_py_events.new_objfile)) + if (!evregpy_has_listeners_p (gdb_py_events.new_objfile)) return 0; gdbpy_ref<> event = create_new_objfile_event_object (objfile); @@ -77,7 +77,7 @@ create_free_objfile_event_object (struct objfile *objfile) int emit_free_objfile_event (struct objfile *objfile) { - if (evregpy_no_listeners_p (gdb_py_events.free_objfile)) + if (!evregpy_has_listeners_p (gdb_py_events.free_objfile)) return 0; gdbpy_ref<> event = create_free_objfile_event_object (objfile); @@ -113,7 +113,7 @@ create_clear_objfiles_event_object (program_space *pspace) int emit_clear_objfiles_event (program_space *pspace) { - if (evregpy_no_listeners_p (gdb_py_events.clear_objfiles)) + if (!evregpy_has_listeners_p (gdb_py_events.clear_objfiles)) return 0; gdbpy_ref<> event = create_clear_objfiles_event_object (pspace); diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c index b27950c172c4..020b60cc2637 100644 --- a/gdb/python/py-progspace.c +++ b/gdb/python/py-progspace.c @@ -662,7 +662,7 @@ gdbpy_executable_changed (struct program_space *pspace, bool reload_p) gdbpy_enter enter_py; - if (!evregpy_no_listeners_p (gdb_py_events.executable_changed) + if (evregpy_has_listeners_p (gdb_py_events.executable_changed) && emit_executable_changed_event (gdb_py_events.executable_changed, pspace, reload_p) < 0) gdbpy_print_stack (); @@ -692,7 +692,7 @@ gdbpy_program_space_event (program_space *pspace, bool adding_p) event_type = &free_progspace_event_object_type; } - if (evregpy_no_listeners_p (registry)) + if (!evregpy_has_listeners_p (registry)) return; gdbpy_ref<> pspace_obj = pspace_to_pspace_object (pspace); diff --git a/gdb/python/py-stopevent.c b/gdb/python/py-stopevent.c index 01c95b66e9d0..2b7aab587bd3 100644 --- a/gdb/python/py-stopevent.c +++ b/gdb/python/py-stopevent.c @@ -110,7 +110,7 @@ emit_stop_event (struct bpstat *bs, enum gdb_signal stop_signal) PyObject *first_bp = NULL; struct bpstat *current_bs; - if (evregpy_no_listeners_p (gdb_py_events.stop)) + if (!evregpy_has_listeners_p (gdb_py_events.stop)) return 0; gdbpy_ref<> dict = py_print_bpstat (bs, stop_signal); diff --git a/gdb/python/py-threadevent.c b/gdb/python/py-threadevent.c index 35caba7a5aab..f303d40a6f05 100644 --- a/gdb/python/py-threadevent.c +++ b/gdb/python/py-threadevent.c @@ -54,7 +54,7 @@ create_thread_event_object (PyTypeObject *py_type, gdbpy_borrowed_ref<> thread) int emit_thread_exit_event (thread_info * thread) { - if (evregpy_no_listeners_p (gdb_py_events.thread_exited)) + if (!evregpy_has_listeners_p (gdb_py_events.thread_exited)) return 0; auto py_thr = thread_to_thread_object (thread); diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c index 7213158cdbe3..3c2d035bba51 100644 --- a/gdb/python/py-tui.c +++ b/gdb/python/py-tui.c @@ -594,7 +594,7 @@ gdbpy_tui_enabled (bool state) { gdbpy_enter enter_py; - if (evregpy_no_listeners_p (gdb_py_events.tui_enabled)) + if (!evregpy_has_listeners_p (gdb_py_events.tui_enabled)) return; gdbpy_ref<> event_obj = create_event_object (&tui_enabled_event_object_type); diff --git a/gdb/python/python.c b/gdb/python/python.c index 08ee471000cb..ede3e98571d3 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1233,7 +1233,7 @@ gdbpy_before_prompt_hook (const struct extension_language_defn *extlang, gdbpy_enter enter_py; - if (!evregpy_no_listeners_p (gdb_py_events.before_prompt) + if (evregpy_has_listeners_p (gdb_py_events.before_prompt) && evpy_emit_event (NULL, gdb_py_events.before_prompt) < 0) return EXT_LANG_RC_ERROR; @@ -2488,7 +2488,7 @@ init__gdb_module (void) static int emit_exiting_event (int exit_code) { - if (evregpy_no_listeners_p (gdb_py_events.gdb_exiting)) + if (!evregpy_has_listeners_p (gdb_py_events.gdb_exiting)) return 0; gdbpy_ref<> event_obj = create_event_object (&gdb_exiting_event_object_type); -- 2.55.0