From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 17D503858D35 for ; Thu, 5 Jan 2023 09:49:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 17D503858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C202A6BCFE; Thu, 5 Jan 2023 09:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1672912145; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6NC+C/qmZZQ8lHak2hQzMBov+Qu1ogjt4a8jQpqq5C4=; b=sutMc814Fl7cuusk90f96BfSSxAN6UcOno9VeIbAX+vNlk0VdLYhvDzUKyhSSM+HSyZT+W 4nIdh/3I8dqUw/VlqHZkMhaMRrZfLYRo1bgRjW4lFI9+LaLThNmEL1f9cHhuGQa3CR9bui lhkKRM7eb2iHP+LXy1IiixmfKAVPh4A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1672912145; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6NC+C/qmZZQ8lHak2hQzMBov+Qu1ogjt4a8jQpqq5C4=; b=kInyjschBw2hSgArzRy0y4l72pVUl6MYW308wkpZqeab5vDhWbS3NWotN3XbSV1e6TrFHZ L3LC7nlLMihX3CAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A99C313338; Thu, 5 Jan 2023 09:49:05 +0000 (UTC) Received: from dovecot-director1.suse.de ([192.168.254.64]) by imap2.suse-dmz.suse.de with ESMTPSA id cM4SKBGdtmN0QwAAMHmgww (envelope-from ); Thu, 05 Jan 2023 09:49:05 +0000 Content-Type: multipart/mixed; boundary="------------n2gCaZvhg7PP0ChKiqPlowtx" Message-ID: Date: Thu, 5 Jan 2023 10:49:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [PATCH] [gdb/python] Avoid queue.SimpleQueue for python 3.6 Content-Language: en-US From: Tom de Vries To: Tom Tromey Cc: Tom Tromey via Gdb-patches References: <20220901163059.3678708-1-tromey@adacore.com> <87bkrk8j21.fsf@tromey.com> <877d1duivp.fsf@tromey.com> <87k024khch.fsf@tromey.com> <5cd9edba-b1b2-060e-d8d2-98ff6d28a5e7@suse.de> <87tu17iu2j.fsf@tromey.com> <7f2d41d6-ba52-a7da-4144-a252aabd10ea@suse.de> <0b6635ea-ee55-1edd-6f4b-149a3ab200f5@suse.de> In-Reply-To: <0b6635ea-ee55-1edd-6f4b-149a3ab200f5@suse.de> X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,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 List-Id: This is a multi-part message in MIME format. --------------n2gCaZvhg7PP0ChKiqPlowtx Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit [ was: Re: [PATCH] Initial implementation of Debugger Adapter Protocol ] On 1/4/23 13:27, Tom de Vries wrote: > On 1/4/23 12:59, Tom de Vries via Gdb-patches wrote: >> On 1/3/23 15:14, Tom Tromey wrote: >>> Tom> /home/vries/gdb_versions/devel/src/gdb/python/py-dap.c: In member >>> Tom> function ‘virtual void dap_interp::init(bool)’: >>> Tom> /home/vries/gdb_versions/devel/src/gdb/python/py-dap.c:83:27: >>> error: >>> Tom> ‘PyObject_CallNoArgs’ was not declared in this scope >>> Tom>    gdbpy_ref<> result_obj (PyObject_CallNoArgs (func.get ())); >>> Tom>                            ^~~~~~~~~~~~~~~~~~~ >>> Tom> /home/vries/gdb_versions/devel/src/gdb/python/py-dap.c:83:27: note: >>> Tom> suggested alternative: ‘_PyObject_CallNoArg’ >>> Tom>    gdbpy_ref<> result_obj (PyObject_CallNoArgs (func.get ())); >>> Tom>                            ^~~~~~~~~~~~~~~~~~~ >>> Tom>                            _PyObject_CallNoArg >>> Tom> ... >>> >>> Sorry about that.  I'm going to apply the appended, which should fix the >>> problem. >> >> That fixed the build problem, thanks for that. >> >> Now I'm running into an error in the testsuite: >> ... >> ERROR: eof reading json header >>      while executing >> "error "eof reading json header"" >>      invoked from within >> "expect { >> -i exp19 -timeout 10 >>          -re "^Content-Length: (\[0-9\]+)\r\n" { >>              set length $expect_out(1,string) >>              exp_continue >>          } >>          -re "^(\[^\r\n\]+)..." >>      ("uplevel" body line 1) >>      invoked from within >> "uplevel $body" NONE eof reading json header >> UNRESOLVED: gdb.dap/basic-dap.exp: startup - initialize >> ... > > Hmm, that seems to be because: > ... > (gdb) > #5  0x0000000000a59a7c in gdbpy_handle_exception () >     at /home/vries/gdb_versions/devel/src/gdb/python/py-utils.c:396 > 396             error (_("Error occurred in Python: %s"), msg.get ()); > (gdb) p msg.get () > $1 = 0x2b91d10 "module 'queue' has no attribute 'SimpleQueue'" > ... > > That's new in python 3.7, and I have: > ... > $ ldd ./gdb | grep python >         libpython3.6m.so.1.0 => /usr/lib64/libpython3.6m.so.1.0 > (0x00007f93ed624000) > ... Fixed by attached commit, any comments? Thanks, - Tom --------------n2gCaZvhg7PP0ChKiqPlowtx Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-python-Avoid-queue.SimpleQueue-for-python-3.6.patch" Content-Disposition: attachment; filename*0="0001-gdb-python-Avoid-queue.SimpleQueue-for-python-3.6.patch" Content-Transfer-Encoding: base64 RnJvbSAyNzA0YmE5MjdjMzY5ZDgzNGQ4Yjg4YWRiMTM2ZTMyM2YzYzIwMzZkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IFRodSwgNSBKYW4gMjAyMyAxMDozNDo1OCArMDEwMApTdWJqZWN0OiBbUEFUQ0hd IFtnZGIvcHl0aG9uXSBBdm9pZCBxdWV1ZS5TaW1wbGVRdWV1ZSBmb3IgcHl0aG9uIDMuNgoK T24gb3BlblNVU0UgTGVhcCAxNS40IHdpdGggcHl0aG9uIDMuNiwgdGhlIGdkYi5kYXAvYmFz aWMtZGFwLmV4cCB0ZXN0LWNhc2UKZmFpbHMgYXMgZm9sbG93czoKLi4uCkVSUk9SOiBlb2Yg cmVhZGluZyBqc29uIGhlYWRlcgogICAgd2hpbGUgZXhlY3V0aW5nCiJlcnJvciAiZW9mIHJl YWRpbmcganNvbiBoZWFkZXIiIgogICAgaW52b2tlZCBmcm9tIHdpdGhpbgoiZXhwZWN0IHsK LWkgZXhwMTkgLXRpbWVvdXQgMTAKICAgICAgICAtcmUgIl5Db250ZW50LUxlbmd0aDogKFxb MC05XF0rKVxyXG4iIHsKICAgICAgICAgICAgc2V0IGxlbmd0aCAkZXhwZWN0X291dCgxLHN0 cmluZykKICAgICAgICAgICAgZXhwX2NvbnRpbnVlCiAgICAgICAgfQogICAgICAgIC1yZSAi XihcW15cclxuXF0rKS4uLiIKICAgICgidXBsZXZlbCIgYm9keSBsaW5lIDEpCiAgICBpbnZv a2VkIGZyb20gd2l0aGluCiJ1cGxldmVsICRib2R5IiBOT05FIGVvZiByZWFkaW5nIGpzb24g aGVhZGVyClVOUkVTT0xWRUQ6IGdkYi5kYXAvYmFzaWMtZGFwLmV4cDogc3RhcnR1cCAtIGlu aXRpYWxpemUKLi4uCgpJbnZlc3RpZ2F0aW9uIHVzaW5nIGEgImNhdGNoIHRocm93IiBzaG93 cyB0aGF0OgouLi4KKGdkYikKICAgIGF0IGdkYi9weXRob24vcHktdXRpbHMuYzozOTYKMzk2 ICAgICAgICAgICAgIGVycm9yIChfKCJFcnJvciBvY2N1cnJlZCBpbiBQeXRob246ICVzIiks IG1zZy5nZXQgKCkpOwooZ2RiKSBwIG1zZy5nZXQgKCkKJDEgPSAweDJiOTFkMTAgIm1vZHVs ZSAncXVldWUnIGhhcyBubyBhdHRyaWJ1dGUgJ1NpbXBsZVF1ZXVlJyIKLi4uCgpUaGUgcHl0 aG9uIGNsYXNzIHF1ZXVlLlNpbXBsZVF1ZXVlIHdhcyBpbnRyb2R1Y2VkIGluIHB5dGhvbiAz LjcuCgpGaXggdGhpcyBieSBmYWxsaW5nIGJhY2sgdG8gcXVldWUuUXVldWUgZm9yIHB5dGhv biA8PSAzLjYuCgpUZXN0ZWQgb24geDg2XzY0LWxpbnV4LCBieSBzdWNjZXNzZnVsbHkgcnVu bmluZyB0aGUgdGVzdC1jYXNlOgouLi4KICMgb2YgZXhwZWN0ZWQgcGFzc2VzICAgICAgICAg ICAgNDcKLi4uCi0tLQogZ2RiL3B5dGhvbi9saWIvZ2RiL2RhcC9zZXJ2ZXIucHkgIHwgNiAr KysrKy0KIGdkYi9weXRob24vbGliL2dkYi9kYXAvc3RhcnR1cC5weSB8IDYgKysrKystCiAy IGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZ2RiL3B5dGhvbi9saWIvZ2RiL2RhcC9zZXJ2ZXIucHkgYi9nZGIvcHl0aG9u L2xpYi9nZGIvZGFwL3NlcnZlci5weQppbmRleCBkNmZjMGJkNTc1NC4uZjhjYjYxNzBhOTYg MTAwNjQ0Ci0tLSBhL2dkYi9weXRob24vbGliL2dkYi9kYXAvc2VydmVyLnB5CisrKyBiL2dk Yi9weXRob24vbGliL2dkYi9kYXAvc2VydmVyLnB5CkBAIC0xNSw2ICsxNSw3IEBACiAKIGlt cG9ydCBqc29uCiBpbXBvcnQgcXVldWUKK2ltcG9ydCBzeXMKIAogZnJvbSAuaW8gaW1wb3J0 IHN0YXJ0X2pzb25fd3JpdGVyLCByZWFkX2pzb24KIGZyb20gLnN0YXJ0dXAgaW1wb3J0ICgK QEAgLTQ3LDcgKzQ4LDEwIEBAIGNsYXNzIFNlcnZlcjoKICAgICAgICAgIyBUaGlzIHF1ZXVl IGFjY2VwdHMgSlNPTiBvYmplY3RzIHRoYXQgYXJlIHRoZW4gc2VudCB0byB0aGUKICAgICAg ICAgIyBEQVAgY2xpZW50LiAgV3JpdGluZyBpcyBkb25lIGluIGEgc2VwYXJhdGUgdGhyZWFk IHRvIGF2b2lkCiAgICAgICAgICMgYmxvY2tpbmcgdGhlIHJlYWQgbG9vcC4KLSAgICAgICAg c2VsZi53cml0ZV9xdWV1ZSA9IHF1ZXVlLlNpbXBsZVF1ZXVlKCkKKyAgICAgICAgaWYgc3lz LnZlcnNpb25faW5mb1swXSA9PSAzIGFuZCBzeXMudmVyc2lvbl9pbmZvWzFdIDw9IDY6Cisg ICAgICAgICAgICBzZWxmLndyaXRlX3F1ZXVlID0gcXVldWUuUXVldWUoKQorICAgICAgICBl bHNlOgorICAgICAgICAgICAgc2VsZi53cml0ZV9xdWV1ZSA9IHF1ZXVlLlNpbXBsZVF1ZXVl KCkKICAgICAgICAgc2VsZi5kb25lID0gRmFsc2UKICAgICAgICAgZ2xvYmFsIF9zZXJ2ZXIK ICAgICAgICAgX3NlcnZlciA9IHNlbGYKZGlmZiAtLWdpdCBhL2dkYi9weXRob24vbGliL2dk Yi9kYXAvc3RhcnR1cC5weSBiL2dkYi9weXRob24vbGliL2dkYi9kYXAvc3RhcnR1cC5weQpp bmRleCBhY2ZkY2I0ZDgxYi4uNTIzNzA1YTU5MzMgMTAwNjQ0Ci0tLSBhL2dkYi9weXRob24v bGliL2dkYi9kYXAvc3RhcnR1cC5weQorKysgYi9nZGIvcHl0aG9uL2xpYi9nZGIvZGFwL3N0 YXJ0dXAucHkKQEAgLTIyLDYgKzIyLDcgQEAgaW1wb3J0IHNpZ25hbAogaW1wb3J0IHRocmVh ZGluZwogaW1wb3J0IHRyYWNlYmFjawogZnJvbSBjb250ZXh0bGliIGltcG9ydCBjb250ZXh0 bWFuYWdlcgoraW1wb3J0IHN5cwogCiAKICMgVGhlIEdEQiB0aHJlYWQsIGFrYSB0aGUgbWFp biB0aHJlYWQuCkBAIC0xNzMsNyArMTc0LDEwIEBAIGRlZiBzZW5kX2dkYl93aXRoX3Jlc3Bv bnNlKGZuKToKICAgICAiIiIKICAgICBpZiBpc2luc3RhbmNlKGZuLCBzdHIpOgogICAgICAg ICBmbiA9IEludm9rZXIoZm4pCi0gICAgcmVzdWx0X3EgPSBxdWV1ZS5TaW1wbGVRdWV1ZSgp CisgICAgaWYgc3lzLnZlcnNpb25faW5mb1swXSA9PSAzIGFuZCBzeXMudmVyc2lvbl9pbmZv WzFdIDw9IDY6CisgICAgICAgIHJlc3VsdF9xID0gcXVldWUuUXVldWUoKQorICAgIGVsc2U6 CisgICAgICAgIHJlc3VsdF9xID0gcXVldWUuU2ltcGxlUXVldWUoKQogCiAgICAgZGVmIG1l c3NhZ2UoKToKICAgICAgICAgdHJ5OgoKYmFzZS1jb21taXQ6IGIyNmM4NDM4YzcxZDQ0NDI3 ZmM5YzdlZjZmYTJhYjE3NDJkMjIwYTkKLS0gCjIuMzUuMwoK --------------n2gCaZvhg7PP0ChKiqPlowtx--