From patchwork Thu Mar 8 23:34:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26246 Received: (qmail 74445 invoked by alias); 8 Mar 2018 23:34:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 74435 invoked by uid 89); 8 Mar 2018 23:34:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=zu, HTo:U*alarson, larson, 8725 X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Mar 2018 23:34:36 +0000 Received: from ESESSHC022.ericsson.se (Unknown_Domain [153.88.183.84]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id FE.E0.21824.988C1AA5; Fri, 9 Mar 2018 00:34:33 +0100 (CET) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC022.ericsson.se (153.88.183.84) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 9 Mar 2018 00:34:33 +0100 Received: from ESESBMB504.ericsson.se (153.88.183.171) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Fri, 9 Mar 2018 00:34:32 +0100 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB504.ericsson.se (153.88.183.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Fri, 9 Mar 2018 00:34:32 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from [142.133.49.54] (192.75.88.130) by BL0PR1501MB2003.namprd15.prod.outlook.com (2603:10b6:207:31::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Thu, 8 Mar 2018 23:34:26 +0000 Subject: Re: PATCH for minor buglet in remote.c misreporting REMOTE_DEBUG_MAX_CHAR messages To: , References: From: Simon Marchi Message-ID: Date: Thu, 8 Mar 2018 18:34:17 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: X-ClientProxiedBy: MWHPR15CA0044.namprd15.prod.outlook.com (2603:10b6:300:ad::30) To BL0PR1501MB2003.namprd15.prod.outlook.com (2603:10b6:207:31::33) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2787c297-83dd-47a9-1d22-08d5854d21ca X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BL0PR1501MB2003; X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2003; 3:I0mZwT+d8bYI0+Z2QuKOc7Q1+v9OS6sL90benTf7M9oeQnoykRxZp4Kywp3z2iLNKsOc6uy3mwj4WoNDMDvGN0qRyaapmicT7xOJG9TGfzOTnQoW0uWSojma2lZgi7XJK3VFXdPOASDPxFnDvDgg/Qa38IK4sCwHWP7tbX9VNnzvLZcNYMVo6aTOC+lF74dLBt4hHCKR/3gJeXzSiV3wGK+Yza2gemk5BGO9Byi/aH3uXKCrxTjx5vYXPTp/1jHT; 25:PBEWhjnkkkyjzuSjujdWB5VowowQTcUe1hwdcP8ENdsULzy8xgoI2ILx9N9t7se6LC/6BSniXrqKNcruXsKySfV3iemPFrIMyABtqX9Ti4eZAyUKSlsnj/cj1MXh7lXhBcYf432CytIdqKMBJlaFtmK5C5wKhKkZMuVkhSQSGOk+8ccge+9XQSnkWkrjoIx9lALqbE0TB9oSo+KxKFDakbdpdGkc8lgJG30Hd5gfekZoeL3qM7SFcVT9vhsTxuQ4RWYwdcogmOVdWNIGdJYcwsuDW54hUljC38dL8/LPJrFyLL605MRdfWXk619LJRbcpcE78qFpBJ5hhWb3QXpncg==; 31:m/R+/gaL/w2ySJAEscOYEdCIwUsWO5O5WGHSE3LkSZcV+OP+Y5GX6VgfB0WQOYRD6lWuJbSRVmeCeM2KSo4r+vvM9tZh4YF1GHu4cDfvVacGoMCGeJYOus7OzHh672aWj5thM1t7J6HDtL4JXhEKAyc6m8XQjMbNfT1YZGpePqbJky9NV5N0ochFOgRVDPAXNt2fiuxLr7ayyhcipCQYyHO4wxOkWd/SmLtL8K9b/u4= X-MS-TrafficTypeDiagnostic: BL0PR1501MB2003: X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2003; 20:18UoCAUoRo3cBrqeAoUcrM7019ETEWMZLNiadeSh9Hk37Mqpz7d5juDQpai/Y5q397bL3p/t+Yg11MkhxRb5qEJhkFyWJ2WsKuTJpZbexrjhF1Ous8Jhm00psrZvabdVgHw+9yKA+DkA8SSTthIA/Lw2Eqhn2RgcFXqI5K861up8JZoZBA1yR9YiaeJ2AdAR96ur0BtbySMMhRWeAN6h4IWDiSRUoNa520LCSN+IBIp+t6DMe27BGwNgX+OcezP2Iut3qnfEhytw0Xt7WkTcvNzQKFsCjyreWO6Vrf7PtDBo9Qih9ZrsQZ/TjSb5krKjQv44loltHCfoVLhvhEA9Ri6mzDcDZuS875O9rKv4qdU2R+eMIK9+qYswmj6S7p5BUwrkXv3K5msqgEcxmsuvMZBCYXfE6IBGUaWBlOy7H5TANymjhzIYfSqUN6gAjDsHDuIt/Nyz5N/EW9ihRmxjjX52u/CuKZZcOpbVYaetMkRsFow5XPFYckde2cAP2Sla; 4:44iyeXQqDzAdcNjokVPEtHf6Mjjk3JjWVof1ivgrAiqjeuYr5Qx3aebS/vyfSTuobC5igNmhjkwXRtquawKvUCqynICQ3T6txkiTBDnfNRrFiUadjGFO46hB30dbELVGpr41xBuvXV8UM+vbi5lhUoYa3zDWdAtrjfXKpxzwggdD2hvxXxFWgC0qQxB82igpRjZZva0IGsFt1XVu3rjlxOLWmOTAKlMIDINsqG6UG/WnopDQcXdStxaGJoRXCW7X9dc82QnggmKjdAyxgOw4dQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040519)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231220)(944501244)(52105095)(6041307)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BL0PR1501MB2003; BCL:0; PCL:0; RULEID:; SRVR:BL0PR1501MB2003; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(366004)(346002)(376002)(39380400002)(39860400002)(396003)(199004)(54534003)(189003)(51914003)(377424004)(7736002)(36756003)(26005)(229853002)(53546011)(386003)(5180700001)(1720100001)(478600001)(6116002)(305945005)(3846002)(2906002)(10710500007)(2870700001)(16526019)(2420400007)(106356001)(15650500001)(25786009)(186003)(97736004)(31696002)(68736007)(47776003)(7110500001)(65956001)(66066001)(65806001)(49976009)(53936002)(316002)(6246003)(16576012)(8936002)(6486002)(65826007)(53376002)(76176011)(81166006)(81156014)(8676002)(2486003)(58126008)(6306002)(105586002)(86362001)(31686004)(6666003)(64126003)(52146003)(5660300001)(2950100002)(966005)(50466002)(23676004)(52116002)(78286006); DIR:OUT; SFP:1101; SCL:1; SRVR:BL0PR1501MB2003; H:[142.133.49.54]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDBQUjE1MDFNQjIwMDM7MjM6RWRhRnZQOG9UTDNnaDVrK1cxYVgxOWhv?= =?utf-8?B?Y01VWXUyb21yUUZVNXVPOFhUSkh3NmlMOWVsU09HeVVKZjI3SFNXMGpXWXox?= =?utf-8?B?bHQ2SEZlcXVIRnFXY3RiT0M2REgvYzZtTG8yL0ZtQUhhQXpiS1htK3NPWnlG?= =?utf-8?B?bWkwbk1mM0ZHcG80M0lOSGNpWGxBdWFTaWZyYm1RZnFUWEFZY1hST21wNEFx?= =?utf-8?B?cnRMcUVFeXB5VUNaRlp0UVM4NUtkbXlUU01yL2psTDR4MGdKamFrcUlsMGdS?= =?utf-8?B?RExZdm5vNkkreTA0K2JjeFFiVk1YTHJKNTErRTZycFl3NFdVaVVaWGtCR21C?= =?utf-8?B?SVk0d2pYMEJtSjVCWjF3RjFWSHI4eWlGWTV3SmVzak5zZjI5NWZTWVNlbngz?= =?utf-8?B?N0VGaE91RG9lV1NOZG94dEF6STlLelhDNXN4NUZHSmVxUGdyQTBydlM3b0Zn?= =?utf-8?B?dlRmdTY0bTJZRGZOT1RmMkRuclk4ODhBSGw0MjNqQS9xSy81amRBenJocHds?= =?utf-8?B?aG5nMmdnRlZPcU1KYTBIRW5DZXNZQlN4Z0RGcWR1bFdtcUhHTDg2N2FZNVQz?= =?utf-8?B?emxFeWV5QU1CRkJtalUwRkZ6Vm1aUmkxbFJFVEIxQTJSNWFvTjVSaVpHMWJ6?= =?utf-8?B?Y3pOZEkrNDI3TEV3dFFiUnJrVUZLUHFJcitVRGVVdkdra1JzTDNoUkJuNTln?= =?utf-8?B?Qm1ERnN0QWlkRFNWYVlMZlFSNEJHRVBrZ1pRSEtPMzVoQkRqc0huVGYrOHFs?= =?utf-8?B?Z0NBYkV0ZjNqYXpqNTdKZDlEUHVlRzNvcFZHWkJPdi8wOUhtcU4zcXE1di8r?= =?utf-8?B?dFF4YnpEbXdBOFNtOXI3b1BHNGFwUW55Mjd4WFlyZEw3aGd0M2RKdkxZcXpi?= =?utf-8?B?SzBBcHBSZFpvU2ZnN0ttUURwNFFYbnBoUUYzUVVuNExkd1pIbzU1OVlMZHNN?= =?utf-8?B?a2RRZTNNMHZ5Qnl3S0ZFZHljN3FleWM1VStVVnBtYk1GbDNqQW5KbzVnZmNU?= =?utf-8?B?YVpQWjlURmg1NCtZMVpCY1JoMUtKWHhRcEFzK1MycHgwUGcrelRXQm1UREtC?= =?utf-8?B?UVYzaFJVUHA3NzZTdmd1NDFjTUZnWmpwOEszZTdxYkJIaGxwRm5XSkI2b0Zu?= =?utf-8?B?WS9zTVg3Sk14ejFpdDB1dWFzMmNyMS9ZRUJaSUZuTVhIK2w5QW42TzA4YmNN?= =?utf-8?B?bFUrN09ySkpCYUFyQWlKbGhmT29Ucjc3eDYxV1FQSCtJTm90Z0dKdVRzR0ps?= =?utf-8?B?czF2bXZtSUwrY1MrQ3crS0JEdnVzVCt1NTFseUxrRWZQcjRaOHhUSVhpRUpK?= =?utf-8?B?UWVPL1FuWE4xQTdZT0pWeit1ZzVCUnBQRnh0MlRnS2U5ZXBDVExrOTNCUEds?= =?utf-8?B?YXJRSnF0Y1Q5bkJiVjlma3A0amszTnVSLzcrcGtpdEtzVzI1c0ZhZ0t1NHpz?= =?utf-8?B?aWN0cVBEM2k3Y3E3cmxVZXpSYldwdTUyczJmSTVQT05sckgxS0VFSFR1NE5q?= =?utf-8?B?WDVmSks4L2l1a0pySE16RzhONndIZEhsOURFcmpOaExDQTVETk04VytLakpE?= =?utf-8?B?OUVVSHBUSktxL0ZWNjJyT1VRQUFrMjFaSHo1L3JWbTQydmEwUllwV2JpaFhP?= =?utf-8?B?T2VMNEN4clZ6MHNQUTFLREh4SjJ6d01yc09UT1RGS3hBUW5zYitZWXhaZkVP?= =?utf-8?B?WmxPcDNxSnlFdXdHcGo0RlpEQ1BqUE5Qd1ZGR1pldUVkTFJGcDJpL2pKUlh6?= =?utf-8?B?UzlwWjBRU3lLRUw1T243VzQxTnVCZTZaamxaY2dxTUVTU3p0MUtncnBrRUVH?= =?utf-8?B?aUpZcEd6QS9UbGJKQVk0bUpKU0JPaHJra1NTM0xya0xMMTZiSlFIQVlKZXgw?= =?utf-8?B?bEdncnVCRHZ1WFJaOGtJeEEya0I2RDVRMkMzNGlNTHdmSlFadnBoRkFsaWJj?= =?utf-8?B?TXBjMElweDNuVlpWNU5xZlNhd3diNmJubWEwVWxaR1dnZGNlQ09HemJUWFJI?= =?utf-8?B?M3hyT2h1ZWRnSklkcWV4a2R2eElLM2lJcFZJWnJKdnVlUGY3YjlSL1ROZ2x3?= =?utf-8?B?M0k2NG16cVlwNGFQaTNXRGFlTzZZRlBLYXVoY0hvR3lGVS9Lelg0MWpHcVda?= =?utf-8?Q?lgmJZn0eknXRxLzIyKRSLy+QoLdZK/NSigarhXIlZFKsxi?= X-Microsoft-Antispam-Message-Info: 0SR9l55ymhMm3wama5FuqPhcSvkfdrpD+nlxGYDZvUS87b+dvWWxZ4HdBkcF8gbgIgr4NkzZWuL0KY+R7IcGSSblJWdmWLeBrIch3b0sjzhaa4r4j8zDjOgpJYXRuVNPq456r819/K5ebDKACsuaF8bx6xWw6mnBRfpJvQJFQH/HbIlFNWg+mWGUyne59bdw X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2003; 6:LwpcqnegzwdrNNKWTbGQKxIceQIRxfjMVsTI1+jGhi9vk4/TQSFSCIhGg24HHiJgLtvJIJt4QBGGmhHipHFvh9PxpD2HQQemhlduLfwZt5KTcKj/4VoYCaWHvnB+ouYeqTc4LUlnvfa5/rKAZnqM0ahxOzT4Mc3CgxG9APEDycCbRnO9xChVmPhRuUTuJ9d1aFwtmOk1Br0yHD24pmQxVibaHJkpeWZfVyVq7dZS7x5gHmn8/yqNGTfRCHfKby6Aw/JIrJvklNTzgDxzQiCRI+dkxTcT+ED1fkfHY8G6cRHPhFCv8A3V9eLqfzQn11uaSR2C6uCndig+2VbL4S5+7KuTZqNrmQhuOm+++NMTDFA=; 5:PGv1KNTZhNd+0oFXlW9jsnmvfMz2tjlFpsOTekYToB1X6kAv/zD0QAeHYSyHVmfSI7wB5hWsrN0y1Xf2xFjdhaI9IldLA2HJ61eEh32QgCnD/R4b6Uoe4oWRfAn6AWXudia+XF6KzZ8LQMTzJUOwPwh7LHwp51dIQVHJoYZ0KSo=; 24:hLFw+TiW+k6FFPmxvqWFJAr0cEvzFJ4uEEvPHf5Ethv+nKz4W8YYi5wNRj7Jy1m4+d4115ODc5UiGuMioEgMdiNGNDgTQhQbP9Rhm5kxHvc=; 7:IXMGHU+K8GX0ZW4PGCZ61q1Mv93OfTjNeW/6g49BB1g4eh0OFtUkG5P31JeSXznT9Obn7qPgk0gFtfbe/uHDb1eeE94z213ZP9iKFoUJEOhGkZTPxNvTf6B5gp0h0GNCcp5uKjWDbdOXVqSTP/OvOTB9A87x44KT1th4An3R5M2vY3RwxHGhBsn16wpOPQfsEogFFD54I3j2EGUvZ/y+SKyOQPDh2tR/dL/3eB8YCru17AwWVsHxfKwH5Zgzxbtn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 23:34:26.2412 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2787c297-83dd-47a9-1d22-08d5854d21ca X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR1501MB2003 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes On 2018-03-02 12:14 PM, alarson@ddci.com wrote: > In remote.c, when the output of "set debug remote" is truncated, the > number of characters reported is incorrect. What is reported is the > number of characters added by the quoting, not the number of characters > that were truncated. I'm not up to speed on the GDB patch process , but > here are the necessary changes if someone is willing to be a proxy: > > --- gdb/remote.c 2017-09-07 08:28:11.000000000 -0600 > +++ ../../gdb-8.0.1/gdb/remote.c 2018-03-02 11:07:33.465414200 > -0600 > @@ -8768,10 +8768,10 @@ > > fprintf_unfiltered (gdb_stdlog, "Sending packet: %s", str.c_str > ()); > > - if (str.length () > REMOTE_DEBUG_MAX_CHAR) > + if (len > REMOTE_DEBUG_MAX_CHAR) > { > fprintf_unfiltered (gdb_stdlog, "[%zu bytes omitted]", > - str.length () - REMOTE_DEBUG_MAX_CHAR); > + len - REMOTE_DEBUG_MAX_CHAR); > } > > fprintf_unfiltered (gdb_stdlog, "..."); > @@ -9210,10 +9210,10 @@ > fprintf_unfiltered (gdb_stdlog, "Packet received: %s", > str.c_str ()); > > - if (str.length () > REMOTE_DEBUG_MAX_CHAR) > + if (val > REMOTE_DEBUG_MAX_CHAR) > { > fprintf_unfiltered (gdb_stdlog, "[%zu bytes omitted]", > - str.length () - > REMOTE_DEBUG_MAX_CHAR); > + val - REMOTE_DEBUG_MAX_CHAR); > } > > fprintf_unfiltered (gdb_stdlog, "\n"); > Hi Aaron, Thanks for the patch, it does indeed seem bogus to me. Some tips for the next time you want to submit a patch: - Use git-send-email if possible, it makes it much easier to apply the patch (your patch has some lines wrapped, which makes it difficult to work with). - Add a ChangeLog entry in your commit message. You can find more details here: http://sourceware.org/gdb/wiki/ContributionChecklist This patch was small enough that it was easy to re-do by hand, so don't worry about it. I made some small changes: - Remove unnecessary curly braces that were there previously, to comply with the GNU coding style. - Adjust the format string, since I had this compiler error: /home/emaisin/src/binutils-gdb/gdb/remote.c:8725:32: error: format ‘%zu’ expects argument of type ‘size_t’, but argument 3 has type ‘int’ [-Werror=format=] len - REMOTE_DEBUG_MAX_CHAR); ^ Other than that the patch is unchanged. Are you ok with me pushing the following patch on your behalf? (Note that I took the liberty to Google your name, since you had only provided your email address :)) From c8b93cd02bb22a7c62d5bacc4591ed69ac8785a1 Mon Sep 17 00:00:00 2001 From: Aaron Larson Date: Thu, 8 Mar 2018 18:22:29 -0500 Subject: [PATCH] Fix misreporting of omitted bytes for large remote packets In remote.c, when the output of "set debug remote" is truncated, the number of characters reported is incorrect. What is reported is the number of characters added by the quoting, not the number of characters that were truncated. gdb/ChangeLog: * remote.c (putpkt_binary): Fix omitted bytes reporting. (getpkt_or_notif_sane_1): Likewise. --- gdb/remote.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 134a97e..7f409fd 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8720,11 +8720,9 @@ putpkt_binary (const char *buf, int cnt) fprintf_unfiltered (gdb_stdlog, "Sending packet: %s", str.c_str ()); - if (str.length () > REMOTE_DEBUG_MAX_CHAR) - { - fprintf_unfiltered (gdb_stdlog, "[%zu bytes omitted]", - str.length () - REMOTE_DEBUG_MAX_CHAR); - } + if (len > REMOTE_DEBUG_MAX_CHAR) + fprintf_unfiltered (gdb_stdlog, "[%d bytes omitted]", + len - REMOTE_DEBUG_MAX_CHAR); fprintf_unfiltered (gdb_stdlog, "..."); @@ -9157,11 +9155,9 @@ getpkt_or_notif_sane_1 (char **buf, long *sizeof_buf, int forever, fprintf_unfiltered (gdb_stdlog, "Packet received: %s", str.c_str ()); - if (str.length () > REMOTE_DEBUG_MAX_CHAR) - { - fprintf_unfiltered (gdb_stdlog, "[%zu bytes omitted]", - str.length () - REMOTE_DEBUG_MAX_CHAR); - } + if (val > REMOTE_DEBUG_MAX_CHAR) + fprintf_unfiltered (gdb_stdlog, "[%d bytes omitted]", + val - REMOTE_DEBUG_MAX_CHAR); fprintf_unfiltered (gdb_stdlog, "\n"); }