From patchwork Sun Oct 2 16:53:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 58275 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 35CE3385C405 for ; Sun, 2 Oct 2022 16:53:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 35CE3385C405 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664729621; bh=uFbuqmiLnFupQ9WbriOwFzS3L4tUVhaJK77ty8/92N0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=pJpdyUy8RikD0rFJ/kBku5RYhhVMTHH0T3i7pA8yrJB5EkHY4nnj5M1cvudxpW86X vJB0ccEdOszLobYqwHFZELborSRkeuOmFMb56dmkvj7sp0xfJsnIeJAniCVvGTOFsI LIzbrDpVqfiHVkc/lLQV1DxFe1HrMsccNC3mOSPU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 6D9973858413 for ; Sun, 2 Oct 2022 16:53:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6D9973858413 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-531-edAutzOAN3iVUx7mBi7f5Q-1; Sun, 02 Oct 2022 12:53:13 -0400 X-MC-Unique: edAutzOAN3iVUx7mBi7f5Q-1 Received: by mail-wm1-f69.google.com with SMTP id l15-20020a05600c4f0f00b003b4bec80edbso5134265wmq.9 for ; Sun, 02 Oct 2022 09:53:12 -0700 (PDT) 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; bh=uFbuqmiLnFupQ9WbriOwFzS3L4tUVhaJK77ty8/92N0=; b=FVOaQP/GousHqNM0Hfz5KDg872jZub/DJX8faL+rQR/ue0C9HuYwADi7GmLRIpUJhC jNdb/uTFk3wX4YgSUbVNjKOWH0atvjXQQzaEM1KyhpdKEYDCnwfciXVHdKXB0sLRkeDd KM8CeV/VkTLSIIvxuu97cXXKv9GfpBLeiNU6YeNq1Up1EMSGN0Xp5Yw2xSQm1k1e2b0Y A+lKDlNKkVsdzZ1z/CoRfJI5ZoZZj8L7kO396/Nhz7jut3TBwC0j3GXkfkrHyqQI35Yp 7ooOWs7PiYNNCgrHxXrI4Yo3Ouauh1gU6/ZzJ2MhZ3boI1oDZCXBXyJOE6+u/vdE9AHr wgbw== X-Gm-Message-State: ACrzQf0L09Z0D83Kkc735BAq+x5thNg4ns70MHQtoG9hBZ2w1OOkX+SE TxRH2MvCrMYfn/7WdlrUt8vhqHl0xc1Y+GqT+sAPciuCmoZvXQvgcPVlL96YVEyORrP/BZ23doi rXxtCErfWAorr+4ABVS0BDOseZ/XGyuFuRny116kQDIcs7wzKawsSt1Pfn6KOzDeAVqdc6zu0Zg == X-Received: by 2002:a05:600c:5488:b0:3b5:634:731 with SMTP id iv8-20020a05600c548800b003b506340731mr4393599wmb.188.1664729591275; Sun, 02 Oct 2022 09:53:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4zRbSG7XX2PrwAYqBIorhtCGeNLX1i2ImYI5bE1A6svpMlIZoB3dm6D5AbSooJhyebE28fkg== X-Received: by 2002:a05:600c:5488:b0:3b5:634:731 with SMTP id iv8-20020a05600c548800b003b506340731mr4393588wmb.188.1664729591010; Sun, 02 Oct 2022 09:53:11 -0700 (PDT) Received: from localhost (52.72.115.87.dyn.plus.net. [87.115.72.52]) by smtp.gmail.com with ESMTPSA id bs17-20020a056000071100b0022ccae2fa62sm7920559wrb.22.2022.10.02.09.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 09:53:10 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCH 1/3] gdb/python: break dependencies between gdbpy_initialize_* functions Date: Sun, 2 Oct 2022 17:53:03 +0100 Message-Id: <5353d718bda4d304a38d1b29ae7ce6d455614acd.1664729134.git.aburgess@redhat.com> 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 X-Spam-Status: No, score=-10.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_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" In a later commit in this series I will propose removing all of the explicit gdbpy_initialize_* calls from python.c and replace these calls with a more generic mechanism. One of the side effects of this generic mechanism is that the order in which the various Python sub-systems within GDB are initialized is no longer guaranteed. On the whole I don't think this matters, most of the sub-systems are independent of each other, though testing did reveal a few places where we did have dependencies, though I don't think those dependencies were explicitly documented in a comment anywhere. This commit removes the first dependency issue, with this and the next commit, all of the implicit inter-sub-system dependencies will be replaced by explicit dependencies, which will allow me to, I think, clean up how the sub-systems are initialized. The dependency is around the py_insn_type. This type is setup in gdbpy_initialize_instruction and used in gdbpy_initialize_record. Rather than depend on the calls to these two functions being in a particular order, in this commit I propose adding a new function py_insn_get_insn_type. This function will take care of setting up the py_insn_type type and calling PyType_Ready. This helper function can be called from gdbpy_initialize_record and gdbpy_initialize_instruction, and the py_insn_type will be initialized just once. To me this is better, the dependency is now really obvious, but also, we no longer care in which order gdbpy_initialize_record and gdbpy_initialize_instruction are called. There should be no user visible changes after this commit. --- gdb/python/py-instruction.c | 41 +++++++++++++++++++++++++++++-------- gdb/python/py-instruction.h | 13 ++++++++---- gdb/python/py-record.c | 2 +- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/gdb/python/py-instruction.c b/gdb/python/py-instruction.c index e1ad49a5143..fee5bba4015 100644 --- a/gdb/python/py-instruction.c +++ b/gdb/python/py-instruction.c @@ -20,7 +20,9 @@ #include "defs.h" #include "py-instruction.h" -/* See py-instruction.h. */ +/* Python type object for the abstract gdb.Instruction class. This class + contains getters for four elements: "pc" (int), "data" (buffer), "decode" + (str) and "size" (int) that must be overridden by sub classes. */ PyTypeObject py_insn_type = { PyVarObject_HEAD_INIT (NULL, 0) @@ -51,17 +53,38 @@ static gdb_PyGetSetDef py_insn_getset[] = {NULL} }; +/* See py-instruction.h. */ + +PyTypeObject * +py_insn_get_insn_type () +{ + if (py_insn_type.tp_new == nullptr) + { + py_insn_type.tp_new = PyType_GenericNew; + py_insn_type.tp_flags = Py_TPFLAGS_DEFAULT; + py_insn_type.tp_basicsize = sizeof (py_insn_obj); + py_insn_type.tp_name = "gdb.Instruction"; + py_insn_type.tp_doc = "GDB instruction object"; + py_insn_type.tp_getset = py_insn_getset; + + if (PyType_Ready (&py_insn_type) < 0) + { + /* Reset the tp_new field so any subsequent calls to this + function will retry to make the type ready. */ + py_insn_type.tp_new = nullptr; + return nullptr; + } + } + + return &py_insn_type; +} + /* Sets up the gdb.Instruction type. */ int gdbpy_initialize_instruction (void) { - py_insn_type.tp_new = PyType_GenericNew; - py_insn_type.tp_flags = Py_TPFLAGS_DEFAULT; - py_insn_type.tp_basicsize = sizeof (py_insn_obj); - py_insn_type.tp_name = "gdb.Instruction"; - py_insn_type.tp_doc = "GDB instruction object"; - py_insn_type.tp_getset = py_insn_getset; - - return PyType_Ready (&py_insn_type); + if (py_insn_get_insn_type () == nullptr) + return -1; + return 0; } diff --git a/gdb/python/py-instruction.h b/gdb/python/py-instruction.h index 59f0893e641..1e602636a39 100644 --- a/gdb/python/py-instruction.h +++ b/gdb/python/py-instruction.h @@ -22,9 +22,14 @@ #include "python-internal.h" -/* Python type object for the abstract gdb.Instruction class. This class - contains getters for four elements: "pc" (int), "data" (buffer), "decode" - (str) and "size" (int) that must be overridden by sub classes. */ -extern PyTypeObject py_insn_type; +/* Return a pointer to the py_insn_type object (see py-instruction.c), but + ensure that PyType_Ready has been called for the type first. If the + PyType_Ready call is successful then subsequent calls to this function + will not call PyType_Ready, the type pointer will just be returned. + + If the PyType_Ready call is not successful then nullptr is returned and + subsequent calls to this function will call PyType_Ready again. */ + +extern PyTypeObject *py_insn_get_insn_type (); #endif /* PYTHON_PY_INSTRUCTION_H */ diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c index 51084dfac72..fd5cfee84eb 100644 --- a/gdb/python/py-record.c +++ b/gdb/python/py-record.c @@ -563,7 +563,7 @@ gdbpy_initialize_record (void) recpy_insn_type.tp_getset = recpy_insn_getset; recpy_insn_type.tp_richcompare = recpy_element_richcompare; recpy_insn_type.tp_hash = recpy_element_hash; - recpy_insn_type.tp_base = &py_insn_type; + recpy_insn_type.tp_base = py_insn_get_insn_type (); recpy_func_type.tp_new = PyType_GenericNew; recpy_func_type.tp_flags = Py_TPFLAGS_DEFAULT;