From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28634 invoked by alias); 11 Dec 2017 18:22:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 28620 invoked by uid 89); 11 Dec 2017 18:22:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.2 spammy=H*r:sk:EUR02-A, Hx-languages-length:2277 X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Dec 2017 18:22:13 +0000 Received: from ESESSHC007.ericsson.se (Unknown_Domain [153.88.183.39]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id D7.04.00652.3DCCE2A5; Mon, 11 Dec 2017 19:22:11 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.39) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 11 Dec 2017 19:22:10 +0100 Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AMSPR07MB310.eurprd07.prod.outlook.com (2a01:111:e400:802f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.323.4; Mon, 11 Dec 2017 18:22:08 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] remote: Return NULL extra_info/name if they are empty Date: Mon, 11 Dec 2017 18:22:00 -0000 Message-ID: <1513016513-26428-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: MWHPR21CA0071.namprd21.prod.outlook.com (2603:10b6:300:db::33) To AMSPR07MB310.eurprd07.prod.outlook.com (2a01:111:e400:802f::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 441f98be-0964-4520-825f-08d540c417b4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307);SRVR:AMSPR07MB310; X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;3:oAga6275AZ4mCBy7XjMH4hamxvYQyMkmwA4zzKWW6fMHAnvmCChQn7+ZamNVNcpeknqggLjLFMq+wJIqQARkSe0HAUXRlYxSBjAtgNYPy6np/mDinaSfvmDI28gg2IvmY1z8F6fpyoEH9cAzmF+7rER9lxND5dMAMN9/kCwWyW4i6OSOA3hXYJLFoYox8kc7qPdNFlliLXu+McTxqkkWHsnrLBP47dtaX9kKqbStw2gVzWpRedT317BeOvNZ/N6/;25:erjOMOc03xBV+1uYVjto1yYkQar5FhtnWtirhOtvpTbiFQY0XbVyn24rSdXrKCmhZ18a2Uyn0Jz6ToZGs17x8BaNnwLgcFts87bsifKag07PpWJpwYWiLvWxfOgbllXT8R9CbSnIX+SyER7piWe7iKL9ofANXVCtRmpmNwV63SlwEtEDHNDtm2kDgNPmbZU9/sWKqCEQLU77vX93wvU/UeTVxOHAtY73jnospLVhF1KJAZEe4d5pGofgY2Vr1JLsGizmJ7/yErxQpKOcAd4LUFvCr5gM4KLprKK0WECYy70ccQEavMgtPbekbw57OiDlPYEx2ODtg8LmcOiBd0UFPg==;31:u33VEAS8ZrVuEMjdeZpOKwRAusePAOssKzE8KWMZvAu3VApN/qNf/G0YHZh5vmGw3Q3vabKHsSLAXCfnbSi/J0iTEI7C+eK0aQwg5n9uHa5dqWDYGJBsa+JDUrotYMjWT0+gQFY7q+J0vqRUNkPNT2EDQnJk5hZqgfx+owz0IEpNmtkRdgBiC/r37HdioucuaxxytPyzhH2VRn3yT8NfhN/1P2rh72Ylebk1M8NPkFs= X-MS-TrafficTypeDiagnostic: AMSPR07MB310: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;20:pxUgomOwY5SAA00l1adepEiAcV/wVvhcgiI9QTB/0z2bCyLwfxK7SS5tuKS7i4yiG8feF6JC79lIsawbY1LxASU35DJzJWSkIyPgD4MU3U2gTmxUru56xuHw6RIfJXUa7fZCKnx+/hQiQf0lFP4g/qru1J1E3kNZKLrWyLJxvYzJcxCB7oNS9So65trjYydjRNGBW3DZGph0Eie4e9aE9yQcQEabPabYiIFBDkEPfV/p40sqmn/A5RNjZTx2nPAtAtqRku1hEw9TmImDi1Hk+NSi3fT05H0RZq+m+ZTHnTNem3xPFpZkWS3r9U7983XQV5dxOkWBmxuIPcHwIoijkOYlYE9rfawEhFT3L8Lx552o9Kwm1DR5rxr1Epu5V36byQTIzHgm5mPmR5VdQcJ0n9rQMBUj3Wd02gfMJhU4YUrh2jg8M+8FciFDGBS8h559EmDofNUQIJdRkCgdOZ5dPzsItw0aPePc51N8GTf7NCVJBZ5yL5zTspmrvIQBAidx;4:/yUKft2KWMB+ZO5VsnBCRoHhdQq0eA+M7W29uaMc/DtOkltUPQIcaeYLMpJIjfhtIZhU75rOqSuxBLXhkg8IyLxvcB2L45GccgH4Gbdfoz4TM4mdiGoJkK2G9iZh/M1bGW10vuZKat/ZS02T3+vwoSFFci0u/Bb45v/GU/XwhGqEVqq4ivzfargL1MbbmK2gSlRtw45f2Csy1N9R9qNDPb/YB/WO6Z7BrhOGGRB8/FDVwXOP5+ldoUXOCLkhEJ2ABAWXXUXndqSsmVwfKuA+Zg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231022)(10201501046)(3002001)(6041248)(201703131423075)(201703011903075)(201702281528075)(201703061421075)(20161123562025)(20161123564025)(20161123560025)(20161123555025)(20161123558100)(6072148)(201708071742011);SRVR:AMSPR07MB310;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:AMSPR07MB310; X-Forefront-PRVS: 0518EEFB48 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(7966004)(376002)(366004)(39860400002)(346002)(189003)(199004)(54534003)(4326008)(66066001)(2351001)(47776003)(106356001)(16586007)(316002)(5660300001)(105586002)(6666003)(2906002)(508600001)(6916009)(25786009)(51416003)(48376002)(2361001)(8936002)(97736004)(7736002)(305945005)(6506006)(81166006)(81156014)(8676002)(53936002)(50466002)(6512007)(68736007)(36756003)(52116002)(86362001)(6116002)(3846002)(50226002)(6486002)(16526018)(107886003);DIR:OUT;SFP:1101;SCL:1;SRVR:AMSPR07MB310;H:elxacz23q12.ca.am.ericsson.se;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AMSPR07MB310;23:I1pJdGm+LeEqCg6gvSy4921hhRL8YCIX/hN6xPfyKq?= =?us-ascii?Q?FhND9cPmOgvhHLiEkuU97LOIk/WPJ3H4I8N/ZFaJKiRhIBib6oEX+buhV3m2?= =?us-ascii?Q?yeS3Q1MasoTFAqWs3gkb4V7mM/hf25TraiTMeQQQVpXPJzu0BaUrle91Rbf7?= =?us-ascii?Q?pxTbO57WS2XjAlfzzNqRdCZzOWRB4E55Wc3H+fVpLuB7qHujsRDmYWB9IYF/?= =?us-ascii?Q?4DmBtVedXJzAQHcZot2BC7PxAw5iz7dDjbU82XraxqM4bSufCX4rPkXUqzpq?= =?us-ascii?Q?Tc3B1y4YpuF6V63cCwLTBIBcDR/Ne6OiIHVcIRx0q4bWXDd8hYJUXqdSadYv?= =?us-ascii?Q?euwjt8hSMvFOiauV1XORZaL2j3xGmWQGZFx3dNKQgX/8UoVlq045jfbR2lpu?= =?us-ascii?Q?p/oKMqORKA6BPKIEZY3v569Pk6AIprfPUxY4Dv+c/cEY/vZkJ27DkH8+ByQz?= =?us-ascii?Q?zxdexBn0ObiUU7QtmGFv1M+LNERcg34Hbz3Cbb2Zn67vC2qv0UVz8wPBpVjx?= =?us-ascii?Q?J0NyKiULqrjCmxFlTPuruI694YZP5oj1H2S0fVP5EJqKmi+KB2ojnTglpaNr?= =?us-ascii?Q?DFHdWDsnrF+Pm7kck88Uc45uDOF+h+N/knGPHyR3mpd5DIDDGr3IqvWKKb4l?= =?us-ascii?Q?BQIBD36+SVo7BLKvjtvcbU5b2qV4p2PnYpMNcFFEZOQs0+Emg7qXzOL7xM4G?= =?us-ascii?Q?YDiELoN2x80HkFTpXvj9rfES8ZrohbJfUCC7xkl48x09ZfOJ1urnoLYHhbKa?= =?us-ascii?Q?PsUnyrDogLdOlZp6iKrNMcXq35h/3w3IkNTQJKMwFkf4oPJ6rvEHDC8CYifJ?= =?us-ascii?Q?gdBOznlet1VLiD57aX5oXqwVgO5ZkwYk3J9COrmndg6CuDVqmqGBS02vPVhs?= =?us-ascii?Q?1jPXF4jYzFnld0bGxA58fzoYJQ3RapFEgWRwvYjUIxDtZ/5MoB6z7eaw2YBl?= =?us-ascii?Q?7GHIBmkII0EUfTtCNLauhQitZRvU1hP/cL37J8cNllmOSc9fi8DDQ/5Q2dTG?= =?us-ascii?Q?ENSBLAydo0bSpnTne1Zw/XJc7Afmyh1fx4L+0rSYWb7kg6+NzV7ChtWgY9GB?= =?us-ascii?Q?xM1fpGSkrui8ajJTccs1ZGDXOG?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;6:vf5yyMPHQldOqUjmxNQ6jdBdtXCcAROPslIXBVQ/GK8rdmqVzG5L/vM4wNYqUcpY2nvro2/qI0NtNkuvzww2O1nTHyNIT1m/QSAH4eWeP3T+J3y397SIHBth1ISKt4nXxuOCAbHPmnekExUjxlEN2BkVfufw8Jbu9MDBLN/DInR4WXx6NGUCGWBm9Vt7mi9PVDimlDZp8KFBCs5rEXX+S8KTmCDyaSYWmHydcSjud8zPkabzeLdUlTNZq8DtVA0IkpkjEQCuu5M+MfEsgcWaXv05hdzmNKyrAdLZ5UbqcYGY0+kGxrCF8w9vmow/TXXR1l6nyiajEj8GkF/kRaqBAnqzHQQJYXu10fPOxm6xplU=;5:fFIPWULSLi9CeusRL/rpJppp6ZszXoyjqDgPrevm3fsNSsQpZ1rSGqP8GZij2MJRDFWS/BRWOAnwtW7vAb+JdKAxy/E4WkCrVbBljM33vdO1W92PsVf6qVcMX1efsIC+tTT0EprdCuuyKYXPkPjrzCrh1vvAz7MnYRqxEjGKKNU=;24:5Ne8bZWkxyUnNoqV+mYtZQNkWy1X8yP2c2PJDEqu+8IS2MZL5mW/Sgwkc5lp0pj06nD1GW21zhB5fn8vIjx6txTKBORLOnCQdUSSANM8dFU=;7:DBjGPC1KyKcAfMpzVXi/+vm/f2Pl70KY9cBv9E6rnSM79d/paqt9ML0lVQt0EuCjq981afDiQWPa/jSMxVVV+GLvWzkFjbw4dp7ienS1Y7M8g17uNk+GBbYFJbW0HSWELXwcNJ3jtqHNahle+LJzXLItsqG5VMdkMXluQ/HlWTMaTL6QG3ROLctz/6Y/nZAMRnevevZ+lEnWX05ooCTSS+euYppuP2vaYT+baX+apQ+R/QqdiBkL8E/yNaomzNlY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2017 18:22:08.6860 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 441f98be-0964-4520-825f-08d540c417b4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB310 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2017-12/txt/msg00242.txt.bz2 Commit remote: C++ify thread_item and threads_listing_context 21fe1c752e254167d953fa8c846280f63a3a5290 broke the test gdb.threads/names.exp. The problem is that since we now use an std::string to hold the extra_info, an empty string is returned by target_extra_thread_info to print_thread_info_1 when the remote stub didn't send any extra info, instead of NULL before. Because of that, print_thread_info_1 prints the extra info between parentheses, which results in some spurious empty parentheses. Expected: * 1 Thread 22752.22752 "main" all_threads_ready () at ... Actual : * 1 Thread 22752.22752 "main" () all_threads_ready () a ... Since the bug was introduced by a behavior change in the remote target, I chose to fix it on the remote target side by making it return NULL when the extra string is empty. This will avoid possibly changing the behavior of the common code and affecting other targets. The name field has the same problem. If a remote stub returns no thread names, remote_thread_name will return an empty string instead of NULL, so print_thread_info_1 will show empty quotes ("") instead of nothing. gdb/ChangeLog: PR gdb/22556 * remote.c (remote_thread_name): Return NULL if name is empty. (remote_threads_extra_info): Return NULL if extra info is empty. --- gdb/remote.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index fe27713..852fdef 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -2268,7 +2268,10 @@ static const char * remote_thread_name (struct target_ops *ops, struct thread_info *info) { if (info->priv != NULL) - return get_remote_thread_info (info)->name.c_str (); + { + const std::string &name = get_remote_thread_info (info)->name; + return !name.empty () ? name.c_str () : NULL; + } return NULL; } @@ -3319,7 +3322,10 @@ remote_threads_extra_info (struct target_ops *self, struct thread_info *tp) struct thread_info *info = find_thread_ptid (tp->ptid); if (info != NULL && info->priv != NULL) - return get_remote_thread_info (info)->extra.c_str (); + { + const std::string &extra = get_remote_thread_info (info)->extra; + return !extra.empty () ? extra.c_str () : NULL; + } else return NULL; } -- 2.7.4