From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id COwhErxkl2daIRwAWB0awg (envelope-from ) for ; Mon, 27 Jan 2025 05:49:32 -0500 Received: by simark.ca (Postfix, from userid 112) id 472FE1E105; Mon, 27 Jan 2025 05:49:32 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) 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.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 C7D171E08E for ; Mon, 27 Jan 2025 05:49:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71FFD3858039 for ; Mon, 27 Jan 2025 10:49:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71FFD3858039 Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.133.114]) by sourceware.org (Postfix) with ESMTP id 32B7B385843D for ; Mon, 27 Jan 2025 10:46:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32B7B385843D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=labware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=labware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 32B7B385843D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737974765; cv=none; b=mhjdNVFu/wiFwW12NXCGuuToaHUvjMSrQz1/sLCETEf743LH1i1AAsv/pVv8JHlsXvrlOFQd0kHdZOnl8Is3gFnIMknKsNReI9TCdDGGTRbjoqUr4xvvTmnFeiTK1fKqLZOZ1U1I9VZswu/kbnrbLCUyWlgMMFnoErDqm9j2mAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737974765; c=relaxed/simple; bh=kDzL/Z3NCuTbEbAY95OwEACScgtH9zcNsZqaOUab+h0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dY6GRSYHJYG0qhRNXUpKcFW9/taG81p+eYDUXNsZIpyayQpR2L7ZqGGknj7duVu8Bpru78ew7NIbRanyjN1qAryL22wcSi7BzBi5WS1vs5BPYLejoYLRGwxiygOOEntU/m+2xAfjDtaIVyG7UZT/c1ZQRngUw59Lg26NYdH8lyk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32B7B385843D Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2044.outbound.protection.outlook.com [104.47.66.44]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-408-W1SP8saFNaey29yo4z-1dg-1; Mon, 27 Jan 2025 05:46:03 -0500 X-MC-Unique: W1SP8saFNaey29yo4z-1dg-1 X-Mimecast-MFC-AGG-ID: W1SP8saFNaey29yo4z-1dg Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by DM4PR17MB6954.namprd17.prod.outlook.com (2603:10b6:8:18e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.22; Mon, 27 Jan 2025 10:46:01 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26%5]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 10:46:01 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [RFC 6/9] gdb/python: convert gdb.Symbol to use gdbpy_registry Date: Mon, 27 Jan 2025 10:44:32 +0000 Message-ID: <20250127104435.823519-7-jan.vrany@labware.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250127104435.823519-1-jan.vrany@labware.com> References: <20250127104435.823519-1-jan.vrany@labware.com> X-ClientProxiedBy: LO2P265CA0003.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::15) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|DM4PR17MB6954:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a429be3-aece-4538-bd1e-08dd3ebfca8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2CsqMhyEKIncBZgOukU5V/7okaVyWFdssT7BLnRRsgrrprRv6EdHfFtBUnuk?= =?us-ascii?Q?J8jHTKdiWxSe+6YKyb34OL27W2hoicPg5RinXpwNU604kffnHYGU/pLSZkik?= =?us-ascii?Q?EWeslihVdNMoNNWEuBCJpTwEBCyOq1PTO9r5vXo+oUqA2YOM80PzHkUZ9kK3?= =?us-ascii?Q?Icq6qht2hkFg6W8NwGCw1AhtV4On7oPHBRNJ7a/EU++QAj/hGdFvjDfZVpsn?= =?us-ascii?Q?5KxOs7r2+BDrIofpjTenWB6RcUdmseH+EYWEhVe3pz0VvNRaLcs2gmFKxpqM?= =?us-ascii?Q?Qd9OZk+LhqVTV/h3ej8B/SjFeXr41vBC8deKmLtZeoEkQ2MhHOzFhvMU9oKs?= =?us-ascii?Q?zXpXNCaQa8FFCUMzga6S2ddBkTfW0fueEdcetdaeYEI3aJC9ZxmPAHnH8lLR?= =?us-ascii?Q?3tdBXPHabkxUbI9HzLQakStaMTGiY3pEUjTc6cPV4MMNavgSN8zkT/18BCJC?= =?us-ascii?Q?M5rgNQZ8KWkzYUCbI8R540QPLF202Tfwj9ko1nYziSs0mvQTKtfThBFuitv7?= =?us-ascii?Q?23ji82Gykhj5GRc4i16itCYozGdfrAHHALQe1a1nZLgA/5AEpIbOGnkBhQK1?= =?us-ascii?Q?6GhbpoCw8N6ftMppjhmbVUcOKFWM51PO20X8lfR0q3wOL4KjbJc+COMXIxfd?= =?us-ascii?Q?+DyygRd6aDwlSVfnd0xqLLguGkZE7xcW1UsFVt4t8LdxaPab4hgW8I+OdWQ3?= =?us-ascii?Q?7acVbMomSU+HII/LX+56XSy2JGL8aqj8s8Zfi3hJNAS77a5ymZ7tywxAy/xI?= =?us-ascii?Q?0Jd40crLupp6bZztlQATb3ntHWpQg+VVMkeMHtwrXLeDGkmmoxoNzRHQhkoa?= =?us-ascii?Q?1D5TUjPjzSx9F09fCYoepiWR84CW6KfggGL5AtadZl/gX4Y0fvRsdyQCQudn?= =?us-ascii?Q?r/22lC8Viu1mwn5hg9vC4mCSMLJROGncDqdFYnNiYHDXmzkOAX5Bp5orRcO/?= =?us-ascii?Q?f6z6KjG0QzZSXvqfOpeIZe/ZQNivYeZF4Njg+AqmVoW+sIgfoMiiRgvrH1rA?= =?us-ascii?Q?vg3YMlTt1ow/JuSf0LfUmAknpyjaSDJ/hOszshIw90xdO2KAwDZtAMRs1XWm?= =?us-ascii?Q?lniU1/H40LlWESJpgUz0wsVrmSVFhVgvQH0SqdFz+QbE55sWRRkepyOV1yPW?= =?us-ascii?Q?3t3nK5N7PxrxZkO4H0velMTfyPE2lMvTDgGaRvpx6Ph6XdHQ8PMFvokkJOKn?= =?us-ascii?Q?aIRWV1EEmStPVI6Ya35ODEwe0GdQCJBs4zWa9ZTAVOOT3oQEFyspPvL5aa2m?= =?us-ascii?Q?kQo9BUYw8He3dgJ9RN/8B/lfLqcS87DVYkTxX4xuGwSwQmMXoNFSzMVl4rt3?= =?us-ascii?Q?Fpty/cX3c6S1GIpnhzBsQEAu5RjoN79GjHyoLW9zKJKqxi+EQWcu1qYSeTAn?= =?us-ascii?Q?Ql9OsigikDRzrJvDwq3XO3zAiJTm?= 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:(13230040)(376014)(366016)(1800799024); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?laY8y/IObtVUAPd/F85G5AQrmuwqull6XEHDHoHu6cEsl9iP5Ij+bfY4ENgd?= =?us-ascii?Q?942cZVhEbqMLoVOsV9GM3PpmIIw4qy2YPKz4Erd1fIZTFKMJGPMOHiXNzffC?= =?us-ascii?Q?9hrWKpIeguxjfUPq76RMaX0D2PLBop61hWDias54Yim08Dn+dxWP8/IOVURd?= =?us-ascii?Q?JTaGtJ+MRYwgISP14xjczmlBm0EdyvAj/3Q15IkKzaLfnJ7IguY3l1pAW43h?= =?us-ascii?Q?GejqYJjBgSWqf8OpaPztO/BPC0GKli29vi14YUy61ahtRd1ohw9IxhMR+BBb?= =?us-ascii?Q?9heu8DpO/g/iG3BUsbXSTMnvpEvVJVrNzTYgUK7g1UEUc62BSfFmHjjwUXd0?= =?us-ascii?Q?Zk8sGYLV1degrwjaoclEl43J6gZukamTwmR02GtN0yaOdIxp7G96riNU3s/i?= =?us-ascii?Q?DLVyXMimbpp24vbja+bL60Vf5Lg1zG1SxXXo1ppgtaWKHqcbnUiwMUKK7GD8?= =?us-ascii?Q?2DStiexgutMJBA4aNiNcdcefIFfA9YVq9uONuZCH2LafCm0ullE+UdS0IKuv?= =?us-ascii?Q?qsbEe8fjgm8OdvS5hA9Lf/4IecizaPsg2Dh48y55+be0k6AAxYv9rf9l8nbo?= =?us-ascii?Q?/CPgGMee/DJ+3eNvLigZEL134xOeOE+JVdQcLTHxiLnWq9gPokMrN7J7GMqG?= =?us-ascii?Q?BuPbRCgqfOD9t6sc/ojpQEgkNpqXKkmAeRolILUKVENpOfQzA+g3NPsXbwCK?= =?us-ascii?Q?zu/fqYT25whQsVprt6ww2SauZMjwe1ip+SnZL9b6Ly2EeF6i6Q8Ad94gEUuP?= =?us-ascii?Q?wa3+gspgclJyUZViC1RbExMUVkFCn/d1PTPthBRVfmy+ktjwHBovNRfmzrnO?= =?us-ascii?Q?htUQQoWYsFPPvkNg1EbeR/N/++C+Pc0mGxx81QgCW2QrZezszZYNJiV+cF82?= =?us-ascii?Q?TSZ80eGOtSdLsOVi0WQrWLxUKt+izvhjAxNCM6EPdvq9H3XaiTzfRDlZL7pj?= =?us-ascii?Q?P+zixajICCnCXJ3eP0c76cz+R//b/ULrz64L7azPlvQ56yTGMGn1dKClxw1B?= =?us-ascii?Q?jVAoxB9+9vTIO2z8l+rXXcagADrNglcJ+MvYeurehzhokJX0PJ0YXO1yz1wg?= =?us-ascii?Q?gBcLK1E48+K/zgTmXQqjGV0Iz8Z6PwB7aIuMk7sNpdUx8UsLClWBNJLe4BfX?= =?us-ascii?Q?wtAiFrz3qmUlc/6GTP+SovBqwO8SuurnoZR454Piabz/ZCcsGPk1DIG2vIGI?= =?us-ascii?Q?BHZYji/dSCbcdO22jhyZ0IIzN1WoUn9Qusi5rf4Sp5MaDXB5Q2iLEMtA1csG?= =?us-ascii?Q?XOiX7FOfMi6NYem+93OCMzGoiBlVVDgDTw75nEZUts+Gty9rfm5OwKkyIuxM?= =?us-ascii?Q?9Cks+G3EI2+h6+9JaPfwm50rnOWeNOMQ/1o++OVjBku8Y74E1/wQSV5fjC2W?= =?us-ascii?Q?o+OLFMObrxglPPXD6E0ei/rSNMtLb7L4pBWoBkFJESnaNcxaVqqsevLmk2cu?= =?us-ascii?Q?2fxy8qHvEb5faqIDYVP6rB2gtP71LYIyyETO+/LUYSXv0S7Qe73CS8q0+uC7?= =?us-ascii?Q?KHER4SHCoVlodbNvmx6WTPOr4tzIc1XlMXfnBMX/ZhIzBukTjtPFgfn3rix6?= =?us-ascii?Q?QoT3pkWMMZ2JLo5vlhxrDAwl64n5rQ1nyiqq0+WA?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a429be3-aece-4538-bd1e-08dd3ebfca8b X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 10:46:01.6017 (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: z5GQ7V4E8zNdCoPBQLn8gLESt17n66r9H/1F9ax5SozMaRC1DWdUlJtReJ+lSnBHRVNV8xbZ10qS02aUxzfdPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR17MB6954 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aCFnfuy9Wd1SDtATo7lIPs9OTFP0xzaROz8Dp8qS1Dk_1737974762 X-Mimecast-Originator: labware.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=WINDOWS-1252 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 This commit converts gdb.Symbol to use gdbpy_registry for lifecycle management. Since gdb.Symbol only holds on the struct symbol * (and prev/next links) the default invalidator can be used. --- gdb/python/py-symbol.c | 91 +++++------------------------------------- 1 file changed, 9 insertions(+), 82 deletions(-) diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index c157bd7f5d7..f891c5619d6 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -29,12 +29,6 @@ struct symbol_object { PyObject_HEAD /* The GDB symbol structure this object is wrapping. */ struct symbol *symbol; - /* A symbol object is associated with an objfile, so keep track with - doubly-linked list, rooted in the objfile. This lets us - invalidate the underlying struct symbol when the objfile is - deleted. */ - symbol_object *prev; - symbol_object *next; }; =20 /* Require a valid symbol. All access to symbol_object->symbol should be @@ -50,28 +44,8 @@ struct symbol_object { }=09=09=09=09=09=09=09\ } while (0) =20 -/* A deleter that is used when an objfile is about to be freed. */ -struct symbol_object_deleter -{ - void operator() (symbol_object *obj) - { - while (obj) - { -=09symbol_object *next =3D obj->next; - -=09obj->symbol =3D NULL; -=09obj->next =3D NULL; -=09obj->prev =3D NULL; - -=09obj =3D next; - } - } -}; - -static const registry::key - sympy_objfile_data_key; -static const registry::key - sympy_gdbarch_data_key; +static const gdbpy_registry> + sympy_registry; =20 static PyObject * sympy_str (PyObject *self) @@ -336,28 +310,17 @@ static void set_symbol (symbol_object *obj, struct symbol *symbol) { obj->symbol =3D symbol; - obj->prev =3D nullptr; if (symbol->is_objfile_owned ()) { /* Can it really happen that symbol->symtab () is NULL? */ if (symbol->symtab () !=3D nullptr) =09{ -=09 struct objfile *objfile =3D symbol->objfile (); - -=09 obj->next =3D sympy_objfile_data_key.get (objfile); -=09 if (obj->next) -=09 obj->next->prev =3D obj; -=09 sympy_objfile_data_key.set (objfile, obj); +=09 sympy_registry.add (symbol->objfile (), obj); =09} } else { - struct gdbarch *arch =3D symbol->arch (); - - obj->next =3D sympy_gdbarch_data_key.get (arch); - if (obj->next) -=09obj->next->prev =3D obj; - sympy_gdbarch_data_key.set (arch, obj); + sympy_registry.add (symbol->arch (), obj); } } =20 @@ -371,19 +334,11 @@ symbol_to_symbol_object (struct symbol *sym) /* Look if there's already a gdb.Symbol object for given SYMBOL and if so, return it. */ if (sym->is_objfile_owned ()) - sym_obj =3D sympy_objfile_data_key.get (sym->objfile ()); + sym_obj =3D sympy_registry.lookup (sym->objfile (), sym); else - sym_obj =3D sympy_gdbarch_data_key.get (sym->arch ()); - - while (sym_obj !=3D nullptr) - { - if (sym_obj->symbol =3D=3D sym) -=09{ -=09 Py_INCREF (sym_obj); -=09 return (PyObject*)sym_obj; -=09} - sym_obj =3D sym_obj->next; - } + sym_obj =3D sympy_registry.lookup (sym->arch (), sym); + if (sym_obj !=3D nullptr) + return (PyObject*)sym_obj; =20 sym_obj =3D PyObject_New (symbol_object, &symbol_object_type); if (sym_obj) @@ -401,34 +356,6 @@ symbol_object_to_symbol (PyObject *obj) return ((symbol_object *) obj)->symbol; } =20 -static void -sympy_dealloc (PyObject *obj) -{ - symbol_object *sym_obj =3D (symbol_object *) obj; - - if (sym_obj->prev) - sym_obj->prev->next =3D sym_obj->next; - else if (sym_obj->symbol !=3D nullptr) - { - if (sym_obj->symbol->is_objfile_owned ()) -=09{ -=09 /* Can it really happen that symbol->symtab () is NULL? */ -=09 if (sym_obj->symbol->symtab () !=3D nullptr) -=09 sympy_objfile_data_key.set (sym_obj->symbol->objfile (), -=09=09=09=09=09sym_obj->next); -=09} - else -=09{ -=09 sympy_gdbarch_data_key.set (sym_obj->symbol->arch (), -=09=09=09=09 sym_obj->next); -=09} - } - if (sym_obj->next) - sym_obj->next->prev =3D sym_obj->prev; - sym_obj->symbol =3D NULL; - Py_TYPE (obj)->tp_free (obj); -} - /* __repr__ implementation for gdb.Symbol. */ =20 static PyObject * @@ -791,7 +718,7 @@ PyTypeObject symbol_object_type =3D { "gdb.Symbol",=09=09=09 /*tp_name*/ sizeof (symbol_object),=09 /*tp_basicsize*/ 0,=09=09=09=09 /*tp_itemsize*/ - sympy_dealloc,=09=09 /*tp_dealloc*/ + 0,=09=09=09=09 /*tp_dealloc*/ 0,=09=09=09=09 /*tp_print*/ 0,=09=09=09=09 /*tp_getattr*/ 0,=09=09=09=09 /*tp_setattr*/ --=20 2.45.2