From patchwork Wed Sep 13 14:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Vrany X-Patchwork-Id: 75877 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 35294385772D for ; Wed, 13 Sep 2023 14:40:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 35294385772D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694616000; bh=A44YjbS4Ua15ldq3AORmnFeIrOVpkh86uQBn6TmxWqY=; h=To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=utPMc37LaPHA4Pfs91VfH3Bhl6y1pTUcAAyUzvmG8c1MEJxQMXY6Oe+eBCK2DBRNR AY401cO0JTS3HlgfqoL7vWoaMVqcK//SBtyUch+JLgztX8oX18bSncP+grk8P8ljr+ deLnBD3HscyABM78oqPYOR9C5Uh2oO3Q1biFSeP8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.133.114]) by sourceware.org (Postfix) with ESMTPS id 495AB3857835 for ; Wed, 13 Sep 2023 14:39:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 495AB3857835 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-UxjfcrLdO1Oh-NjNi-51ug-1; Wed, 13 Sep 2023 10:39:30 -0400 X-MC-Unique: UxjfcrLdO1Oh-NjNi-51ug-1 Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by DS7PR17MB6635.namprd17.prod.outlook.com (2603:10b6:8:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.31; Wed, 13 Sep 2023 14:39:28 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::30eb:4c4a:cb5a:dd91]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::30eb:4c4a:cb5a:dd91%4]) with mapi id 15.20.6768.036; Wed, 13 Sep 2023 14:39:28 +0000 To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH v2 1/2] gdb/python: generalize serialize_mi_result() Date: Wed, 13 Sep 2023 15:38:42 +0100 Message-ID: <20230913143843.185997-2-jan.vrany@labware.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230913143843.185997-1-jan.vrany@labware.com> References: <20230913143843.185997-1-jan.vrany@labware.com> X-ClientProxiedBy: LO4P265CA0148.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c7::12) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|DS7PR17MB6635:EE_ X-MS-Office365-Filtering-Correlation-Id: b6cbb0a3-7393-43a5-fb98-08dbb4673c02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: Qm8c0kNmRsKuFKfPgJ3b4SJQxO4RH7CryewbovbFD6oLS5wuqrFnkden16ZUWt3SLtYAtiatHkvlKUQ5qEG3Efy7uKeuR52fV5iC9nGNEe8L0g6kHsLBX/MU/OyLcZUFgJpxTW8xECdgFW/L0oTa0zYRtoXlmKgqdzPHOUvgFcD9hO5dEFLQR+4MRiaKlbTDH+Ceu+p5/MMaO7WnaamSOSjK93QH2Qhz/YSFXlePzBtBlK3QiGqILLEKrqa4ZxXkWPeYQg18CqQErJ0/6B3dRZ71aXD4QtrKgns8l1/Q+gEVDem4ZKcmHEAyY2nSS5oMKH03dP3WWlc9Soztpc73goh3lcyjbVKSRxYkBKaTHxekSvETj/5DD0tYeVRr4rFGCJa/GAGLXAUbeu/PsL9gqK2dy7nZuIQAHJX38poIDnOGIx5etjuQgC6vhfQThwCNoWzWdi027ouvB3Iq2w3FgANPI7r+cPjbWaGCVYYrtbhx8CtHbil832Qz89hv1KHClw/lySLUh4G5FD9edplrxFRonZ6qXH5JsKfi+KyL3uB+ew7E+5aUvHYHEgqM+QBs X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR17MB4314.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(346002)(366004)(396003)(136003)(376002)(186009)(1800799009)(451199024)(6486002)(6506007)(6512007)(6666004)(83380400001)(86362001)(36756003)(38100700002)(2616005)(316002)(107886003)(1076003)(30864003)(26005)(44832011)(66556008)(41300700001)(66946007)(6916009)(66476007)(2906002)(8676002)(8936002)(4326008)(5660300002)(478600001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CPk6c3taWaCYBTH6OOoiO/PVJZ6si9mqYNzPAbElmfmkD/5TNs5w+gJiiUzIT7PNuglgaLcBGpW2lyMxlCF0aj/Uo3ZrbyA3X5DcVbUwSGIf/bn4l52wzfs8GZdPQc51wkMbT+akup/+C15yKjONR1XlRSwesOOL4voxCJfuIc8ncesoG9mGGq3Fi0N/ShniXWAS8T3y3MFxCMb9rxh6SEHuAmUHaGprwzijmhbMB05XHre2vzZGv57ONkfMmg2O38GBOmQSgtlaSXL2p4y3CjLT46cW/4I1PKIIMJzz38mgX6f6vm6dlgvGyPJ/dLSTnFx4v7sPWH7hBv/dZPgsme/hM6HNlNgH4avdOiN683ElRmO6DbRb364DQBtD0Ji5OdZ16bGU54DJSHAeO1otdgYMHmbIZJ2wl6L4y4cMjnqvOJaVbGcqK7goY5NM4WdEeMuQVPdqKEjzAD64BoofMRaX4FWSQQXypq602Avr1IJf5J4RGuaetntdEExv7xkTx0eBH3WEhlgDL2I43fcwoD0usv8S5tjbskqDVkiBuocCa9DYzcpdV1HHahgR26BEbEPnHOjO+Zs77N9Z2zeAZ7nBpH5dMd2fUpsvMpZ4eofyMCA/wbEPhai/vv1NdFq7/Te299el6pgOCGkB4K05PnV31ghHQbiksGBOApRlJYdps2PAz31WkUKLzfJf6m+ME8ai2QutN5ZfZez+KLKEaRalnt7PC7F/ltoX3cCqFB1QeepHJ9ZHlsPlnUFGA8gQIU1xY618hQsBnasf1hNlMszcAxMZbUOfRUVKlJmE3ZVMsvkO/Mdiazo9DgKlCpd83UsDfHlS1+pWNjxO1B1oZUviphu3GNj4VYM/keqwFzXsyvaStWRFZqNalaYzaRtd3cC6sW+xaKtfIdsm+4TeeeQMLFzRiLpcZuV1imOGxA6Zjgt3eb6SJjl/aHmbXD9xNpL6NMPDh8GmoZp8xpcasK2PRrgj0RTMq+Wr8ste485YSGWukOz2qJRaMDuH1jN8ytGOE8bxPyXiyrhLk4LWvaqkSwX/aDhZLGVocs3M/Wj8QlsFyCyU7DstpWVr8n2kDxvfrEZb2Ja0tRSpZ+GfjSFj2n7nprFtJslWriCKAozIR0hpj69GJU+PAfy40capBee3GqtkVpHZiBzOdwDyLtsNzHcFJqHMJ5wU8A8ClbWZJJyONrV8JulFVrqMStwDRd/TgAO/q+qSETh3quefYI/pChmtkHo7tg3GyPeGNWCGvZJqHpnvHYyBq05/HkkeOE4/zpxq5k04caz7DfEoftT6zG4ljJiDjvhMBoMmedjew8jbg0IIkl+iJFHwn1vocCZFDMI8CTPf85UH1xLESPaWA/7e2gVTHVwSrmZT4cCE0KjUZnSzwsoznoMhjIT3LiCVPeWrbQV9x3n6Ik+kr8ucDVUGflcCHRFbQEloDtAhRvRfzm33o3ZIDfTg/VRekTO4atyBakgQHGKM1qYZKSZ29g1g3+PpsQKZVwIbz+SZXF7MhirurIcybPw1u4ZKkVW87+6JHbTA9TZ+wVGLdZ7Ae/0X2hWNROj7Jur0V3cKisCiIBYzJO8rjoaXdFST X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6cbb0a3-7393-43a5-fb98-08dbb4673c02 X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 14:39:28.5556 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZZAnsYr2WDpzh7Xf9eJkfLPcCHgLFY4NINCPVe3DIpY1fkr/x275CejvEti36ROu4+DePr+LV+4o2OBBG8zWkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR17MB6635 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: labware.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Jan Vrany via Gdb-patches From: Jan Vrany Reply-To: Jan Vrany Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This commit generalizes serialize_mi_result() to make usable in different contexts than printing result of custom MI command. To do so, the check whether passed Python object is a dictionary has been moved to the caller - at the very least, different uses require different error messages. Also it has been renamed to serialize_mi_results() to better match GDB/MI output syntax (see corresponding section in documentation, in particular rules 'result-record' and 'async-output'. Since it is now more generic function, it has been moved to py-mi.c. This is a preparation for implementing Python support for sending custom MI async events. --- gdb/python/py-mi.c | 159 ++++++++++++++++++++++++++++++ gdb/python/py-micmd.c | 185 ++--------------------------------- gdb/python/python-internal.h | 13 +++ 3 files changed, 181 insertions(+), 176 deletions(-) diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c index 66dc6fb8a32..36bcb6ceece 100644 --- a/gdb/python/py-mi.c +++ b/gdb/python/py-mi.c @@ -296,3 +296,162 @@ gdbpy_execute_mi_command (PyObject *self, PyObject *args, PyObject *kw) return uiout.result (); } + +/* Convert KEY_OBJ into a string that can be used as a field name in MI + output. KEY_OBJ must be a Python string object, and must only contain + characters suitable for use as an MI field name. + + If KEY_OBJ is not a string, or if KEY_OBJ contains invalid characters, + then an error is thrown. Otherwise, KEY_OBJ is converted to a string + and returned. */ + +static gdb::unique_xmalloc_ptr +py_object_to_mi_key (PyObject *key_obj) +{ + /* The key must be a string. */ + if (!PyUnicode_Check (key_obj)) + { + gdbpy_ref<> key_repr (PyObject_Repr (key_obj)); + gdb::unique_xmalloc_ptr key_repr_string; + if (key_repr != nullptr) + key_repr_string = python_string_to_target_string (key_repr.get ()); + if (key_repr_string == nullptr) + gdbpy_handle_exception (); + + gdbpy_error (_("non-string object used as key: %s"), + key_repr_string.get ()); + } + + gdb::unique_xmalloc_ptr key_string + = python_string_to_target_string (key_obj); + if (key_string == nullptr) + gdbpy_handle_exception (); + + /* Predicate function, returns true if NAME is a valid field name for use + in MI result output, otherwise, returns false. */ + auto is_valid_key_name = [] (const char *name) -> bool + { + gdb_assert (name != nullptr); + + if (*name == '\0' || !isalpha (*name)) + return false; + + for (; *name != '\0'; ++name) + if (!isalnum (*name) && *name != '_' && *name != '-') + return false; + + return true; + }; + + if (!is_valid_key_name (key_string.get ())) + { + if (*key_string.get () == '\0') + gdbpy_error (_("Invalid empty key in MI result")); + else + gdbpy_error (_("Invalid key in MI result: %s"), key_string.get ()); + } + + return key_string; +} + +/* Serialize RESULT and print it in MI format to the current_uiout. + FIELD_NAME is used as the name of this result field. + + RESULT can be a dictionary, a sequence, an iterator, or an object that + can be converted to a string, these are converted to the matching MI + output format (dictionaries as tuples, sequences and iterators as lists, + and strings as named fields). + + If anything goes wrong while formatting the output then an error is + thrown. + + This function is the recursive inner core of serialize_mi_result, and + should only be called from that function. */ + +static void +serialize_mi_result_1 (PyObject *result, const char *field_name) +{ + struct ui_out *uiout = current_uiout; + + if (PyDict_Check (result)) + { + PyObject *key, *value; + Py_ssize_t pos = 0; + ui_out_emit_tuple tuple_emitter (uiout, field_name); + while (PyDict_Next (result, &pos, &key, &value)) + { + gdb::unique_xmalloc_ptr key_string + (py_object_to_mi_key (key)); + serialize_mi_result_1 (value, key_string.get ()); + } + } + else if (PySequence_Check (result) && !PyUnicode_Check (result)) + { + ui_out_emit_list list_emitter (uiout, field_name); + Py_ssize_t len = PySequence_Size (result); + if (len == -1) + gdbpy_handle_exception (); + for (Py_ssize_t i = 0; i < len; ++i) + { + gdbpy_ref<> item (PySequence_ITEM (result, i)); + if (item == nullptr) + gdbpy_handle_exception (); + serialize_mi_result_1 (item.get (), nullptr); + } + } + else if (PyIter_Check (result)) + { + gdbpy_ref<> item; + ui_out_emit_list list_emitter (uiout, field_name); + while (true) + { + item.reset (PyIter_Next (result)); + if (item == nullptr) + { + if (PyErr_Occurred () != nullptr) + gdbpy_handle_exception (); + break; + } + serialize_mi_result_1 (item.get (), nullptr); + } + } + else + { + if (PyLong_Check (result)) + { + int overflow = 0; + gdb_py_longest val = gdb_py_long_as_long_and_overflow (result, + &overflow); + if (PyErr_Occurred () != nullptr) + gdbpy_handle_exception (); + if (overflow == 0) + { + uiout->field_signed (field_name, val); + return; + } + /* Fall through to the string case on overflow. */ + } + + gdb::unique_xmalloc_ptr string (gdbpy_obj_to_string (result)); + if (string == nullptr) + gdbpy_handle_exception (); + uiout->field_string (field_name, string.get ()); + } +} + +/* See python-internal.h. */ + +void +serialize_mi_results (PyObject *results) +{ + gdb_assert (PyDict_Check (results)); + + PyObject *key, *value; + Py_ssize_t pos = 0; + while (PyDict_Next (results, &pos, &key, &value)) + { + gdb::unique_xmalloc_ptr key_string + (py_object_to_mi_key (key)); + serialize_mi_result_1 (value, key_string.get ()); + } +} diff --git a/gdb/python/py-micmd.c b/gdb/python/py-micmd.c index 01fc6060ece..dbfd44c892b 100644 --- a/gdb/python/py-micmd.c +++ b/gdb/python/py-micmd.c @@ -173,178 +173,6 @@ extern PyTypeObject micmdpy_object_type static PyObject *invoke_cst; -/* Convert KEY_OBJ into a string that can be used as a field name in MI - output. KEY_OBJ must be a Python string object, and must only contain - characters suitable for use as an MI field name. - - If KEY_OBJ is not a string, or if KEY_OBJ contains invalid characters, - then an error is thrown. Otherwise, KEY_OBJ is converted to a string - and returned. */ - -static gdb::unique_xmalloc_ptr -py_object_to_mi_key (PyObject *key_obj) -{ - /* The key must be a string. */ - if (!PyUnicode_Check (key_obj)) - { - gdbpy_ref<> key_repr (PyObject_Repr (key_obj)); - gdb::unique_xmalloc_ptr key_repr_string; - if (key_repr != nullptr) - key_repr_string = python_string_to_target_string (key_repr.get ()); - if (key_repr_string == nullptr) - gdbpy_handle_exception (); - - gdbpy_error (_("non-string object used as key: %s"), - key_repr_string.get ()); - } - - gdb::unique_xmalloc_ptr key_string - = python_string_to_target_string (key_obj); - if (key_string == nullptr) - gdbpy_handle_exception (); - - /* Predicate function, returns true if NAME is a valid field name for use - in MI result output, otherwise, returns false. */ - auto is_valid_key_name = [] (const char *name) -> bool - { - gdb_assert (name != nullptr); - - if (*name == '\0' || !isalpha (*name)) - return false; - - for (; *name != '\0'; ++name) - if (!isalnum (*name) && *name != '_' && *name != '-') - return false; - - return true; - }; - - if (!is_valid_key_name (key_string.get ())) - { - if (*key_string.get () == '\0') - gdbpy_error (_("Invalid empty key in MI result")); - else - gdbpy_error (_("Invalid key in MI result: %s"), key_string.get ()); - } - - return key_string; -} - -/* Serialize RESULT and print it in MI format to the current_uiout. - FIELD_NAME is used as the name of this result field. - - RESULT can be a dictionary, a sequence, an iterator, or an object that - can be converted to a string, these are converted to the matching MI - output format (dictionaries as tuples, sequences and iterators as lists, - and strings as named fields). - - If anything goes wrong while formatting the output then an error is - thrown. - - This function is the recursive inner core of serialize_mi_result, and - should only be called from that function. */ - -static void -serialize_mi_result_1 (PyObject *result, const char *field_name) -{ - struct ui_out *uiout = current_uiout; - - if (PyDict_Check (result)) - { - PyObject *key, *value; - Py_ssize_t pos = 0; - ui_out_emit_tuple tuple_emitter (uiout, field_name); - while (PyDict_Next (result, &pos, &key, &value)) - { - gdb::unique_xmalloc_ptr key_string - (py_object_to_mi_key (key)); - serialize_mi_result_1 (value, key_string.get ()); - } - } - else if (PySequence_Check (result) && !PyUnicode_Check (result)) - { - ui_out_emit_list list_emitter (uiout, field_name); - Py_ssize_t len = PySequence_Size (result); - if (len == -1) - gdbpy_handle_exception (); - for (Py_ssize_t i = 0; i < len; ++i) - { - gdbpy_ref<> item (PySequence_ITEM (result, i)); - if (item == nullptr) - gdbpy_handle_exception (); - serialize_mi_result_1 (item.get (), nullptr); - } - } - else if (PyIter_Check (result)) - { - gdbpy_ref<> item; - ui_out_emit_list list_emitter (uiout, field_name); - while (true) - { - item.reset (PyIter_Next (result)); - if (item == nullptr) - { - if (PyErr_Occurred () != nullptr) - gdbpy_handle_exception (); - break; - } - serialize_mi_result_1 (item.get (), nullptr); - } - } - else - { - if (PyLong_Check (result)) - { - int overflow = 0; - gdb_py_longest val = gdb_py_long_as_long_and_overflow (result, - &overflow); - if (PyErr_Occurred () != nullptr) - gdbpy_handle_exception (); - if (overflow == 0) - { - uiout->field_signed (field_name, val); - return; - } - /* Fall through to the string case on overflow. */ - } - - gdb::unique_xmalloc_ptr string (gdbpy_obj_to_string (result)); - if (string == nullptr) - gdbpy_handle_exception (); - uiout->field_string (field_name, string.get ()); - } -} - -/* Serialize RESULT and print it in MI format to the current_uiout. - - This function handles the top-level result initially returned from the - invoke method of the Python command implementation. At the top-level - the result must be a dictionary. The values within this dictionary can - be a wider range of types. Handling the values of the top-level - dictionary is done by serialize_mi_result_1, see that function for more - details. - - If anything goes wrong while parsing and printing the MI output then an - error is thrown. */ - -static void -serialize_mi_result (PyObject *result) -{ - /* At the top-level, the result must be a dictionary. */ - - if (!PyDict_Check (result)) - gdbpy_error (_("Result from invoke must be a dictionary")); - - PyObject *key, *value; - Py_ssize_t pos = 0; - while (PyDict_Next (result, &pos, &key, &value)) - { - gdb::unique_xmalloc_ptr key_string - (py_object_to_mi_key (key)); - serialize_mi_result_1 (value, key_string.get ()); - } -} - /* Called when the MI command is invoked. PARSE contains the parsed command line arguments from the user. */ @@ -381,14 +209,19 @@ mi_command_py::invoke (struct mi_parse *parse) const gdb_assert (this->m_pyobj != nullptr); gdb_assert (PyErr_Occurred () == nullptr); - gdbpy_ref<> result + gdbpy_ref<> results (PyObject_CallMethodObjArgs ((PyObject *) this->m_pyobj.get (), invoke_cst, argobj.get (), nullptr)); - if (result == nullptr) + if (results == nullptr) gdbpy_handle_exception (); - if (result != Py_None) - serialize_mi_result (result.get ()); + if (results != Py_None) + { + /* At the top-level, the results must be a dictionary. */ + if (!PyDict_Check (results.get ())) + gdbpy_error (_("Result from invoke must be a dictionary")); + serialize_mi_results (results.get ()); + } } /* See declaration above. */ diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 93217375cc5..785dc4a5743 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -486,6 +486,19 @@ struct gdbarch *arch_object_to_gdbarch (PyObject *obj); extern PyObject *gdbpy_execute_mi_command (PyObject *self, PyObject *args, PyObject *kw); +/* Serialize RESULTS and print it in MI format to the current_uiout. + + This function handles the top-level results passed as dictionary. + The caller is responsible for ensuring that. The values within this + dictionary can be a wider range of types. Handling the values of the top-level + dictionary is done by serialize_mi_result_1, see that function for more + details. + + If anything goes wrong while parsing and printing the MI output then an + error is thrown. */ + +extern void serialize_mi_results (PyObject *results); + /* Convert Python object OBJ to a program_space pointer. OBJ must be a gdb.Progspace reference. Return nullptr if the gdb.Progspace is not valid (see gdb.Progspace.is_valid), otherwise return the program_space From patchwork Wed Sep 13 14:38:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Vrany X-Patchwork-Id: 75878 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 A28B03858CDA for ; Wed, 13 Sep 2023 14:40:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A28B03858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694616028; bh=YFi8pWmCvHhY44APZ6i/JYBbc99cWlVabmk49Pjy4FA=; h=To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=kpwJjwaUzl91kA3yimiRIxhvFrDGtvTVrziOvPdQgqdOYegH/jNZCHwQb/fTH8UMi 3gXzI+lHAYFTC+kZD+Mckn6ntkVE/tK1i3hSs+GmyRePeqYX5J1BjJGJFjmr1O9jDS T8rcsgNkHf3zERKA5OfQzWN6efoLqyaI845sXgrs= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.129.114]) by sourceware.org (Postfix) with ESMTPS id C2D74385696B for ; Wed, 13 Sep 2023 14:39:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2D74385696B Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-tgRXRDowOF-VVAF4DH6z5A-1; Wed, 13 Sep 2023 10:39:37 -0400 X-MC-Unique: tgRXRDowOF-VVAF4DH6z5A-1 Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by DS7PR17MB6635.namprd17.prod.outlook.com (2603:10b6:8:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.31; Wed, 13 Sep 2023 14:39:34 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::30eb:4c4a:cb5a:dd91]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::30eb:4c4a:cb5a:dd91%4]) with mapi id 15.20.6768.036; Wed, 13 Sep 2023 14:39:34 +0000 To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH v2 2/2] gdb/python: implement support for sending custom MI async notifications Date: Wed, 13 Sep 2023 15:38:43 +0100 Message-ID: <20230913143843.185997-3-jan.vrany@labware.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230913143843.185997-1-jan.vrany@labware.com> References: <20230913143843.185997-1-jan.vrany@labware.com> X-ClientProxiedBy: LO4P265CA0078.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2bd::7) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|DS7PR17MB6635:EE_ X-MS-Office365-Filtering-Correlation-Id: 98e85206-9504-49e7-dd38-08dbb4673fbe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 1ZHW+7M+dTJ7uDb6FFhIVgFvmSc4P8G1Diz6abJjRBGG6gxf56/kZY0nR966dOICB5HZfPnv0OaTgNpoRHXrRZnHjHapy7E0JV0nn1Wq+OZa/WdVenBT7PaTpjTQ82AHLEb/7a0GUo+E9BP383ajvU0GQfeyHxPEZIhISRYSvG+WAWcedBBzxvHSvufqE5u9Wu0DNzZLHdaqYaRipW+ojLpCNBUGU3SeQonsumk1DG/shWwUzPz5/G9ma7twVQYW6RyvS8UmcscHluOITQxX/A3/en+UkRhHI351UPtw8GebFWCvYeN8PfClE+imUgqGRzW/PrCN/uokzPZfN9JTfln93bVo/m/HjWIh4l0CIquSIbiWRTpyx2dcPYsCKHXK0dBiDDGJeFAr7BpXDURKwPRfrp2D5XXVM84gXPD0awMM3CjFxcTeMK2hC0J0X7Z0Ni+CRDSt6aNlDRHFIeieaIuktOENb7zSHznG7cpxONuGHIH7T3FufqCnoVhidhWkZ+KEr8Ug0zUszYK7d7/CiLMWFsjUHuvXsUUJlNPFhTeIIMdRTFDdNXqjXIb/g8mCwtVWo2+el7L775vABA+AUh9RYi8SeEbB+WsojsJMhUw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR17MB4314.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(346002)(366004)(396003)(136003)(376002)(186009)(1800799009)(451199024)(6486002)(6506007)(6512007)(6666004)(83380400001)(86362001)(36756003)(38100700002)(2616005)(316002)(107886003)(1076003)(26005)(44832011)(66556008)(15650500001)(41300700001)(66946007)(6916009)(66476007)(2906002)(8676002)(8936002)(4326008)(5660300002)(478600001)(2004002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tApLxUXuEMuCXUfrTaEJLIPO7y9AxUgNzD853RZq7gqK3s5L+quEPISEY8dmUrlkSwmjjY4yNR6Kz1BMY3p3gUSQ3BZlm5CjmrzWXJOjproWXcq+XzWyIPTWCvPvNkZtGC1AkPlvWbNUcx2Ltfm232I6RXP0M1z52WVyzLuBmPFo4JzG+3wunvQMtgz2n+FYUvQZ4Q5FUUoLK0owqzzfJc0qOlbybWLNUrnbCPiN/VIH6BF9sugjXuF/Ezd05h+KrN26NIfdeGLZ03E2TLzRk8Ah5fjLBgox5FrIRgNJbqahaEurOdtugDEhX8v1ZQmg46TNqKdS8AQzg+ZN46yzu71xQuR3IF1VsHZObq1GdzEfbJ0HCMPvk9v7qTAJ+1/G8hsYOJkP70yTzF9roARZWDG/iRAg1KkyGCZzqxWI0wNRbw10RtbJyYtNhD8twgL2Wm9jbctYEpao3ouH7YmTvQVIs02804Ql53iyIPtaJXPn+2lOoW82avC2SScbkJqTj+q8sTaBRyP5TJPi+7p9+McHwzS5CbMFHSfTpS4wlaXRIO4AKz3Ol6UlH0rTCxfSbTfd1H1fhC5z8x90xz4YxkHlCYjOLUHUl6ElvidA56Uzk0GVZMvW3qL4vr6OnDvstxh6xSBxMg4LA99aLMiLHxc1LJGcaUygVEH29P9L/c7rjgrNuZGtjM2S64lR6xUaqd9rNicmkrZvCEy+tRZJC3GV7LQI0GBEhDdv2OVYoZPWBze8rm0gno0bDiKF95I4a5h6jtFqA58olpTwTqmjFGoL3v7x92FSmR7YEpgms7amEhtFlvqmm+30KzQVM+P5DvLvI0uFb+ft5uAhlqBzM7b+BibMkr/faJ8TS1nkDHsdmuZSrhN3etSUNISeUzfdZ7RxkIZCXvDGGu+ki+raNNDb3z+Vg1tDO9cATYZZ84ocVrLJpQ6u7I0cLlmtPp5QBjmkjzP9yJmiUo7fC6Z6oND5pRjKZXfL6rVPlw6qgt0sAnu109byqmLqmU/0XhYjpi5jL0NCaTOYIXM7fo1oyrNHydTWYr9JHbJAtjaSe4Ho4eYdAUgsyeye3HZyGL9iEDYXwv2bZTc8FbMQqHa9tR/pIYVvXj3pznoHBrCDwtjAVfLs6nsKVlOv9uCSZSODbDzjt7TD0sokuK53wz4JJTELCJteuRZlAPRZXsdHdaxUbxTXVIMAAvxUdwIvDU0q3x+BCL0eMUwUBwF5Pg/goraU204/h3kvHKH66I8EqySvc8ZPbyl39TosjOJ9pG3kxgFskDuDhe08/bPBAOFVxTYguHiEwnA6ZhROrdRDMwOg1EGr3i00D9EjsDbDoTA8tZI2iKMkDcTqxzK1UtVMRiQjcr/iFRfgrlTnZkecrWJM7Ykoh7jybCaCh4h+fEuce+tta0dW3jOG7cybesDQpgJf00+NOgq+alkZcMTaCNJz9BWJcfz5XdErtwER28zUNofDhJ0jQrovmr5QGOrbplzZCs3fZbMmPgJ0aoTrWjG5b39cxAjORxpzOjLLwdyCejgUPmhhVd4ABX9nsbPvHAzfaNLSd32rKYzmTz16e+c0EYJLmqHXIeg3Tm85Xa3p X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98e85206-9504-49e7-dd38-08dbb4673fbe X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 14:39:34.8953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AY7KFr43KPPGoxgKFFlH/f2LyPsSsD95v+STeGqu8UOpbnJNUVh+esKubQ1fTQfeJPZMjOKCkS5PQOQaJUeGrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR17MB6635 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: labware.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Jan Vrany via Gdb-patches From: Jan Vrany Reply-To: Jan Vrany Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This commit adds a new Python function, gdb.notify_mi, that can be used to emit custom async notification to MI channel. This can be used, among other things, to implement notifications about events MI does not support, such as remote connection closed or register change. Reviewed-By: Eli Zaretskii --- gdb/NEWS | 3 + gdb/doc/python.texi | 45 ++++++++++++++ gdb/python/py-mi.c | 71 +++++++++++++++++++++++ gdb/python/python-internal.h | 5 ++ gdb/python/python.c | 4 ++ gdb/testsuite/gdb.python/py-mi-notify.exp | 71 +++++++++++++++++++++++ 6 files changed, 199 insertions(+) create mode 100644 gdb/testsuite/gdb.python/py-mi-notify.exp diff --git a/gdb/NEWS b/gdb/NEWS index 98ff00d5efc..4a1f383a666 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -286,6 +286,9 @@ info main might be array- or string-like, even if they do not have the corresponding type code. + ** New function gdb.notify_mi(NAME, DATA), that emits custom + GDB/MI async notification. + *** Changes in GDB 13 * MI version 1 is deprecated, and will be removed in GDB 14. diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi index 5b13958aeaf..7764101e521 100644 --- a/gdb/doc/python.texi +++ b/gdb/doc/python.texi @@ -211,6 +211,7 @@ optional arguments while skipping others. Example: * Recordings In Python:: Accessing recordings from Python. * CLI Commands In Python:: Implementing new CLI commands in Python. * GDB/MI Commands In Python:: Implementing new @sc{gdb/mi} commands in Python. +* GDB/MI Notifications In Python:: Implementing new @sc{gdb/mi} notifications in Python. * Parameters In Python:: Adding new @value{GDBN} parameters. * Functions In Python:: Writing new convenience functions. * Progspaces In Python:: Program spaces. @@ -4706,6 +4707,50 @@ Here is how this works using the commands from the example above: @{'string': 'abc, def, ghi'@} @end smallexample +@node GDB/MI Notifications In Python +@subsubsection @sc{gdb/mi} Notifications In Python + +@cindex MI notifications in python +@cindex notifications in python, GDB/MI +@cindex python notifications, GDB/MI + +It is possible to emit @sc{gdb/mi} notifications from +Python. Use the @code{gdb.notify_mi} function to do that. + +@defun gdb.notify_mi (name @r{[}, data@r{]}) +Emit a @sc{gdb/mi} asynchronous notification. @var{name} is the name of the +notification, consisting of alphanumeric characters and a hyphen (@code{-}). +@var{data} is any additional data to be emitted with the notification, passed +as a Python dictionary. This argument is optional. The dictionary is converted +to a @sc{gdb/mi} @var{result} records (@pxref{GDB/MI Output Syntax}) the same way +as result of Python MI command (@pxref{GDB/MI Commands In Python}). + +If @var{data} is @code{None} then no additional values are emitted. +@end defun + +While using existing notification names (@pxref{GDB/MI Async Records}) with +@code{gdb.notify_mi} is allowed, users are encouraged to prefix user-defined +notification with a hyphen (@code{-}) to avoid possible conflict. @value{GDBN} +will never introduce notification starting with hyphen. + +Here is how to emit @code{=-connection-removed} whenever a connection to remote +GDB server is closed (@pxref{Connections In Python}): + +@smallexample +def notify_connection_removed(event): + data = @{"id": event.connection.num, "type": event.connection.type@} + gdb.notify_mi("-connection-removed", data) + + +gdb.events.connection_removed.connect(notify_connection_removed) +@end smallexample + +Then, each time a connection is closed, there will be a notification on MI channel: + +@smallexample +=-connection-removed,id="1",type="remote" +@end smallexample + @node Parameters In Python @subsubsection Parameters In Python diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c index 36bcb6ceece..77479e31f30 100644 --- a/gdb/python/py-mi.c +++ b/gdb/python/py-mi.c @@ -19,8 +19,14 @@ #include "defs.h" #include "python-internal.h" +#include "utils.h" +#include "ui.h" #include "ui-out.h" +#include "interps.h" +#include "target.h" #include "mi/mi-parse.h" +#include "mi/mi-console.h" +#include "mi/mi-interp.h" /* A ui_out subclass that creates a Python object based on the data that is passed in. */ @@ -455,3 +461,68 @@ serialize_mi_results (PyObject *results) serialize_mi_result_1 (value, key_string.get ()); } } + +/* See python-internal.h. */ + +PyObject * +gdbpy_notify_mi (PyObject *self, PyObject *args, PyObject *kwargs) +{ + static const char *keywords[] = { "name", "data", nullptr }; + char *name = nullptr; + PyObject *data = Py_None; + + if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "s|O", keywords, + &name, &data)) + return nullptr; + + /* Validate notification name */ + const int name_len = strlen (name); + if (name_len == 0) + { + PyErr_SetString (PyExc_ValueError, _("MI notification name is empty.")); + return nullptr; + } + for (int i = 0; i < name_len; i++) + { + if (!isalnum (name[i]) && name[i] != '-') + { + PyErr_Format (PyExc_ValueError, + _("MI notification name contains invalid character: %c."), + name[i]); + return nullptr; + } + } + + /* Validate additional data */ + if (! (data == Py_None || PyDict_Check (data))) + { + PyErr_SetString (PyExc_ValueError, + _("MI notification data must be either None or a dictionary")); + return nullptr; + } + + SWITCH_THRU_ALL_UIS () + { + struct mi_interp *mi = as_mi_interp (top_level_interpreter ()); + + if (mi == nullptr) + continue; + + gdb_printf (mi->event_channel, "%s", name); + if (data != Py_None) + { + target_terminal::scoped_restore_terminal_state term_state; + target_terminal::ours_for_output (); + + ui_out *mi_uiout = mi->interp_ui_out (); + ui_out_redirect_pop redir (mi_uiout, mi->event_channel); + scoped_restore restore_uiout + = make_scoped_restore (¤t_uiout, mi_uiout); + + serialize_mi_results (data); + } + gdb_flush (mi->event_channel); + } + + Py_RETURN_NONE; +} diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 785dc4a5743..c7ac6817bd3 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -499,6 +499,11 @@ extern PyObject *gdbpy_execute_mi_command (PyObject *self, PyObject *args, extern void serialize_mi_results (PyObject *results); +/* Implementation of the gdb.notify_mi function. */ + +extern PyObject *gdbpy_notify_mi (PyObject *self, PyObject *args, + PyObject *kw); + /* Convert Python object OBJ to a program_space pointer. OBJ must be a gdb.Progspace reference. Return nullptr if the gdb.Progspace is not valid (see gdb.Progspace.is_valid), otherwise return the program_space diff --git a/gdb/python/python.c b/gdb/python/python.c index 6a978d632e9..faa7e0c217d 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -2669,6 +2669,10 @@ Return the name of the currently selected language." }, "print_options () -> dict\n\ Return the current print options." }, + { "notify_mi", (PyCFunction) gdbpy_notify_mi, + METH_VARARGS | METH_KEYWORDS, + "notify_mi (name, data) -> None\n\ +Output async record to MI channels if any." }, {NULL, NULL, 0, NULL} }; diff --git a/gdb/testsuite/gdb.python/py-mi-notify.exp b/gdb/testsuite/gdb.python/py-mi-notify.exp new file mode 100644 index 00000000000..7c99f7c93b5 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-mi-notify.exp @@ -0,0 +1,71 @@ +# Copyright (C) 2023-2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test custom MI notifications implemented in Python. + +load_lib gdb-python.exp +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if {[mi_gdb_start]} { + return +} + +if {[lsearch -exact [mi_get_features] python] < 0} { + unsupported "python support is disabled" + return -1 +} + +standard_testfile + +mi_gdb_test "set python print-stack full" \ + ".*\\^done" \ + "set python print-stack full" + +mi_gdb_test "python gdb.notify_mi('-test-notification')" \ + ".*=-test-notification\r\n\\^done" \ + "python notification, no additional data parameter" + +mi_gdb_test "python gdb.notify_mi('-test-notification', None)" \ + ".*=-test-notification\r\n\\^done" \ + "python notification, no additional data" + +mi_gdb_test "python gdb.notify_mi('-test-notification', \{ 'data1' : 1 , 'data2' : 2 })" \ + ".*=-test-notification,data1=\"1\",data2=\"2\"\r\n\\^done" \ + "python notification, with additional data" + +mi_gdb_test "python gdb.notify_mi('-test-notification', 1)" \ + ".*\\^error,msg=\".*\"" \ + "python notification, invalid additional data" + +mi_gdb_test "python gdb.notify_mi('', 1)" \ + ".*\\^error,msg=\".*\"" \ + "python notification, empty notification name" + +mi_gdb_test "python gdb.notify_mi('**invalid**', 1)" \ + ".*\\^error,msg=\".*\"" \ + "python notification, invalid notification name" + +mi_gdb_test "python gdb.notify_mi(\[1,2,3\], 1)" \ + ".*\\^error,msg=\".*\"" \ + "python notification, non-string notification name" + +mi_gdb_test "python gdb.notify_mi()" \ + ".*\\^error,msg=\".*\"" \ + "python notification, no arguments passed" + +mi_gdb_test "python gdb.notify_mi('thread-group-added', \{'id' : 'i2'\})" \ + ".*=thread-group-added,id=\"i2\"\r\n\\^done" \ + "python notification, using existing internal notification name"