From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 102822 invoked by alias); 20 Nov 2017 16:35:19 -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 102764 invoked by uid 89); 20 Nov 2017 16:35:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KB_WAM_FROM_NAME_SINGLEWORD,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1361 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, 20 Nov 2017 16:35:17 +0000 Received: from ESESSHC020.ericsson.se (Unknown_Domain [153.88.183.78]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id F1.BF.19528.244031A5; Mon, 20 Nov 2017 17:35:14 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.78) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 20 Nov 2017 17:35:14 +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.260.2; Mon, 20 Nov 2017 16:35:12 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 09/19] Remove usage of find_inferior in find_lwp_pid Date: Mon, 20 Nov 2017 16:35:00 -0000 Message-ID: <1511195683-2055-10-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1511195683-2055-1-git-send-email-simon.marchi@ericsson.com> References: <1511195683-2055-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: CY4PR03CA0075.namprd03.prod.outlook.com (2603:10b6:910:4d::16) To AMSPR07MB310.eurprd07.prod.outlook.com (2a01:111:e400:802f::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 55572041-a346-4cf5-f9d2-08d53034acb1 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258);SRVR:AMSPR07MB310; X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;3:Y8UyziawqJ2hawOkcpRZiAZe4TmReiQ/B7Wm0KWcpB5aFqSBG2OujyrBzSfPljckdYfedfQk09guBjqUz+znSPALDjQQuLAsuIuMkOveW9yYz5PoUFGbgH3OBrA9eXq7F+PwsOG+qfBiQvQIo/b/jqt7ghndKRMqZfsBwz5dR1JFEbnqjVHKAbYJjj35zowI0q5WpbEBySrYkyf4oLIWUfcFSGBXKTzpnv/JkjpVGBbOt+8eWpHhLQWJDPVoGkK7;25:pNRqU0FiuM/hYU76zlzmgpAFaWXWNv+cA9c0Jfbs/cpVPXKZawAB4ngTEhQfyTvNaybdeZILP8GECHZpj12n4N9owaRonCLtTMDiPVD+2++38pSVAoRmVn12xKG3kPsklWvzNF63ZN9SbiKZRWFOHYEpXOkyuIMP3gV4dSkOtMAxQi2nNBnR3xHYp0vkYEFPxXTiGZdR7Q2Ejbd/kbiXc8eMHZM8QCLQZ9kFjOjkGlLFV9b/PYPBZ+Vv0WhZNigymRHTRmlcNhmrqehwWP20WjPUfdPUOB0IsSkAYGW6wI+PwsbGfc2L1kKoWGj9l4CciOwR23VNjHJLyFsXXHkNSw==;31:dIM3MYFCM87Zx5Z1f/IDgEfPhAnjrIg3zYoIzGfD37j4yMZD296G3N0hNCNoAFgRLkW7W3adtul5bKS899vEcDEDrpmCEeGRumOLieRjkmPw4xJb236PFoS7HWWQCtiFzNZo3qIqsNSZACvNyOnHUdPm+dl3V83aKD3jeZsmKqTwNRL0BkiyxU7stRh8Oq+v9iaetHK+6iStc+pJY3FS83k3KH5MIuMNJ7rFVL1L9fI= X-MS-TrafficTypeDiagnostic: AMSPR07MB310: X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;20:1xhcEu/MQM78PgiRTfbmM4m0mBQUm4d8lTzohysU+ANSolonLBbt+RTeJDgYnLZ2fKq5MW79r/93geI0D0HNwaxdL5dtE5QED/h8wZOmspGdxJTzB5cZRaOAY1zDnuVY28M+Wu+Ipp1opVuxXbJyv0LH6RJAOB7GDTk4z7N1RiwWnLfPVq91RYN7DtQvWy92tEhU2x4djVudc0uczt5XZDCHdvmWsMj/TVHuRHN9H123VYYk6vyH1YVs6Ec29riCH8vaLPYG6Ctq73fm44A9TTISdRa9S/CZpH02JcGLANtUeyC/SfmUSHs68Uv/19KAN3r/8PS7zHJhNNVhEcoDOgqy9OH+uQUPc78jh2Fr/NbXtVl4CwnJOs07taLpjjxeHi0UtRqpV+ZEkWdUE/ryCMBzgcxJfl/iY3/RpuGBhnDRthfMzNzOqWlJ3mZ+dEjOdmrTMizZwyaLFJ+NMS99bopKvBiWdRpdNZ2Pjj5lJ/GVE2FDIN5nSKWswRWLetIw;4:N0Xdm5o70OAhc0fnAga+mxWUKa7vthd25IscSzXZGHOs9WAW4PQMXM2RILZcSGvMvb3NRkY6XSlkNkOP7GsAWHxNUq9guhUPGRHU1x2nymeyDroxpzyRCCPB3XKWjLPmGA0pZlBhn0s3W9BflUfLZ0I0ulLUM/ICP2mMKBaFTeEQYJIBU7yIcaxhRbWBPQWTR9hHfiKO490E0uO6juD1rK0Lr+JHO+8skKX0li2y6xRzP6kYPFXfDET3pXPsIV3e57QCHhGOff6H605NVjV30Oqsu0o2nskWDZd/sKn5aAEG5DI9CBDUEQtZl+sYxQ6I X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(3231022)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:AMSPR07MB310;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:AMSPR07MB310; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(54534003)(3846002)(97736004)(66066001)(5003940100001)(33646002)(16526018)(50986999)(76176999)(6666003)(81156014)(305945005)(7736002)(81166006)(6512007)(5660300001)(316002)(6506006)(6486002)(16586007)(6916009)(2950100002)(101416001)(8676002)(2351001)(2906002)(105586002)(36756003)(47776003)(86362001)(50466002)(48376002)(50226002)(8936002)(106356001)(68736007)(2361001)(53936002)(478600001)(25786009)(6116002)(4326008)(189998001);DIR:OUT;SFP:1101;SCL:1;SRVR:AMSPR07MB310;H:elxacz23q12.ca.am.ericsson.se;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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AMSPR07MB310;23:JpU5fnwfKIEFQ6EtAOVCsRLNLU/RsLkTfyjK661pHm?= =?us-ascii?Q?C5WWtC+zT5hxn3a6TNeOAiblkeLk8R8WeMFL/L7VWg78yeMlGXZapVhaS88/?= =?us-ascii?Q?NC8q8I86015Qxe83F11/eclz3gCqW4tZBoaoY4r3s6N130DMzg6TxTTSRMgK?= =?us-ascii?Q?S4rsfxO3l7f1VA2CpVSsXI+SofW+3zkYXsyJp51ZZn8jdLQuH08wWr4U1OeK?= =?us-ascii?Q?cKamid51wm1LoSsVt/nz4obcACSLtPu3jsdaNKRkJPnXedxYx/8iE30N0vfA?= =?us-ascii?Q?ykmb0kqdkx4lyZqRjdGVozg22UzwWjo46dcbxpGamIk0W5+uOolSeTMbK18P?= =?us-ascii?Q?CjZrsjRJSp6mlskhCtuXQK7yTkGCDsBet9XiD8qK0OLpMCNkZTsTh49+sCDR?= =?us-ascii?Q?j7Eji+AY0We5barA51p8bXB87mjv/vKtQopkkex47prKPGnITwZhtKiWR9t7?= =?us-ascii?Q?murVkHUXdZ7WNsldfQJfJtCBFvPYIbaJU+xephAD2GB9d1a3B0R3/IgaMydI?= =?us-ascii?Q?PHBTY/E0lqMdln67rMBV7QGHjwRBNNCRb54W72YdhDNtLZrJ7tGbjz6f/wfT?= =?us-ascii?Q?hxhaBDkBZgNPHJ5ADrwxpH8NQZfAgGtjBYxhLelnfrwezQRWhjJ4CI+7Jf6U?= =?us-ascii?Q?xfi09pTusQ2KaKmr1Ca7F/EsnoYOMoV2nxxIDRfAak3T5YEXzd/zrVYug4wi?= =?us-ascii?Q?UqwVfPIfmBPzPH5VLJFxIN0E0q15DRdoZkOSnpBJdeLH/aNcb+m9//TPjCnu?= =?us-ascii?Q?ohHCg+wAVKD1vxlgrPO3Z8GDsHrBMaJL73ZVv9aeQS96hkoTTNyeToeeHb/q?= =?us-ascii?Q?7osmivdUU7hFAJB72XarEyt/HfUFKf1XJp+SMz3pOPBnCitppv/3vmjjd2mO?= =?us-ascii?Q?beYuuXelyK+fy7YtVsPND+8+Q3wymjo5UHa62pD2B+kdnadVb5qcry80n8jN?= =?us-ascii?Q?rD3ZaMdVNh/hGfevWKfeDKljTyVW+40iyMWZb9W1hsz2mvJ+P33RZLnqldoz?= =?us-ascii?Q?obRZtxPolp1s5UXP/QkdqXfppGknbNkKTfdmHZHprLuGojKmOcFZ2EuAsa7L?= =?us-ascii?Q?eUHzs5yVLeRttw8VuqITnZrMiukh7j64hV/tOuAuOjg4oE09CBVc2E9+XHD7?= =?us-ascii?Q?3VXPtXaet/wcff1gN44AzFieM86x5n?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;6:KQZfq9TvAK5I7TPNDl0+sRf/W0If7rmr8p1uw6wzwBbqsNd1vDw8LSzW6UjNJcBc8RzBkOvhRMKeAcwrfkLbcDXb9S3RQzCJ6NDnHfQR/L5v5mP69fxw461e4Z8k7Pa9zXk2lCmyPTmFf7YumOTfSTJ5rWfa3DQpGpOiUX2y3YMEJhOa61YkBwQN9N+S2gi2pbDKkWzxABcWY7pkUGVsd1SxmjnS8r2AkbXDufY9xgDKDFaqUjqBjiTKWs2oakLvxSMSecqiSzseEW+4+sorE0TwN0DMRZif6qiPrmzZGma/XqRdJR9Pv3j/CnRMGFCW02kVY3Szf3JMXTgioDW+3FkldCcvwlduPQtC7et+F5I=;5:79S83whO7MnmrqpnaA0+8473oJz06L3RHDoUm6/Wccd0/eHaCd+KvOqmpdeZEB8368RgDE+ZcJNHBiBgODEr4g8D/Sf0pVvU8CpM73m5Mace3G3RseI4qE1VVHc57Te5e6STSlvZ8ejCUM04smqvPA1vNl2BOlFjRdRnzlraiYc=;24:fxJ7DVk2CbR2ltSGKDq/Js8OpVk0ID+FKFb+qiHFKqyvm1inp/+qKt/hCOo9w8Zt6srp6oKsY3U51tSahLPn1MCkCqfwBbsFFeF6HDhWNuE=;7:aWqFR8G/fkayFPxCuzxs3v1LRPjMZkNN09wpjjbsPbazkCDvdPNVDwM7KyH0TTNeOMTlT1ORxLLRn10n7KUKHhlynMxIQqSsqASnTHSLtCGOkXwlwubFvGAkt3lhLiPW+gk3ZT8RRjnzJmP7WdRVBtA7TtbDVVnwc26cuiA+9xxjfIIQosHaojaGR9ZVSgvgBnRGYmAgWbm8gEjCyyMqHh7RYLeMVOF8EpJExJhCcUiK2jR5OLuQCQ8QDpN9Wl0E SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:35:12.8602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55572041-a346-4cf5-f9d2-08d53034acb1 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-11/txt/msg00402.txt.bz2 From: Simon Marchi Replace with find_thread. We could almost use find_thread_ptid, except that find_lwp_pid uses the pid of the input ptid of the lwp is 0, so the behavior is not quite the same. gdb/gdbserver/ChangeLog: * linux-low.c (same_lwp): Remove. (find_lwp_pid): Use find_thread. --- gdb/gdbserver/linux-low.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 6ec9a16..08f7f90 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1807,27 +1807,14 @@ status_pending_p_callback (thread_info *thread, ptid_t ptid) return lp->status_pending_p; } -static int -same_lwp (thread_info *thread, void *data) -{ - ptid_t ptid = *(ptid_t *) data; - int lwp; - - if (ptid_get_lwp (ptid) != 0) - lwp = ptid_get_lwp (ptid); - else - lwp = ptid_get_pid (ptid); - - if (thread->id.lwp () == lwp) - return 1; - - return 0; -} - struct lwp_info * find_lwp_pid (ptid_t ptid) { - thread_info *thread = find_inferior (&all_threads, same_lwp, &ptid); + thread_info *thread = find_thread ([&] (thread_info *thread) + { + int lwp = ptid.lwp () != 0 ? ptid.lwp () : ptid.pid (); + return thread->id.lwp () == lwp; + }); if (thread == NULL) return NULL; -- 2.7.4