From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19574 invoked by alias); 17 Nov 2017 18:34:03 -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 19555 invoked by uid 89); 17 Nov 2017 18:34:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 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= 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; Fri, 17 Nov 2017 18:34:01 +0000 Received: from ESESSHC021.ericsson.se (Unknown_Domain [153.88.183.81]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 76.8E.19528.69B2F0A5; Fri, 17 Nov 2017 19:33:59 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.81) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 17 Nov 2017 19:33:58 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DBXPR07MB317.eurprd07.prod.outlook.com (2a01:111:e400:941d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.2; Fri, 17 Nov 2017 18:33:57 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 07/11] Remove usage of find_inferior in linux_stabilize_threads Date: Fri, 17 Nov 2017 18:34:00 -0000 Message-ID: <1510943613-18598-8-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1510943613-18598-1-git-send-email-simon.marchi@ericsson.com> References: <1510943613-18598-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: BN6PR1101CA0001.namprd11.prod.outlook.com (2603:10b6:405:4a::11) To DBXPR07MB317.eurprd07.prod.outlook.com (2a01:111:e400:941d::11) X-MS-Office365-Filtering-Correlation-Id: a38324f2-c17d-4384-b29d-08d52de9c394 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:DBXPR07MB317; X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB317;3:iWsRlWapG0pa1pAJugVLDeQpKE0WK+qnM8Sq3jYwMkMIS0a0mSIKvS1FLqUUBgbkYGtRtMcgSOXEbmnwl3WYjivyHBouSf9JYiMkym6HQzRJWqUcpK5/Pk6XMKrgx7jQCAHJ12CcqwWktGQQlY0z5Vi1vL81FQ3yegb7LrT7liR5+BwmYY/PKlvhtKkiCLzoPMG0G2Q+94Bv8OrEP9PHsANv1JtFM+00K1vgeqoHtA4d157IoD5X5K2S7DA95BS4;25:yIi63+e1vO9nM80yC6P/xA6yBNiqegK3y2WHZi5Oov0fsDaCApPfmcZDjlOZcnmia9yxcvVTWXeibCdoGBkbT3hHGR5TLyPmUdwehG4wIt56+ejARZ1pR3a1lv0bCsELD8Q3ebHiq/NAE6MLa4nk8eKdy/kTv4Z0nwGul8frQcFqJm9TLAcVuZDbGGcIv3enZCPWaRaWD5UgWkvlsNgP6E6qgM4lGLAmIVdL70e9LbCiIeMtsX9et82Se8zUgzcHccDdsxUZPMtFtGxElWt5wTQwE69UcAZVSEAtlpbPMCSkgZmmA3W1RElVSMECYW5x0tc6b2pxlVWi+LGeyScnoQ==;31:G2LE21IhXGyhF67IOD4FipNYGmlnFM074RZQGbikmg1wFhKvAgj24WiFUO8LJJH7TyQvqXpu3xG+UZq4AKBpD6Bvdilh+YKpLxJnHEJDF3SATfM6QYQ/dDD7OJqEBrea6hE8Q99Z1RUDXOGLxSX/kvHG0SqbxyUlWS3b4+9iRScf8bxkHZV3YBzm47xk0FEkjjdREtF9Za62yPOFLRl1ci1t64KoKWQlGKNTh+wuNpQ= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBXPR07MB317: X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB317;20:FdphC31bk29o6cXSAcA8gd4FblYIEbu2z3vLC69olEn6aGHNPvDRnb4gzSh6SuGC34vuB0+yTDmfaoUPDcH6S9HEa+tEmrwpKOBJha6arbXcwEXqh5/HqBQ9rB5DzwR126A2y4Q5PewsZhEBZpbeDRZUK2PWxcYNGHIYNj0NpMUNsC2Q4wltUS/mLygcTS40dWu5/ATQruNbLRA0jd/QPcg6MMUo/Td/yPX++whRJfSXgkwjzS8hoFfX8+X0mOWqZiUDww0yvcTY7VKChhNsjua8rBZEI82yucaiG+2vvpE9IZ6pxeddvhAbn19NkPyOIFRfh28V7W4aO0/ztZF9E13lGaXpXURQwmrIjW+8qP43CAdiALHYe5NuTqkfIKqF3Ieo0OREuTPMWuczxOnBRMuZ1uUz0lg6K3xcKK4y6vAgnC2pcQzu0LGyUOMUuNBpY8evxGIgsKrm2JB2eF6refD/Z3g2uG3gKU2tNFeSfRVpzWYogQ4FPBKn768xPy82;4:fNxLxWD1cQNbY9o+oU66bmOs3G3PEwI/n1yRs7/f3Gr5K8ueeo8PXxQ3J14h/IeyRK0VR0gtdBMMit34jLtAj7h1fULKcF2zwEimETz41a9jbNCxryT/xBjAAM6fWB9h5zLCac06wMqH1Yw16Nhy4lOWB4aFhv2VNbwE1ZxaLDYhJ5ykVgTDJeH1uKIj9auQuL8NeZyebQjcUjk/+IMLp3I9jKS6kt5PW7/45HYVJXsVMrOWHNiM/D9GAjZq5+e+AcDraPswlyjCzQ2BINB9VKMZeo1TTHHGCPVu9/8RmOyh7OxfRf5920LewZo2V0LT 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)(10201501046)(3002001)(3231022)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DBXPR07MB317;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DBXPR07MB317; X-Forefront-PRVS: 049486C505 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(39860400002)(376002)(54534003)(199003)(189002)(86362001)(16526018)(2950100002)(81166006)(6916009)(81156014)(2906002)(33646002)(316002)(106356001)(47776003)(8936002)(6486002)(8676002)(97736004)(6666003)(4326008)(16586007)(6506006)(107886003)(53936002)(478600001)(189998001)(6116002)(3846002)(68736007)(50986999)(76176999)(36756003)(105586002)(5660300001)(101416001)(48376002)(2361001)(50226002)(66066001)(6512007)(7736002)(50466002)(2351001)(5003940100001)(25786009)(305945005);DIR:OUT;SFP:1101;SCL:1;SRVR:DBXPR07MB317;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) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DBXPR07MB317;23:BLi1zsEYY8GxGMtgcee/d6m7kH/dBvFZlJNuSGlTyG?= =?us-ascii?Q?1KYUkYnvQ4vVs3tJM/v0HSQsbkxA6cJn8wOkVT1NDaFYE7tBneXyXxRa693b?= =?us-ascii?Q?qnE5YX8eBSa7gnqh2S+Rzx4FskXsvxNgsTnhyjdZ8/yANGwB5aMx3n69+NwX?= =?us-ascii?Q?nqzT0f841KhJMFOEzp70hgXQJy8Hnc3QVzedGgUi1nBBj8xuCmOmyQMjb7Zo?= =?us-ascii?Q?j1ai9RsfwDl2ATgxCIft2vyG93duEZuFqM7TfGWx2Ukapue5Wo/2sEcrYoLU?= =?us-ascii?Q?IJdABZ5QDof+g+IybGFK4rqXfB94y4axbd3nodYb8tWhFk675CLCi1FOgF0/?= =?us-ascii?Q?gWQ7DbbEEB5wRtBIOfFlEWHx59ERfA8CcyIjv6an0umEYUn1Jhg92mIC3Nw1?= =?us-ascii?Q?Q3WY81SperxWXfmSG0NcHNYHBionJCT9uRq11KyS3prh2YXNL9ny9c1i8WqM?= =?us-ascii?Q?32nSXga27qFM1w+QF5BW0Ao3wYxjD3kGYDWw/ebBpj1HnNNqSncm9n4aktdg?= =?us-ascii?Q?hDSSHucSeOgootInlgJpBeLe9+2CsoXsIBKnpZdy+NYXWSs3HqsM7HGyHXu6?= =?us-ascii?Q?6LQ4S0HqTFVdqTNq7/iP+NZcSwWLS7vwWHqSZsnyShH6op8llzy65/u7XPSu?= =?us-ascii?Q?lnVkA3Ey9NSyJUuxYbK3jrQVma4zr3IyTWklUF0lO/4xNOL60ghvB1ihwjAR?= =?us-ascii?Q?VhHoZ58LJhYaW9SEZDYqZpZMUjygDnCl/qY6gpSECDSSDqyGw42ypRhHNYmm?= =?us-ascii?Q?PPZC6+4RUG/rrktYvh6ucGogBHxawWh5oL5YlQMJMLHAEm0mVvXumfY6BF2U?= =?us-ascii?Q?67zJInYXOntvQfTjUCSwxTpAWq1nHUJydLQU5ots/gn0LQ68j83PE51ZMCUE?= =?us-ascii?Q?jWyj12QK8FpmfqFp++pnfpu3JIAe88J0BoKDc+icrPq4WKvDRi5ugim1X6GA?= =?us-ascii?Q?SioyL7h/9QnFZbPFFsuilQd+3pXDYAsMP2gyGZAjLOc4W8mhYQ9YhwV2WiEQ?= =?us-ascii?Q?B6FAYBkwzKuImVWFVa9AwG00ME2MwwIVejCfaRzRVcdDBG300+WGKAAynmwb?= =?us-ascii?Q?rDOB3T+K2/x90mCs+CpJgAIqYGPnwTYtCwoohKx7K1acvA/hQ4wk7Khy6MDp?= =?us-ascii?Q?pipXvTL0/dlZwx2N+CiO8dhkSrfy7FQR2Ux6BgyiW9WHp4MNtrVg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DBXPR07MB317;6:JpxMQ1uppkKaq+f5RzKL8D75cBhYBCa4cqeHqBgIzl5kQylWiPPJDagaDE4OILgpnJTNAsWu2fgnbhDQgyNAfsNB4/noG4QqJ4CzQrLC/kUuWVRPWyoxsEA7hYrCDP+eUU+8VUlSzKnQlvzEYlz1r/zkd/eqR4mwGdlerP8eJNKF7piLceAsfftkR4ZL/mOIv0W3S/Xdz08Efk9CpFbdaCpxWEKNaF40DzbJVGTQhPniykAIK49FJQIp3o6i5xlQxgF7MuTncBE8aBvOtyQ935BQAVwWdmkwAbo3lxrwQ2gO/QCN9OHhkZCBJqyIqWUZqcNRPTfbaaofH6E7fYdmnZXhViEkwUowZFlLuuX5xng=;5:URx59L/Da2bzZR1x1dIPewq+hViZvl99U2ini14o8tCdg8y3cTqZE2h4/1rBun21G7qxIOmykkVx4nSHr6IqsnT7gvLcAg/1dFC89GL2V1Ys/yrPk9WRQwYS6GpC4qytB1OUXdow101nBJsUgutRkiDwFZK3VaL6tphXtdfopWQ=;24:KHVEIF4q5beS/AqzLt1JceHMQtq7/OoR/DlHsEck96AKowy5/o4KopCuYXV9L7OaVQAVjbJLeBaumqmjjy126eCrD4zw9/cHnSm4Y5Whho0=;7:tzpwwl6Fqd+ncTlgb1GuMM4Uzzi0hbh0gADXxuwnmpB5Rmpw8foCNmv17ZCkZxRgSPDYlxFRJaTSQDw704y2prKM9LO99vVHqCUnSSVnyVAf9Zfq4bvun97/sS+tcsFe9CFZAfMw1NZdjBW5JH4x8Oj7+OWWVEF2NAd5sw0toSgviPoA3T+wzYClBe7Um0wmXD5TRwW0EtI0ZWB+zAgMKLZbPYRcwqy+AzRR/tBk+KpaoCMoWzF4nPNE0dQve1Ex SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2017 18:33:57.0194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a38324f2-c17d-4384-b29d-08d52de9c394 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBXPR07MB317 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2017-11/txt/msg00364.txt.bz2 Simply replace with find_thread. gdb/gdbserver/ChangeLog: * linux-low.c (stuck_in_jump_pad_callback): Change prototype, return bool, remove data argument. (linux_stabilize_threads): Use find_thread. --- gdb/gdbserver/linux-low.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index fce3fd0..b4c716c 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -2985,7 +2985,7 @@ unsuspend_all_lwps (struct lwp_info *except) } static void move_out_of_jump_pad_callback (thread_info *thread); -static int stuck_in_jump_pad_callback (thread_info *thread, void *data); +static bool stuck_in_jump_pad_callback (thread_info *thread); static int lwp_running (thread_info *thread, void *data); static ptid_t linux_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus, @@ -3024,13 +3024,8 @@ static ptid_t linux_wait_1 (ptid_t ptid, static void linux_stabilize_threads (void) { - struct thread_info *saved_thread; - struct thread_info *thread_stuck; + thread_info *thread_stuck = find_thread (stuck_in_jump_pad_callback); - thread_stuck - = (struct thread_info *) find_inferior (&all_threads, - stuck_in_jump_pad_callback, - NULL); if (thread_stuck != NULL) { if (debug_threads) @@ -3039,7 +3034,7 @@ linux_stabilize_threads (void) return; } - saved_thread = current_thread; + thread_info *saved_thread = current_thread; stabilizing_threads = 1; @@ -3082,10 +3077,8 @@ linux_stabilize_threads (void) if (debug_threads) { - thread_stuck - = (struct thread_info *) find_inferior (&all_threads, - stuck_in_jump_pad_callback, - NULL); + thread_stuck = find_thread (stuck_in_jump_pad_callback); + if (thread_stuck != NULL) debug_printf ("couldn't stabilize, LWP %ld got stuck in jump pad\n", lwpid_of (thread_stuck)); @@ -4111,13 +4104,13 @@ wait_for_sigstop (void) } } -/* Returns true if LWP ENTRY is stopped in a jump pad, and we can't +/* Returns true if THREAD is stopped in a jump pad, and we can't move it out, because we need to report the stop event to GDB. For example, if the user puts a breakpoint in the jump pad, it's because she wants to debug it. */ -static int -stuck_in_jump_pad_callback (thread_info *thread, void *data) +static bool +stuck_in_jump_pad_callback (thread_info *thread) { struct lwp_info *lwp = get_thread_lwp (thread); -- 2.7.4